Merge df2f76dbe3 into 4228dd0a29

server/model/heartbeat.js

@@ -40,6 +40,14 @@ class Heartbeat extends BeanModel {
         };
     }
 
+    /**
+     * TODO: Find the msg from the `msg` table and get the msg_id
+     * @param value
+     */
+    set msg(value) {
+        throw new Error("Not implemented yet")
+    }
+
 }
 
 module.exports = Heartbeat;

src/pages/EditMonitor.vue

@@ -1443,12 +1443,15 @@ message HealthCheckResponse {
                 }
             }
 
+            // Set a default timeout if the monitor type has changed or if it's a new monitor
+            if (oldType || this.isAdd) {
                 if (this.monitor.type === "snmp") {
                 // snmp is not expected to be executed via the internet => we can choose a lower default timeout
                     this.monitor.timeout = 5;
                 } else {
                     this.monitor.timeout = 48;
                 }
+            }
 
             // Set default SNMP version
             if (!this.monitor.snmpVersion) {