Merge 02af171ec9 into 65e6f10820

Update to latest stable version on the main branch (#5645 )
Fix #2946 - allow push monitors to update prometheus
2025-03-12 20:34:46 +00:00 · 2025-02-27 11:27:00 +00:00 · 2025-02-27 19:26:46 +08:00 · 2024-01-03 13:17:34 -08:00
2 changed files with 5 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -41,7 +41,7 @@
        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push",
        "upload-artifacts": "node extra/release/upload-artifacts.mjs",
        "upload-artifacts-beta": "node extra/release/upload-artifacts-beta.mjs",
-        "setup": "git checkout 1.23.15 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.16 && npm ci --production && npm run download-dist",
        "download-dist": "node extra/download-dist.js",
        "mark-as-nightly": "node extra/mark-as-nightly.js",
        "reset-password": "node extra/reset-password.js",
--- 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 {
Author	SHA1	Message	Date
John W Higgins	16124ca6c2	Merge `02af171ec9` into `65e6f10820`	2025-02-27 11:27:00 +00:00
Melroy van den Berg	65e6f10820	Update to latest stable version on the main branch (#5645 ) Some checks are pending Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions Details Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run Details Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run Details Auto Test / check-linters (push) Waiting to run Details Auto Test / e2e-test (push) Waiting to run Details CodeQL / Analyze (push) Waiting to run Details Merge Conflict Labeler / Labeling (push) Waiting to run Details validate / json-yaml-validate (push) Waiting to run Details validate / validate (push) Waiting to run Details	2025-02-27 19:26:46 +08:00
John W Higgins	02af171ec9	Fix #2946 - allow push monitors to update prometheus	2024-01-03 13:17:34 -08:00