Merge 02af171ec9 into 6899603eb7

fix #5314 Email Address Friendly Name Error (#5318 )
Fix #2946 - allow push monitors to update prometheus
2025-02-17 09:05:56 +00:00 · 2024-11-09 15:30:20 +00:00 · 2024-11-09 23:30:08 +08:00 · 2024-01-03 13:17:34 -08:00
2 changed files with 8 additions and 4 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/components/notifications/SendGrid.vue
+++ b/src/components/notifications/SendGrid.vue
@ -5,20 +5,20 @@
    </div>
    <div class="mb-3">
        <label for="sendgrid-from-email" class="form-label">{{ $t("From Email") }}</label>
-        <input id="sendgrid-from-email" v-model="$parent.notification.sendgridFromEmail" type="email" class="form-control" required>
+        <input id="sendgrid-from-email" v-model="$parent.notification.sendgridFromEmail" type="text" class="form-control" required>
    </div>
    <div class="mb-3">
        <label for="sendgrid-to-email" class="form-label">{{ $t("To Email") }}</label>
-        <input id="sendgrid-to-email" v-model="$parent.notification.sendgridToEmail" type="email" class="form-control" required>
+        <input id="sendgrid-to-email" v-model="$parent.notification.sendgridToEmail" type="text" class="form-control" required>
    </div>
    <div class="mb-3">
        <label for="sendgrid-cc-email" class="form-label">{{ $t("smtpCC") }}</label>
-        <input id="sendgrid-cc-email" v-model="$parent.notification.sendgridCcEmail" type="email" class="form-control">
+        <input id="sendgrid-cc-email" v-model="$parent.notification.sendgridCcEmail" type="text" class="form-control">
        <div class="form-text">{{ $t("Separate multiple email addresses with commas") }}</div>
    </div>
    <div class="mb-3">
        <label for="sendgrid-bcc-email" class="form-label">{{ $t("smtpBCC") }}</label>
-        <input id="sendgrid-bcc-email" v-model="$parent.notification.sendgridBccEmail" type="email" class="form-control">
+        <input id="sendgrid-bcc-email" v-model="$parent.notification.sendgridBccEmail" type="text" class="form-control">
        <small class="form-text text-muted">{{ $t("Separate multiple email addresses with commas") }}</small>
    </div>
    <div class="mb-3">
Author	SHA1	Message	Date
John W Higgins	98fc77c598	Merge `02af171ec9` into `6899603eb7`	2024-11-09 15:30:20 +00:00
Abhigyan Mohanta	6899603eb7	fix #5314 Email Address Friendly Name Error (#5318 ) Some checks failed 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 / 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 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-09 23:30:08 +08:00
John W Higgins	02af171ec9	Fix #2946 - allow push monitors to update prometheus	2024-01-03 13:17:34 -08:00