TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-05-22 06:52:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Write MQTT published topic in message

Browse source 
So that when wildcards for monitoring are used,
the full published topic is displayed.
This commit is contained in:
Eric Duminil 2024-12-01 21:24:21 +01:00
parent 558195ae6a
commit a8b8a21f4c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/monitor-types/mqtt.js
View file

@ -10,7 +10,7 @@ class MqttMonitorType extends MonitorType {
* @inheritdoc
*/
async check(monitor, heartbeat, server) {
const receivedMessage = await this.mqttAsync(monitor.hostname, monitor.mqttTopic, {
const [ messageTopic, receivedMessage ] = await this.mqttAsync(monitor.hostname, monitor.mqttTopic, {
port: monitor.port,
username: monitor.mqttUsername,
password: monitor.mqttPassword,
@ -24,7 +24,7 @@ class MqttMonitorType extends MonitorType {
if (monitor.mqttCheckType === "keyword") {
if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
heartbeat.msg = `Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`;
heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
heartbeat.status = UP;
} else {
throw Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
@ -103,7 +103,7 @@ class MqttMonitorType extends MonitorType {
client.on("message", (messageTopic, message) => {
client.end();
clearTimeout(timeoutID);
resolve(message.toString("utf8"));
resolve([ messageTopic, message.toString("utf8") ]);
});
});