Skip to content

Commit

Permalink
removed some monitor drift in terms of imports and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Jun 4, 2024
1 parent 10ebdca commit d74facd
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 47 deletions.
7 changes: 1 addition & 6 deletions server/monitor-types/dns.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ const dayjs = require("dayjs");
const { dnsResolve } = require("../util-server");
const { R } = require("redbean-node");

class DnsMonitorType extends MonitorType {

export class DnsMonitorType extends MonitorType {
name = "dns";

/**
Expand Down Expand Up @@ -50,7 +49,3 @@ class DnsMonitorType extends MonitorType {
heartbeat.status = UP;
}
}

module.exports = {
DnsMonitorType,
};
10 changes: 2 additions & 8 deletions server/monitor-types/mongodb.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ const { UP } = require("../../src/util");
const { MongoClient } = require("mongodb");
const jsonata = require("jsonata");

class MongodbMonitorType extends MonitorType {

export class MongodbMonitorType extends MonitorType {
name = "mongodb";

/**
Expand Down Expand Up @@ -49,8 +48,7 @@ class MongodbMonitorType extends MonitorType {
* Connect to and run MongoDB command on a MongoDB database
* @param {string} connectionString The database connection string
* @param {object} command MongoDB command to run on the database
* @returns {Promise<(string[] | object[] | object)>} Response from
* server
* @returns {Promise<(string[] | object[] | object)>} Response from server
*/
async runMongodbCommand(connectionString, command) {
let client = await MongoClient.connect(connectionString);
Expand All @@ -59,7 +57,3 @@ class MongodbMonitorType extends MonitorType {
return result;
}
}

module.exports = {
MongodbMonitorType,
};
7 changes: 1 addition & 6 deletions server/monitor-types/monitor-type.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class MonitorType {
export class MonitorType {
name = undefined;

/**
Expand All @@ -11,9 +11,4 @@ class MonitorType {
async check(monitor, heartbeat, server) {
throw new Error("You need to override check()");
}

}

module.exports = {
MonitorType,
};
9 changes: 2 additions & 7 deletions server/monitor-types/mqtt.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@ const { log, UP } = require("../../src/util");
const mqtt = require("mqtt");
const jsonata = require("jsonata");

class MqttMonitorType extends MonitorType {

export class MqttMonitorType extends MonitorType {
name = "mqtt";

/**
* Run the monitoring check on the MQTT monitor
* @param {Monitor} monitor Monitor to check
* @param {Heartbeat} heartbeat Monitor heartbeat to update
* @param {UptimeKumaServer} server Uptime Kuma server
* @returns {Promise<void>}
* @inheritdoc
*/
async check(monitor, heartbeat, server) {
const receivedMessage = await this.mqttAsync(monitor.hostname, monitor.mqttTopic, {
Expand Down
4 changes: 1 addition & 3 deletions server/monitor-types/real-browser-monitor-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,7 @@ async function testRemoteBrowser(remoteBrowserURL) {
throw new Error(e.message);
}
}
class RealBrowserMonitorType extends MonitorType {

export class RealBrowserMonitorType extends MonitorType {
name = "real-browser";

/**
Expand Down Expand Up @@ -266,7 +265,6 @@ class RealBrowserMonitorType extends MonitorType {
}

module.exports = {
RealBrowserMonitorType,
testChrome,
resetChrome,
testRemoteBrowser,
Expand Down
20 changes: 3 additions & 17 deletions server/monitor-types/tailscale-ping.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@ const { MonitorType } = require("./monitor-type");
const { UP } = require("../../src/util");
const childProcessAsync = require("promisify-child-process");

/**
* A TailscalePing class extends the MonitorType.
* It runs Tailscale ping to monitor the status of a specific node.
*/
class TailscalePing extends MonitorType {

export class TailscalePing extends MonitorType {
name = "tailscale-ping";

/**
* Checks the ping status of the URL associated with the monitor.
* It then parses the Tailscale ping command output to update the heatrbeat.
* @param {object} monitor The monitor object associated with the check.
* @param {object} heartbeat The heartbeat object to update.
* @returns {Promise<void>}
* @throws Error if checking Tailscale ping encounters any error
* @inheritdoc
*/
async check(monitor, heartbeat) {
async check(monitor, heartbeat, _server) {
try {
let tailscaleOutput = await this.runTailscalePing(monitor.hostname, monitor.interval);
this.parseTailscaleOutput(tailscaleOutput, heartbeat);
Expand Down Expand Up @@ -81,7 +71,3 @@ class TailscalePing extends MonitorType {
}
}
}

module.exports = {
TailscalePing,
};

0 comments on commit d74facd

Please sign in to comment.