Merge branch 'master' into websocket_test

server/monitor-types/dns.js

@@ -34,12 +34,16 @@ class DnsMonitorType extends MonitorType {
         switch (monitor.dns_resolve_type) {
             case "A":
             case "AAAA":
-            case "TXT":
             case "PTR":
                 dnsMessage = `Records: ${dnsRes.join(" | ")}`;
                 conditionsResult = dnsRes.some(record => handleConditions({ record }));
                 break;
 
+            case "TXT":
+                dnsMessage = `Records: ${dnsRes.join(" | ")}`;
+                conditionsResult = dnsRes.flat().some(record => handleConditions({ record }));
+                break;
+
             case "CNAME":
                 dnsMessage = dnsRes[0];
                 conditionsResult = handleConditions({ record: dnsRes[0] });

server/notification-providers/mattermost.js

@@ -79,11 +79,13 @@ class Mattermost extends NotificationProvider {
                         fallback:
                             "Your " +
                             monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         color: color,
                         title:
                             monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         title_link: monitorJSON.url,