mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-23 23:04:04 +00:00
Compare commits
5 commits
db2831d1a0
...
5bfd3eea7e
Author | SHA1 | Date | |
---|---|---|---|
|
5bfd3eea7e | ||
|
c01494ec33 | ||
|
a7e9bdd43e | ||
|
9e2c66657d | ||
|
63add0376e |
17 changed files with 755 additions and 208 deletions
17
db/knex_migrations/2024-10-1315-rabbitmq-monitor.js
Normal file
17
db/knex_migrations/2024-10-1315-rabbitmq-monitor.js
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
exports.up = function (knex) {
|
||||||
|
return knex.schema.alterTable("monitor", function (table) {
|
||||||
|
table.text("rabbitmq_nodes");
|
||||||
|
table.string("rabbitmq_username");
|
||||||
|
table.string("rabbitmq_password");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.down = function (knex) {
|
||||||
|
return knex.schema.alterTable("monitor", function (table) {
|
||||||
|
table.dropColumn("rabbitmq_nodes");
|
||||||
|
table.dropColumn("rabbitmq_username");
|
||||||
|
table.dropColumn("rabbitmq_password");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
17
package-lock.json
generated
17
package-lock.json
generated
|
@ -93,6 +93,7 @@
|
||||||
"@playwright/test": "~1.39.0",
|
"@playwright/test": "~1.39.0",
|
||||||
"@popperjs/core": "~2.10.2",
|
"@popperjs/core": "~2.10.2",
|
||||||
"@testcontainers/hivemq": "^10.13.1",
|
"@testcontainers/hivemq": "^10.13.1",
|
||||||
|
"@testcontainers/rabbitmq": "^10.13.2",
|
||||||
"@types/bootstrap": "~5.1.9",
|
"@types/bootstrap": "~5.1.9",
|
||||||
"@types/node": "^20.8.6",
|
"@types/node": "^20.8.6",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
||||||
|
@ -4172,6 +4173,15 @@
|
||||||
"testcontainers": "^10.13.1"
|
"testcontainers": "^10.13.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@testcontainers/rabbitmq": {
|
||||||
|
"version": "10.13.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@testcontainers/rabbitmq/-/rabbitmq-10.13.2.tgz",
|
||||||
|
"integrity": "sha512-npBKBnq3c6hETmxGZ/gVMke9cc1J/pcftNW9S3WidL48hxFBIPjYNM9FdTfWuoNER/8kuf4xJ8yCuJEYGH3ZAg==",
|
||||||
|
"dev": true,
|
||||||
|
"dependencies": {
|
||||||
|
"testcontainers": "^10.13.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tootallnate/once": {
|
"node_modules/@tootallnate/once": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
||||||
|
@ -15925,11 +15935,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/testcontainers": {
|
"node_modules/testcontainers": {
|
||||||
"version": "10.13.1",
|
"version": "10.13.2",
|
||||||
"resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-10.13.1.tgz",
|
"resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-10.13.2.tgz",
|
||||||
"integrity": "sha512-JBbOhxmygj/ouH/47GnoVNt+c55Telh/45IjVxEbDoswsLchVmJiuKiw/eF6lE5i7LN+/99xsrSCttI3YRtirg==",
|
"integrity": "sha512-LfEll+AG/1Ks3n4+IA5lpyBHLiYh/hSfI4+ERa6urwfQscbDU+M2iW1qPQrHQi+xJXQRYy4whyK1IEHdmxWa3Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@balena/dockerignore": "^1.0.2",
|
"@balena/dockerignore": "^1.0.2",
|
||||||
"@types/dockerode": "^3.3.29",
|
"@types/dockerode": "^3.3.29",
|
||||||
|
|
|
@ -155,6 +155,7 @@
|
||||||
"@playwright/test": "~1.39.0",
|
"@playwright/test": "~1.39.0",
|
||||||
"@popperjs/core": "~2.10.2",
|
"@popperjs/core": "~2.10.2",
|
||||||
"@testcontainers/hivemq": "^10.13.1",
|
"@testcontainers/hivemq": "^10.13.1",
|
||||||
|
"@testcontainers/rabbitmq": "^10.13.2",
|
||||||
"@types/bootstrap": "~5.1.9",
|
"@types/bootstrap": "~5.1.9",
|
||||||
"@types/node": "^20.8.6",
|
"@types/node": "^20.8.6",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
||||||
|
|
|
@ -153,6 +153,7 @@ class Monitor extends BeanModel {
|
||||||
snmpOid: this.snmpOid,
|
snmpOid: this.snmpOid,
|
||||||
jsonPathOperator: this.jsonPathOperator,
|
jsonPathOperator: this.jsonPathOperator,
|
||||||
snmpVersion: this.snmpVersion,
|
snmpVersion: this.snmpVersion,
|
||||||
|
rabbitmqNodes: JSON.parse(this.rabbitmqNodes),
|
||||||
conditions: JSON.parse(this.conditions),
|
conditions: JSON.parse(this.conditions),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -183,6 +184,8 @@ class Monitor extends BeanModel {
|
||||||
tlsCert: this.tlsCert,
|
tlsCert: this.tlsCert,
|
||||||
tlsKey: this.tlsKey,
|
tlsKey: this.tlsKey,
|
||||||
kafkaProducerSaslOptions: JSON.parse(this.kafkaProducerSaslOptions),
|
kafkaProducerSaslOptions: JSON.parse(this.kafkaProducerSaslOptions),
|
||||||
|
rabbitmqUsername: this.rabbitmqUsername,
|
||||||
|
rabbitmqPassword: this.rabbitmqPassword,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
67
server/monitor-types/rabbitmq.js
Normal file
67
server/monitor-types/rabbitmq.js
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
const { MonitorType } = require("./monitor-type");
|
||||||
|
const { log, UP, DOWN } = require("../../src/util");
|
||||||
|
const { axiosAbortSignal } = require("../util-server");
|
||||||
|
const axios = require("axios");
|
||||||
|
|
||||||
|
class RabbitMqMonitorType extends MonitorType {
|
||||||
|
name = "rabbitmq";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritdoc
|
||||||
|
*/
|
||||||
|
async check(monitor, heartbeat, server) {
|
||||||
|
let baseUrls = [];
|
||||||
|
try {
|
||||||
|
baseUrls = JSON.parse(monitor.rabbitmqNodes);
|
||||||
|
} catch (error) {
|
||||||
|
throw new Error("Invalid RabbitMQ Nodes");
|
||||||
|
}
|
||||||
|
|
||||||
|
heartbeat.status = DOWN;
|
||||||
|
for (let baseUrl of baseUrls) {
|
||||||
|
try {
|
||||||
|
// Without a trailing slash, path in baseUrl will be removed. https://example.com/api -> https://example.com
|
||||||
|
if ( !baseUrl.endsWith("/") ) {
|
||||||
|
baseUrl += "/";
|
||||||
|
}
|
||||||
|
const options = {
|
||||||
|
// Do not start with slash, it will strip the trailing slash from baseUrl
|
||||||
|
url: new URL("api/health/checks/alarms/", baseUrl).href,
|
||||||
|
method: "get",
|
||||||
|
timeout: monitor.timeout * 1000,
|
||||||
|
headers: {
|
||||||
|
"Accept": "application/json",
|
||||||
|
"Authorization": "Basic " + Buffer.from(`${monitor.rabbitmqUsername || ""}:${monitor.rabbitmqPassword || ""}`).toString("base64"),
|
||||||
|
},
|
||||||
|
signal: axiosAbortSignal((monitor.timeout + 10) * 1000),
|
||||||
|
// Capture reason for 503 status
|
||||||
|
validateStatus: (status) => status === 200 || status === 503,
|
||||||
|
};
|
||||||
|
log.debug("monitor", `[${monitor.name}] Axios Request: ${JSON.stringify(options)}`);
|
||||||
|
const res = await axios.request(options);
|
||||||
|
log.debug("monitor", `[${monitor.name}] Axios Response: status=${res.status} body=${JSON.stringify(res.data)}`);
|
||||||
|
if (res.status === 200) {
|
||||||
|
heartbeat.status = UP;
|
||||||
|
heartbeat.msg = "OK";
|
||||||
|
break;
|
||||||
|
} else if (res.status === 503) {
|
||||||
|
heartbeat.msg = res.data.reason;
|
||||||
|
} else {
|
||||||
|
heartbeat.msg = `${res.status} - ${res.statusText}`;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (axios.isCancel(error)) {
|
||||||
|
heartbeat.msg = "Request timed out";
|
||||||
|
log.debug("monitor", `[${monitor.name}] Request timed out`);
|
||||||
|
} else {
|
||||||
|
log.debug("monitor", `[${monitor.name}] Axios Error: ${JSON.stringify(error.message)}`);
|
||||||
|
heartbeat.msg = error.message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
RabbitMqMonitorType,
|
||||||
|
};
|
|
@ -313,6 +313,9 @@ let needSetup = false;
|
||||||
const statusPageRouter = require("./routers/status-page-router");
|
const statusPageRouter = require("./routers/status-page-router");
|
||||||
app.use(statusPageRouter);
|
app.use(statusPageRouter);
|
||||||
|
|
||||||
|
const { injectDefaultAppearance } = require("./utils/inject-default-appearance");
|
||||||
|
app.use(injectDefaultAppearance);
|
||||||
|
|
||||||
// Universal Route Handler, must be at the end of all express routes.
|
// Universal Route Handler, must be at the end of all express routes.
|
||||||
app.get("*", async (_request, response) => {
|
app.get("*", async (_request, response) => {
|
||||||
if (_request.originalUrl.startsWith("/upload/")) {
|
if (_request.originalUrl.startsWith("/upload/")) {
|
||||||
|
@ -718,6 +721,8 @@ let needSetup = false;
|
||||||
|
|
||||||
monitor.conditions = JSON.stringify(monitor.conditions);
|
monitor.conditions = JSON.stringify(monitor.conditions);
|
||||||
|
|
||||||
|
monitor.rabbitmqNodes = JSON.stringify(monitor.rabbitmqNodes);
|
||||||
|
|
||||||
bean.import(monitor);
|
bean.import(monitor);
|
||||||
bean.user_id = socket.userID;
|
bean.user_id = socket.userID;
|
||||||
|
|
||||||
|
@ -868,6 +873,9 @@ let needSetup = false;
|
||||||
bean.snmpOid = monitor.snmpOid;
|
bean.snmpOid = monitor.snmpOid;
|
||||||
bean.jsonPathOperator = monitor.jsonPathOperator;
|
bean.jsonPathOperator = monitor.jsonPathOperator;
|
||||||
bean.timeout = monitor.timeout;
|
bean.timeout = monitor.timeout;
|
||||||
|
bean.rabbitmqNodes = JSON.stringify(monitor.rabbitmqNodes);
|
||||||
|
bean.rabbitmqUsername = monitor.rabbitmqUsername;
|
||||||
|
bean.rabbitmqPassword = monitor.rabbitmqPassword;
|
||||||
bean.conditions = JSON.stringify(monitor.conditions);
|
bean.conditions = JSON.stringify(monitor.conditions);
|
||||||
|
|
||||||
bean.validate();
|
bean.validate();
|
||||||
|
|
|
@ -115,6 +115,7 @@ class UptimeKumaServer {
|
||||||
UptimeKumaServer.monitorTypeList["mqtt"] = new MqttMonitorType();
|
UptimeKumaServer.monitorTypeList["mqtt"] = new MqttMonitorType();
|
||||||
UptimeKumaServer.monitorTypeList["snmp"] = new SNMPMonitorType();
|
UptimeKumaServer.monitorTypeList["snmp"] = new SNMPMonitorType();
|
||||||
UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType();
|
UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType();
|
||||||
|
UptimeKumaServer.monitorTypeList["rabbitmq"] = new RabbitMqMonitorType();
|
||||||
|
|
||||||
// Allow all CORS origins (polling) in development
|
// Allow all CORS origins (polling) in development
|
||||||
let cors = undefined;
|
let cors = undefined;
|
||||||
|
@ -552,4 +553,5 @@ const { DnsMonitorType } = require("./monitor-types/dns");
|
||||||
const { MqttMonitorType } = require("./monitor-types/mqtt");
|
const { MqttMonitorType } = require("./monitor-types/mqtt");
|
||||||
const { SNMPMonitorType } = require("./monitor-types/snmp");
|
const { SNMPMonitorType } = require("./monitor-types/snmp");
|
||||||
const { MongodbMonitorType } = require("./monitor-types/mongodb");
|
const { MongodbMonitorType } = require("./monitor-types/mongodb");
|
||||||
|
const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
|
||||||
const Monitor = require("./model/monitor");
|
const Monitor = require("./model/monitor");
|
||||||
|
|
50
server/utils/inject-default-appearance.js
Normal file
50
server/utils/inject-default-appearance.js
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
const { Settings } = require("../settings");
|
||||||
|
const cheerio = require("cheerio");
|
||||||
|
const jsesc = require("jsesc");
|
||||||
|
const { log } = require("../../src/util");
|
||||||
|
|
||||||
|
const injectDefaultAppearance = (req, res, next) => {
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Intercept send() calls and inject Default Appearance
|
||||||
|
// https://stackoverflow.com/a/60817116
|
||||||
|
const oldSend = res.send;
|
||||||
|
res.send = async (data) => {
|
||||||
|
|
||||||
|
if (typeof data === "string") {
|
||||||
|
log.debug("inject-default-appearance", req.method + " " + req.url);
|
||||||
|
const $ = cheerio.load(data);
|
||||||
|
|
||||||
|
const defaultAppearance = await Settings.get("defaultAppearance");
|
||||||
|
if (defaultAppearance) {
|
||||||
|
const head = $("head");
|
||||||
|
|
||||||
|
const escapedJSONObject = jsesc(defaultAppearance, { isScriptContext: true });
|
||||||
|
|
||||||
|
const script = $(`
|
||||||
|
<script id="default-appearance" data-json="{}">
|
||||||
|
window.defaultAppearance = ${escapedJSONObject};
|
||||||
|
</script>
|
||||||
|
`);
|
||||||
|
|
||||||
|
head.append(script);
|
||||||
|
|
||||||
|
data = $.root().html();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
res.send = oldSend; // set function back to avoid 'double-send'
|
||||||
|
return res.send(data);
|
||||||
|
};
|
||||||
|
|
||||||
|
next();
|
||||||
|
} catch (e) {
|
||||||
|
|
||||||
|
next(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
injectDefaultAppearance
|
||||||
|
};
|
|
@ -4,11 +4,17 @@
|
||||||
<div
|
<div
|
||||||
v-for="(beat, index) in shortBeatList"
|
v-for="(beat, index) in shortBeatList"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="beat"
|
class="beat-hover-area"
|
||||||
:class="{ 'empty': (beat === 0), 'down': (beat.status === 0), 'pending': (beat.status === 2), 'maintenance': (beat.status === 3) }"
|
:class="{ 'empty': (beat === 0) }"
|
||||||
:style="beatStyle"
|
:style="beatHoverAreaStyle"
|
||||||
:title="getBeatTitle(beat)"
|
:title="getBeatTitle(beat)"
|
||||||
/>
|
>
|
||||||
|
<div
|
||||||
|
class="beat"
|
||||||
|
:class="{ 'empty': (beat === 0), 'down': (beat.status === 0), 'pending': (beat.status === 2), 'maintenance': (beat.status === 3) }"
|
||||||
|
:style="beatStyle"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="!$root.isMobile && size !== 'small' && beatList.length > 4 && $root.styleElapsedTime !== 'none'"
|
v-if="!$root.isMobile && size !== 'small' && beatList.length > 4 && $root.styleElapsedTime !== 'none'"
|
||||||
|
@ -47,7 +53,7 @@ export default {
|
||||||
beatWidth: 10,
|
beatWidth: 10,
|
||||||
beatHeight: 30,
|
beatHeight: 30,
|
||||||
hoverScale: 1.5,
|
hoverScale: 1.5,
|
||||||
beatMargin: 4,
|
beatHoverAreaPadding: 4,
|
||||||
move: false,
|
move: false,
|
||||||
maxBeat: -1,
|
maxBeat: -1,
|
||||||
};
|
};
|
||||||
|
@ -123,7 +129,7 @@ export default {
|
||||||
|
|
||||||
barStyle() {
|
barStyle() {
|
||||||
if (this.move && this.shortBeatList.length > this.maxBeat) {
|
if (this.move && this.shortBeatList.length > this.maxBeat) {
|
||||||
let width = -(this.beatWidth + this.beatMargin * 2);
|
let width = -(this.beatWidth + this.beatHoverAreaPadding * 2);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
transition: "all ease-in-out 0.25s",
|
transition: "all ease-in-out 0.25s",
|
||||||
|
@ -137,12 +143,17 @@ export default {
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
beatHoverAreaStyle() {
|
||||||
|
return {
|
||||||
|
padding: this.beatHoverAreaPadding + "px",
|
||||||
|
"--hover-scale": this.hoverScale,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
beatStyle() {
|
beatStyle() {
|
||||||
return {
|
return {
|
||||||
width: this.beatWidth + "px",
|
width: this.beatWidth + "px",
|
||||||
height: this.beatHeight + "px",
|
height: this.beatHeight + "px",
|
||||||
margin: this.beatMargin + "px",
|
|
||||||
"--hover-scale": this.hoverScale,
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -152,7 +163,7 @@ export default {
|
||||||
*/
|
*/
|
||||||
timeStyle() {
|
timeStyle() {
|
||||||
return {
|
return {
|
||||||
"margin-left": this.numPadding * (this.beatWidth + this.beatMargin * 2) + "px",
|
"margin-left": this.numPadding * (this.beatWidth + this.beatHoverAreaPadding * 2) + "px",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -219,20 +230,20 @@ export default {
|
||||||
if (this.size !== "big") {
|
if (this.size !== "big") {
|
||||||
this.beatWidth = 5;
|
this.beatWidth = 5;
|
||||||
this.beatHeight = 16;
|
this.beatHeight = 16;
|
||||||
this.beatMargin = 2;
|
this.beatHoverAreaPadding = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Suddenly, have an idea how to handle it universally.
|
// Suddenly, have an idea how to handle it universally.
|
||||||
// If the pixel * ratio != Integer, then it causes render issue, round it to solve it!!
|
// If the pixel * ratio != Integer, then it causes render issue, round it to solve it!!
|
||||||
const actualWidth = this.beatWidth * window.devicePixelRatio;
|
const actualWidth = this.beatWidth * window.devicePixelRatio;
|
||||||
const actualMargin = this.beatMargin * window.devicePixelRatio;
|
const actualHoverAreaPadding = this.beatHoverAreaPadding * window.devicePixelRatio;
|
||||||
|
|
||||||
if (!Number.isInteger(actualWidth)) {
|
if (!Number.isInteger(actualWidth)) {
|
||||||
this.beatWidth = Math.round(actualWidth) / window.devicePixelRatio;
|
this.beatWidth = Math.round(actualWidth) / window.devicePixelRatio;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Number.isInteger(actualMargin)) {
|
if (!Number.isInteger(actualHoverAreaPadding)) {
|
||||||
this.beatMargin = Math.round(actualMargin) / window.devicePixelRatio;
|
this.beatHoverAreaPadding = Math.round(actualHoverAreaPadding) / window.devicePixelRatio;
|
||||||
}
|
}
|
||||||
|
|
||||||
window.addEventListener("resize", this.resize);
|
window.addEventListener("resize", this.resize);
|
||||||
|
@ -245,7 +256,7 @@ export default {
|
||||||
*/
|
*/
|
||||||
resize() {
|
resize() {
|
||||||
if (this.$refs.wrap) {
|
if (this.$refs.wrap) {
|
||||||
this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2));
|
this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatHoverAreaPadding * 2));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -273,32 +284,41 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.hp-bar-big {
|
.hp-bar-big {
|
||||||
.beat {
|
.beat-hover-area {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
background-color: $primary;
|
|
||||||
border-radius: $border-radius;
|
|
||||||
|
|
||||||
&.empty {
|
|
||||||
background-color: aliceblue;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.down {
|
|
||||||
background-color: $danger;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.pending {
|
|
||||||
background-color: $warning;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.maintenance {
|
|
||||||
background-color: $maintenance;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(.empty):hover {
|
&:not(.empty):hover {
|
||||||
transition: all ease-in-out 0.15s;
|
transition: all ease-in-out 0.15s;
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
transform: scale(var(--hover-scale));
|
transform: scale(var(--hover-scale));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.beat {
|
||||||
|
background-color: $primary;
|
||||||
|
border-radius: $border-radius;
|
||||||
|
|
||||||
|
/*
|
||||||
|
pointer-events needs to be changed because
|
||||||
|
tooltip momentarily disappears when crossing between .beat-hover-area and .beat
|
||||||
|
*/
|
||||||
|
pointer-events: none;
|
||||||
|
|
||||||
|
&.empty {
|
||||||
|
background-color: aliceblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.down {
|
||||||
|
background-color: $danger;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.pending {
|
||||||
|
background-color: $warning;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.maintenance {
|
||||||
|
background-color: $maintenance;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
73
src/components/HorizontalTabHeader.vue
Normal file
73
src/components/HorizontalTabHeader.vue
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<ul class="nav nav-tabs">
|
||||||
|
<li v-for="(tab, index) in tabs" :key="index" class="nav-item">
|
||||||
|
<a
|
||||||
|
class="nav-link"
|
||||||
|
:class="{ active: index == selected }"
|
||||||
|
href="#"
|
||||||
|
@click="$emit('update:selected', index)"
|
||||||
|
>
|
||||||
|
{{ tab }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="js">
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
tabs: {
|
||||||
|
type: Array[String],
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
selected: {
|
||||||
|
type: Number,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: [ "update:selected" ],
|
||||||
|
data() {
|
||||||
|
return {};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
@import "../assets/vars.scss";
|
||||||
|
|
||||||
|
.nav-tabs {
|
||||||
|
border-bottom: 1px solid $primary;
|
||||||
|
|
||||||
|
.nav-item {
|
||||||
|
flex-grow: 1;
|
||||||
|
|
||||||
|
.nav-link {
|
||||||
|
text-align: center;
|
||||||
|
border-top-left-radius: 10px;
|
||||||
|
border-top-right-radius: 10px;
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
background-color: $highlight-white;
|
||||||
|
|
||||||
|
.dark & {
|
||||||
|
color: $dark-font-color;
|
||||||
|
background-color: $dark-header-bg;
|
||||||
|
}
|
||||||
|
|
||||||
|
border-color: transparent transparent $primary transparent;
|
||||||
|
border-width: 1px 1px 6px 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
.dark & {
|
||||||
|
background-color: $dark-header-bg;
|
||||||
|
}
|
||||||
|
border-color: $primary;
|
||||||
|
border-width: 1px 1px 6px 1px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -1,186 +1,97 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div class="my-4">
|
<HorizontalTabHeader
|
||||||
<label for="language" class="form-label">
|
v-model:selected="storageLoc"
|
||||||
{{ $t("Language") }}
|
class="mt-4"
|
||||||
</label>
|
:tabs="['Browser', 'Server']"
|
||||||
<select id="language" v-model="$root.language" class="form-select">
|
/>
|
||||||
<option
|
<AppearanceSettings
|
||||||
v-for="(lang, i) in $i18n.availableLocales"
|
v-if="storageLoc == 0"
|
||||||
:key="`Lang${i}`"
|
v-model:language="$root.language"
|
||||||
:value="lang"
|
v-model:userTheme="$root.userTheme"
|
||||||
>
|
v-model:userHeartbeatBar="$root.userHeartbeatBar"
|
||||||
{{ $i18n.messages[lang].languageName }}
|
v-model:styleElapsedTime="$root.styleElapsedTime"
|
||||||
</option>
|
:languages="languagesList"
|
||||||
</select>
|
/>
|
||||||
</div>
|
<AppearanceSettings
|
||||||
<div class="my-4">
|
v-if="storageLoc == 1"
|
||||||
<label for="timezone" class="form-label">{{ $t("Theme") }}</label>
|
:language="settings.defaultAppearance.language || ''"
|
||||||
<div>
|
:userTheme="settings.defaultAppearance.theme || ''"
|
||||||
<div
|
:userHeartbeatBar="settings.defaultAppearance.heartbeatBarTheme || ''"
|
||||||
class="btn-group"
|
:styleElapsedTime="settings.defaultAppearance.styleElapsedTime || ''"
|
||||||
role="group"
|
:languages="languagesList"
|
||||||
aria-label="Basic checkbox toggle button group"
|
@update:language="updateDefaultLanguage"
|
||||||
>
|
@update:user-theme="updateDefaultTheme"
|
||||||
<input
|
@update:user-heartbeat-bar="updateDefaultHeartbeatBarTheme"
|
||||||
id="btncheck1"
|
@update:style-elapsed-time="updateDefaultStyleElapsedTime"
|
||||||
v-model="$root.userTheme"
|
/>
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="theme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="light"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck1">
|
|
||||||
{{ $t("Light") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="btncheck2"
|
|
||||||
v-model="$root.userTheme"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="theme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="dark"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck2">
|
|
||||||
{{ $t("Dark") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="btncheck3"
|
|
||||||
v-model="$root.userTheme"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="theme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="auto"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck3">
|
|
||||||
{{ $t("Auto") }}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="my-4">
|
|
||||||
<label class="form-label">{{ $t("Theme - Heartbeat Bar") }}</label>
|
|
||||||
<div>
|
|
||||||
<div
|
|
||||||
class="btn-group"
|
|
||||||
role="group"
|
|
||||||
aria-label="Basic checkbox toggle button group"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
id="btncheck4"
|
|
||||||
v-model="$root.userHeartbeatBar"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="heartbeatBarTheme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="normal"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck4">
|
|
||||||
{{ $t("Normal") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="btncheck5"
|
|
||||||
v-model="$root.userHeartbeatBar"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="heartbeatBarTheme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="bottom"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck5">
|
|
||||||
{{ $t("Bottom") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="btncheck6"
|
|
||||||
v-model="$root.userHeartbeatBar"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="heartbeatBarTheme"
|
|
||||||
autocomplete="off"
|
|
||||||
value="none"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="btncheck6">
|
|
||||||
{{ $t("None") }}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Timeline -->
|
|
||||||
<div class="my-4">
|
|
||||||
<label class="form-label">{{ $t("styleElapsedTime") }}</label>
|
|
||||||
<div>
|
|
||||||
<div class="btn-group" role="group">
|
|
||||||
<input
|
|
||||||
id="styleElapsedTimeShowNoLine"
|
|
||||||
v-model="$root.styleElapsedTime"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="styleElapsedTime"
|
|
||||||
autocomplete="off"
|
|
||||||
value="no-line"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="styleElapsedTimeShowNoLine">
|
|
||||||
{{ $t("styleElapsedTimeShowNoLine") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="styleElapsedTimeShowWithLine"
|
|
||||||
v-model="$root.styleElapsedTime"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="styleElapsedTime"
|
|
||||||
autocomplete="off"
|
|
||||||
value="with-line"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="styleElapsedTimeShowWithLine">
|
|
||||||
{{ $t("styleElapsedTimeShowWithLine") }}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="styleElapsedTimeNone"
|
|
||||||
v-model="$root.styleElapsedTime"
|
|
||||||
type="radio"
|
|
||||||
class="btn-check"
|
|
||||||
name="styleElapsedTime"
|
|
||||||
autocomplete="off"
|
|
||||||
value="none"
|
|
||||||
/>
|
|
||||||
<label class="btn btn-outline-primary" for="styleElapsedTimeNone">
|
|
||||||
{{ $t("None") }}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
import HorizontalTabHeader from "../HorizontalTabHeader.vue";
|
||||||
|
import AppearanceSettings from "./AppearanceSettings.vue";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
HorizontalTabHeader,
|
||||||
|
AppearanceSettings
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
storageLoc: 0,
|
||||||
|
languagesList: this.$i18n.availableLocales.map(lang => {
|
||||||
|
return {
|
||||||
|
value: lang,
|
||||||
|
label: this.$i18n.messages[lang].languageName,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
settings() {
|
||||||
|
return this.$parent.$parent.$parent.settings;
|
||||||
|
},
|
||||||
|
saveSettings() {
|
||||||
|
return this.$parent.$parent.$parent.saveSettings;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
updateDefaultLanguage(language) {
|
||||||
|
this.updateDefaultAppearance({
|
||||||
|
...this.settings.defaultAppearance,
|
||||||
|
language
|
||||||
|
});
|
||||||
|
},
|
||||||
|
updateDefaultTheme(theme) {
|
||||||
|
this.updateDefaultAppearance({
|
||||||
|
...this.settings.defaultAppearance,
|
||||||
|
theme: theme
|
||||||
|
});
|
||||||
|
},
|
||||||
|
updateDefaultHeartbeatBarTheme(theme) {
|
||||||
|
this.updateDefaultAppearance({
|
||||||
|
...this.settings.defaultAppearance,
|
||||||
|
heartbeatBarTheme: theme
|
||||||
|
});
|
||||||
|
},
|
||||||
|
updateDefaultStyleElapsedTime(styleElapsedTime) {
|
||||||
|
this.updateDefaultAppearance({
|
||||||
|
...this.settings.defaultAppearance,
|
||||||
|
styleElapsedTime
|
||||||
|
});
|
||||||
|
},
|
||||||
|
updateDefaultAppearance(appearance) {
|
||||||
|
this.$parent.$parent.$parent.settings.defaultAppearance = appearance;
|
||||||
|
this.saveSettings();
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "../../assets/vars.scss";
|
@import "../../assets/vars.scss";
|
||||||
|
|
||||||
.btn-check:active + .btn-outline-primary,
|
|
||||||
.btn-check:checked + .btn-outline-primary,
|
|
||||||
.btn-check:hover + .btn-outline-primary {
|
|
||||||
color: #fff;
|
|
||||||
|
|
||||||
.dark & {
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark {
|
.dark {
|
||||||
.list-group-item {
|
.list-group-item {
|
||||||
background-color: $dark-bg2;
|
background-color: $dark-bg2;
|
||||||
|
|
234
src/components/settings/AppearanceSettings.vue
Normal file
234
src/components/settings/AppearanceSettings.vue
Normal file
|
@ -0,0 +1,234 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="my-4">
|
||||||
|
<label for="language" class="form-label">
|
||||||
|
{{ $t("Language") }}
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="language"
|
||||||
|
:value="language"
|
||||||
|
class="form-select"
|
||||||
|
@input="$emit('update:language', $event.target.value)"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
v-for="(lang, i) in languages"
|
||||||
|
:key="`Lang${i}`"
|
||||||
|
:value="lang.value"
|
||||||
|
>
|
||||||
|
{{ lang.label }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="my-4">
|
||||||
|
<label for="timezone" class="form-label">{{ $t("Theme") }}</label>
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="btn-group"
|
||||||
|
role="group"
|
||||||
|
aria-label="Basic checkbox toggle button group"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
id="btncheck1"
|
||||||
|
:checked="userTheme == 'light'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="theme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="light"
|
||||||
|
@input="$emit('update:userTheme', 'light')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck1">
|
||||||
|
{{ $t("Light") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="btncheck2"
|
||||||
|
:checked="userTheme == 'dark'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="theme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="dark"
|
||||||
|
@input="$emit('update:userTheme', 'dark')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck2">
|
||||||
|
{{ $t("Dark") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="btncheck3"
|
||||||
|
:checked="userTheme == 'auto'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="theme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="auto"
|
||||||
|
@input="$emit('update:userTheme', 'auto')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck3">
|
||||||
|
{{ $t("Auto") }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="my-4">
|
||||||
|
<label class="form-label">{{ $t("Theme - Heartbeat Bar") }}</label>
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="btn-group"
|
||||||
|
role="group"
|
||||||
|
aria-label="Basic checkbox toggle button group"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
id="btncheck4"
|
||||||
|
:checked="userHeartbeatBar == 'normal'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="heartbeatBarTheme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="normal"
|
||||||
|
@input="$emit('update:userHeartbeatBar', 'normal')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck4">
|
||||||
|
{{ $t("Normal") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="btncheck5"
|
||||||
|
:checked="userHeartbeatBar == 'bottom'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="heartbeatBarTheme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="bottom"
|
||||||
|
@input="$emit('update:userHeartbeatBar', 'bottom')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck5">
|
||||||
|
{{ $t("Bottom") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="btncheck6"
|
||||||
|
:checked="userHeartbeatBar == 'none'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="heartbeatBarTheme"
|
||||||
|
autocomplete="off"
|
||||||
|
value="none"
|
||||||
|
@input="$emit('update:userHeartbeatBar', 'none')"
|
||||||
|
/>
|
||||||
|
<label class="btn btn-outline-primary" for="btncheck6">
|
||||||
|
{{ $t("None") }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Timeline -->
|
||||||
|
<div class="my-4">
|
||||||
|
<label class="form-label">{{ $t("styleElapsedTime") }}</label>
|
||||||
|
<div>
|
||||||
|
<div class="btn-group" role="group">
|
||||||
|
<input
|
||||||
|
id="styleElapsedTimeShowNoLine"
|
||||||
|
:checked="styleElapsedTime == 'no-line'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="styleElapsedTime"
|
||||||
|
autocomplete="off"
|
||||||
|
value="no-line"
|
||||||
|
@input="$emit('update:styleElapsedTime', 'no-line')"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="btn btn-outline-primary"
|
||||||
|
for="styleElapsedTimeShowNoLine"
|
||||||
|
>
|
||||||
|
{{ $t("styleElapsedTimeShowNoLine") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="styleElapsedTimeShowWithLine"
|
||||||
|
:checked="styleElapsedTime == 'with-line'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="styleElapsedTime"
|
||||||
|
autocomplete="off"
|
||||||
|
value="with-line"
|
||||||
|
@input="$emit('update:styleElapsedTime', 'with-line')"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="btn btn-outline-primary"
|
||||||
|
for="styleElapsedTimeShowWithLine"
|
||||||
|
>
|
||||||
|
{{ $t("styleElapsedTimeShowWithLine") }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input
|
||||||
|
id="styleElapsedTimeNone"
|
||||||
|
:checked="styleElapsedTime == 'none'"
|
||||||
|
type="radio"
|
||||||
|
class="btn-check"
|
||||||
|
name="styleElapsedTime"
|
||||||
|
autocomplete="off"
|
||||||
|
value="none"
|
||||||
|
@input="$emit('update:styleElapsedTime', 'none')"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="btn btn-outline-primary"
|
||||||
|
for="styleElapsedTimeNone"
|
||||||
|
>
|
||||||
|
{{ $t("None") }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="js">
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
languages: {
|
||||||
|
type: Array,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
language: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
userTheme: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
userHeartbeatBar: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
styleElapsedTime: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: [
|
||||||
|
"update:language",
|
||||||
|
"update:userTheme",
|
||||||
|
"update:userHeartbeatBar",
|
||||||
|
"update:styleElapsedTime",
|
||||||
|
],
|
||||||
|
data() {
|
||||||
|
return {};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.btn-check:active + .btn-outline-primary,
|
||||||
|
.btn-check:checked + .btn-outline-primary,
|
||||||
|
.btn-check:hover + .btn-outline-primary {
|
||||||
|
color: #fff;
|
||||||
|
|
||||||
|
.dark & {
|
||||||
|
color: #000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -1052,6 +1052,13 @@
|
||||||
"Can be found on:": "Can be found on: {0}",
|
"Can be found on:": "Can be found on: {0}",
|
||||||
"The phone number of the recipient in E.164 format.": "The phone number of the recipient in E.164 format.",
|
"The phone number of the recipient in E.164 format.": "The phone number of the recipient in E.164 format.",
|
||||||
"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.":"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.",
|
"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.":"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.",
|
||||||
|
"RabbitMQ Nodes": "RabbitMQ Management Nodes",
|
||||||
|
"rabbitmqNodesDescription": "Enter the URL for the RabbitMQ management nodes including protocol and port. Example: {0}",
|
||||||
|
"rabbitmqNodesRequired": "Please set the nodes for this monitor.",
|
||||||
|
"rabbitmqNodesInvalid": "Please use a fully qualified (starting with 'http') URL for RabbitMQ nodes.",
|
||||||
|
"RabbitMQ Username": "RabbitMQ Username",
|
||||||
|
"RabbitMQ Password": "RabbitMQ Password",
|
||||||
|
"rabbitmqHelpText": "To use the monitor, you will need to enable the Management Plugin in your RabbitMQ setup. For more information, please consult the {rabitmq_documentation}.",
|
||||||
"SendGrid API Key": "SendGrid API Key",
|
"SendGrid API Key": "SendGrid API Key",
|
||||||
"Separate multiple email addresses with commas": "Separate multiple email addresses with commas"
|
"Separate multiple email addresses with commas": "Separate multiple email addresses with commas"
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,24 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
|
if (window.defaultAppearance) {
|
||||||
|
if (window.defaultAppearance.language) {
|
||||||
|
localStorage.locale = window.defaultAppearance.language;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window.defaultAppearance.theme) {
|
||||||
|
this.userTheme = window.defaultAppearance.theme;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window.defaultAppearance.heartbeatBarTheme) {
|
||||||
|
this.userHeartbeatBar = window.defaultAppearance.heartbeatBarTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window.defaultAppearance.styleElapsedTime) {
|
||||||
|
this.styleElapsedTime = window.defaultAppearance.styleElapsedTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Default Light
|
// Default Light
|
||||||
if (! this.userTheme) {
|
if (! this.userTheme) {
|
||||||
this.userTheme = "auto";
|
this.userTheme = "auto";
|
||||||
|
|
|
@ -64,6 +64,9 @@
|
||||||
<option value="mqtt">
|
<option value="mqtt">
|
||||||
MQTT
|
MQTT
|
||||||
</option>
|
</option>
|
||||||
|
<option value="rabbitmq">
|
||||||
|
RabbitMQ
|
||||||
|
</option>
|
||||||
<option value="kafka-producer">
|
<option value="kafka-producer">
|
||||||
Kafka Producer
|
Kafka Producer
|
||||||
</option>
|
</option>
|
||||||
|
@ -90,6 +93,13 @@
|
||||||
</option>
|
</option>
|
||||||
</optgroup>
|
</optgroup>
|
||||||
</select>
|
</select>
|
||||||
|
<i18n-t v-if="monitor.type === 'rabbitmq'" keypath="rabbitmqHelpText" tag="div" class="form-text">
|
||||||
|
<template #rabitmq_documentation>
|
||||||
|
<a href="https://www.rabbitmq.com/management" target="_blank" rel="noopener noreferrer">
|
||||||
|
RabbitMQ documentation
|
||||||
|
</a>
|
||||||
|
</template>
|
||||||
|
</i18n-t>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="monitor.type === 'tailscale-ping'" class="alert alert-warning" role="alert">
|
<div v-if="monitor.type === 'tailscale-ping'" class="alert alert-warning" role="alert">
|
||||||
|
@ -233,6 +243,43 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<template v-if="monitor.type === 'rabbitmq'">
|
||||||
|
<!-- RabbitMQ Nodes List -->
|
||||||
|
<div class="my-3">
|
||||||
|
<label for="rabbitmqNodes" class="form-label">{{ $t("RabbitMQ Nodes") }}</label>
|
||||||
|
<VueMultiselect
|
||||||
|
id="rabbitmqNodes"
|
||||||
|
v-model="monitor.rabbitmqNodes"
|
||||||
|
:required="true"
|
||||||
|
:multiple="true"
|
||||||
|
:options="[]"
|
||||||
|
:placeholder="$t('Enter the list of nodes')"
|
||||||
|
:tag-placeholder="$t('Press Enter to add node')"
|
||||||
|
:max-height="500"
|
||||||
|
:taggable="true"
|
||||||
|
:show-no-options="false"
|
||||||
|
:close-on-select="false"
|
||||||
|
:clear-on-select="false"
|
||||||
|
:preserve-search="false"
|
||||||
|
:preselect-first="false"
|
||||||
|
@tag="addRabbitmqNode"
|
||||||
|
></VueMultiselect>
|
||||||
|
<div class="form-text">
|
||||||
|
{{ $t("rabbitmqNodesDescription", ["https://node1.rabbitmq.com:15672"]) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="my-3">
|
||||||
|
<label for="rabbitmqUsername" class="form-label">RabbitMQ {{ $t("RabbitMQ Username") }}</label>
|
||||||
|
<input id="rabbitmqUsername" v-model="monitor.rabbitmqUsername" type="text" required class="form-control">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="my-3">
|
||||||
|
<label for="rabbitmqPassword" class="form-label">{{ $t("RabbitMQ Password") }}</label>
|
||||||
|
<HiddenInput id="rabbitmqPassword" v-model="monitor.rabbitmqPassword" autocomplete="false" required="true"></HiddenInput>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
<!-- Hostname -->
|
<!-- Hostname -->
|
||||||
<!-- TCP Port / Ping / DNS / Steam / MQTT / Radius / Tailscale Ping / SNMP only -->
|
<!-- TCP Port / Ping / DNS / Steam / MQTT / Radius / Tailscale Ping / SNMP only -->
|
||||||
<div v-if="monitor.type === 'port' || monitor.type === 'ping' || monitor.type === 'dns' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'tailscale-ping' || monitor.type === 'snmp'" class="my-3">
|
<div v-if="monitor.type === 'port' || monitor.type === 'ping' || monitor.type === 'dns' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'tailscale-ping' || monitor.type === 'snmp'" class="my-3">
|
||||||
|
@ -549,7 +596,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Timeout: HTTP / Keyword / SNMP only -->
|
<!-- Timeout: HTTP / Keyword / SNMP only -->
|
||||||
<div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' || monitor.type === 'snmp'" class="my-3">
|
<div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' || monitor.type === 'snmp' || monitor.type === 'rabbitmq'" class="my-3">
|
||||||
<label for="timeout" class="form-label">{{ $t("Request Timeout") }} ({{ $t("timeoutAfter", [ monitor.timeout || clampTimeout(monitor.interval) ]) }})</label>
|
<label for="timeout" class="form-label">{{ $t("Request Timeout") }} ({{ $t("timeoutAfter", [ monitor.timeout || clampTimeout(monitor.interval) ]) }})</label>
|
||||||
<input id="timeout" v-model="monitor.timeout" type="number" class="form-control" required min="0" step="0.1">
|
<input id="timeout" v-model="monitor.timeout" type="number" class="form-control" required min="0" step="0.1">
|
||||||
</div>
|
</div>
|
||||||
|
@ -1122,6 +1169,9 @@ const monitorDefaults = {
|
||||||
kafkaProducerAllowAutoTopicCreation: false,
|
kafkaProducerAllowAutoTopicCreation: false,
|
||||||
gamedigGivenPortOnly: true,
|
gamedigGivenPortOnly: true,
|
||||||
remote_browser: null,
|
remote_browser: null,
|
||||||
|
rabbitmqNodes: [],
|
||||||
|
rabbitmqUsername: "",
|
||||||
|
rabbitmqPassword: "",
|
||||||
conditions: []
|
conditions: []
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1709,6 +1759,10 @@ message HealthCheckResponse {
|
||||||
this.monitor.kafkaProducerBrokers.push(newBroker);
|
this.monitor.kafkaProducerBrokers.push(newBroker);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
addRabbitmqNode(newNode) {
|
||||||
|
this.monitor.rabbitmqNodes.push(newNode);
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate form input
|
* Validate form input
|
||||||
* @returns {boolean} Is the form input valid?
|
* @returns {boolean} Is the form input valid?
|
||||||
|
@ -1736,6 +1790,17 @@ message HealthCheckResponse {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.monitor.type === "rabbitmq") {
|
||||||
|
if (this.monitor.rabbitmqNodes.length === 0) {
|
||||||
|
toast.error(this.$t("rabbitmqNodesRequired"));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!this.monitor.rabbitmqNodes.every(node => node.startsWith("http://") || node.startsWith("https://"))) {
|
||||||
|
toast.error(this.$t("rabbitmqNodesInvalid"));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -183,6 +183,15 @@ export default {
|
||||||
this.settings.trustProxy = false;
|
this.settings.trustProxy = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.settings.defaultAppearance === undefined) {
|
||||||
|
this.settings.defaultAppearance = {
|
||||||
|
theme: null,
|
||||||
|
language: null,
|
||||||
|
heartbeatBarTheme: null,
|
||||||
|
styleElapsedTime: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
this.settingsLoaded = true;
|
this.settingsLoaded = true;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
53
test/backend-test/test-rabbitmq.js
Normal file
53
test/backend-test/test-rabbitmq.js
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
const { describe, test } = require("node:test");
|
||||||
|
const assert = require("node:assert");
|
||||||
|
const { RabbitMQContainer } = require("@testcontainers/rabbitmq");
|
||||||
|
const { RabbitMqMonitorType } = require("../../server/monitor-types/rabbitmq");
|
||||||
|
const { UP, DOWN, PENDING } = require("../../src/util");
|
||||||
|
|
||||||
|
describe("RabbitMQ Single Node", {
|
||||||
|
skip: !!process.env.CI && (process.platform !== "linux" || process.arch !== "x64"),
|
||||||
|
}, () => {
|
||||||
|
test("RabbitMQ is running", async () => {
|
||||||
|
// The default timeout of 30 seconds might not be enough for the container to start
|
||||||
|
const rabbitMQContainer = await new RabbitMQContainer().withStartupTimeout(60000).start();
|
||||||
|
const rabbitMQMonitor = new RabbitMqMonitorType();
|
||||||
|
const connectionString = `http://${rabbitMQContainer.getHost()}:${rabbitMQContainer.getMappedPort(15672)}`;
|
||||||
|
|
||||||
|
const monitor = {
|
||||||
|
rabbitmqNodes: JSON.stringify([ connectionString ]),
|
||||||
|
rabbitmqUsername: "guest",
|
||||||
|
rabbitmqPassword: "guest",
|
||||||
|
};
|
||||||
|
|
||||||
|
const heartbeat = {
|
||||||
|
msg: "",
|
||||||
|
status: PENDING,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
await rabbitMQMonitor.check(monitor, heartbeat, {});
|
||||||
|
assert.strictEqual(heartbeat.status, UP);
|
||||||
|
assert.strictEqual(heartbeat.msg, "OK");
|
||||||
|
} finally {
|
||||||
|
rabbitMQContainer.stop();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("RabbitMQ is not running", async () => {
|
||||||
|
const rabbitMQMonitor = new RabbitMqMonitorType();
|
||||||
|
const monitor = {
|
||||||
|
rabbitmqNodes: JSON.stringify([ "http://localhost:15672" ]),
|
||||||
|
rabbitmqUsername: "rabbitmqUser",
|
||||||
|
rabbitmqPassword: "rabbitmqPass",
|
||||||
|
};
|
||||||
|
|
||||||
|
const heartbeat = {
|
||||||
|
msg: "",
|
||||||
|
status: PENDING,
|
||||||
|
};
|
||||||
|
|
||||||
|
await rabbitMQMonitor.check(monitor, heartbeat, {});
|
||||||
|
assert.strictEqual(heartbeat.status, DOWN);
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
Loading…
Reference in a new issue