Merge 02af171ec9 into 7dc6191b0a

fix: add notification-fallback for better google chat popups (#5476 )
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-02-26 05:25:56 +00:00 · 2025-01-24 17:49:44 +00:00 · 2025-01-24 18:49:29 +01:00 · 2024-01-03 13:17:34 -08:00
2 changed files with 5 additions and 0 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/server/notification-providers/google-chat.js
+++ b/server/notification-providers/google-chat.js
@ -72,6 +72,7 @@ class GoogleChat extends NotificationProvider {

            // construct json data
            let data = {
+                fallbackText: chatHeader["title"],
                cardsV2: [
                    {
                        card: {
Author	SHA1	Message	Date
John W Higgins	45feead530	Merge `02af171ec9` into `7dc6191b0a`	2025-01-24 17:49:44 +00:00
Elliot Matson	7dc6191b0a	fix: add notification-fallback for better google chat popups (#5476 ) Some checks failed 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 Auto Test / e2e-test (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 Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-24 18:49:29 +01:00
John W Higgins	02af171ec9	Fix #2946 - allow push monitors to update prometheus	2024-01-03 13:17:34 -08:00