Merge 02af171ec9 into 778363a948

fix(notification): #5323 fix EditMonitor.vue useToast error (#5333 )
Fix #2946 - allow push monitors to update prometheus
2024-11-23 14:54:05 +00:00 · 2024-11-11 10:08:56 +00:00 · 2024-11-11 11:08:43 +01:00 · 2024-01-03 13:17:34 -08:00
2 changed files with 5 additions and 1 deletions
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -645,6 +645,10 @@ class Monitor extends BeanModel {
                            retries = 0;
                            log.debug("monitor", `[${this.name}] timeout = ${timeout}`);
                            this.heartbeatInterval = setTimeout(safeBeat, timeout);
+
+                            bean.status = UP;
+                            this.prometheus?.update(bean, tlsInfo);
+
                            return;
                        }
                    } else {
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@ -1065,7 +1065,7 @@ import { hostNameRegexPattern } from "../util-frontend";
 import HiddenInput from "../components/HiddenInput.vue";
 import EditMonitorConditions from "../components/EditMonitorConditions.vue";

-const toast = useToast;
+const toast = useToast();

 const pushTokenLength = 32;
Author	SHA1	Message	Date
John W Higgins	d763cb7a2d	Merge `02af171ec9` into `778363a948`	2024-11-11 10:08:56 +00:00
Dorence Deng	778363a948	fix(notification): #5323 fix EditMonitor.vue useToast error (#5333 ) Some checks failed Auto Test / e2e-test (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / check-linters (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details	2024-11-11 11:08:43 +01:00
John W Higgins	02af171ec9	Fix #2946 - allow push monitors to update prometheus	2024-01-03 13:17:34 -08:00