From 2b2941cd8367d36de547de9affe4855376f81f26 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 12 Jan 2026 13:35:30 +0100
Subject: [PATCH 1/3] feat: don't show a retry interval without retries enabled
 (#6685)

---
 src/pages/EditMonitor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 84626eb60..0a08c9a6f 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -1147,7 +1147,7 @@
                                 </div>
                             </div>
 
-                            <div class="my-3">
+                            <div v-if="monitor.maxretries" class="my-3">
                                 <label for="retry-interval" class="form-label">
                                     {{ $t("Heartbeat Retry Interval") }}
                                     <span>({{ $t("retryCheckEverySecond", [monitor.retryInterval]) }})</span>

From c7a8b7affdd408e96f3d4b545f9cc2ba015f1a49 Mon Sep 17 00:00:00 2001
From: SID <158349177+0xsid0703@users.noreply.github.com>
Date: Mon, 12 Jan 2026 07:49:43 -0800
Subject: [PATCH 2/3] feat: Add option to retry only on status code failure for
 JSON Query monitors (#5693) (#6687)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 ...0-add-json-query-retry-only-status-code.js | 12 +++++++
 server/model/monitor.js                       | 31 ++++++++++++++++---
 server/server.js                              |  5 +++
 src/lang/en.json                              |  2 ++
 src/pages/EditMonitor.vue                     | 19 ++++++++++++
 5 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 db/knex_migrations/2026-01-15-0000-add-json-query-retry-only-status-code.js

diff --git a/db/knex_migrations/2026-01-15-0000-add-json-query-retry-only-status-code.js b/db/knex_migrations/2026-01-15-0000-add-json-query-retry-only-status-code.js
new file mode 100644
index 000000000..dd5f0955a
--- /dev/null
+++ b/db/knex_migrations/2026-01-15-0000-add-json-query-retry-only-status-code.js
@@ -0,0 +1,12 @@
+exports.up = function (knex) {
+    // Add new column to table monitor for json-query retry behavior
+    return knex.schema.alterTable("monitor", function (table) {
+        table.boolean("retry_only_on_status_code_failure").defaultTo(false).notNullable();
+    });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.dropColumn("retry_only_on_status_code_failure");
+    });
+};
diff --git a/server/model/monitor.js b/server/model/monitor.js
index f05ddd744..600878936 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -144,6 +144,7 @@ class Monitor extends BeanModel {
             timeout: this.timeout,
             interval: this.interval,
             retryInterval: this.retryInterval,
+            retryOnlyOnStatusCodeFailure: Boolean(this.retry_only_on_status_code_failure),
             resendInterval: this.resendInterval,
             keyword: this.keyword,
             invertKeyword: this.isInvertKeyword(),
@@ -934,12 +935,32 @@ class Monitor extends BeanModel {
                 // Just reset the retries
                 if (this.isUpsideDown() && bean.status === UP) {
                     retries = 0;
-                } else if (this.maxretries > 0 && retries < this.maxretries) {
-                    retries++;
-                    bean.status = PENDING;
+                } else if (this.type === "json-query" && this.retry_only_on_status_code_failure) {
+                    // For json-query monitors with retry_only_on_status_code_failure enabled,
+                    // only retry if the error is NOT from JSON query evaluation
+                    // JSON query errors have the message "JSON query does not pass..."
+                    const isJsonQueryError =
+                        typeof error.message === "string" && error.message.includes("JSON query does not pass");
+
+                    if (isJsonQueryError) {
+                        // Don't retry on JSON query failures, mark as DOWN immediately
+                        retries = 0;
+                    } else if (this.maxretries > 0 && retries < this.maxretries) {
+                        retries++;
+                        bean.status = PENDING;
+                    } else {
+                        // Continue counting retries during DOWN
+                        retries++;
+                    }
                 } else {
-                    // Continue counting retries during DOWN
-                    retries++;
+                    // General retry logic for all other monitor types
+                    if (this.maxretries > 0 && retries < this.maxretries) {
+                        retries++;
+                        bean.status = PENDING;
+                    } else {
+                        // Continue counting retries during DOWN
+                        retries++;
+                    }
                 }
             }
 
diff --git a/server/server.js b/server/server.js
index b683b7114..c6168b897 100644
--- a/server/server.js
+++ b/server/server.js
@@ -753,6 +753,10 @@ let needSetup = false;
                 }
 
                 bean.import(monitor);
+                // Map camelCase frontend property to snake_case database column
+                if (monitor.retryOnlyOnStatusCodeFailure !== undefined) {
+                    bean.retry_only_on_status_code_failure = monitor.retryOnlyOnStatusCodeFailure;
+                }
                 bean.user_id = socket.userID;
 
                 bean.validate();
@@ -905,6 +909,7 @@ let needSetup = false;
                 bean.snmpVersion = monitor.snmpVersion;
                 bean.snmpOid = monitor.snmpOid;
                 bean.jsonPathOperator = monitor.jsonPathOperator;
+                bean.retry_only_on_status_code_failure = Boolean(monitor.retryOnlyOnStatusCodeFailure);
                 bean.timeout = monitor.timeout;
                 bean.rabbitmqNodes = JSON.stringify(monitor.rabbitmqNodes);
                 bean.rabbitmqUsername = monitor.rabbitmqUsername;
diff --git a/src/lang/en.json b/src/lang/en.json
index 72f38f9d2..d7f7fb7b5 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -86,6 +86,8 @@
     "resendEveryXTimes": "Resend every {0} times",
     "resendDisabled": "Resend disabled",
     "retriesDescription": "Maximum retries before the service is marked as down and a notification is sent",
+    "Only retry if status code check fails": "Only retry if status code check fails",
+    "retryOnlyOnStatusCodeFailureDescription": "If enabled, retries will only occur when the HTTP status code check fails (e.g., server is down). If the status code check passes but the JSON query fails, the monitor will be marked as down immediately without retries.",
     "ignoredTLSError": "TLS/SSL errors have been ignored",
     "ignoreTLSError": "Ignore TLS/SSL errors for HTTPS websites",
     "ignoreTLSErrorGeneral": "Ignore TLS/SSL error for connection",
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 0a08c9a6f..3dad58dc8 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -1167,6 +1167,24 @@
                                 </div>
                             </div>
 
+                            <!-- Retry only on status code failure: JSON Query only -->
+                            <div v-if="monitor.type === 'json-query' && monitor.maxretries > 0" class="my-3">
+                                <div class="form-check">
+                                    <input
+                                        id="retry-only-on-status-code-failure"
+                                        v-model="monitor.retryOnlyOnStatusCodeFailure"
+                                        type="checkbox"
+                                        class="form-check-input"
+                                    />
+                                    <label for="retry-only-on-status-code-failure" class="form-check-label">
+                                        {{ $t("Only retry if status code check fails") }}
+                                    </label>
+                                </div>
+                                <div class="form-text">
+                                    {{ $t("retryOnlyOnStatusCodeFailureDescription") }}
+                                </div>
+                            </div>
+
                             <!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
                             <div
                                 v-if="
@@ -2158,6 +2176,7 @@ const monitorDefaults = {
     retryInterval: 60,
     resendInterval: 0,
     maxretries: 0,
+    retryOnlyOnStatusCodeFailure: false,
     notificationIDList: {},
     ignoreTls: false,
     upsideDown: false,

From 731ffd2883d5cd41e53c4727b5ada46eaa90dc56 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 12 Jan 2026 16:57:41 +0100
Subject: [PATCH 3/3] chore: make the logging of uptime_calc more consistent
 witht he rest of the logs (#6686)

---
 server/uptime-calculator.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/uptime-calculator.js b/server/uptime-calculator.js
index 94d7e7733..d0ad17425 100644
--- a/server/uptime-calculator.js
+++ b/server/uptime-calculator.js
@@ -217,7 +217,7 @@ class UptimeCalculator {
         let flatStatus = this.flatStatus(status);
 
         if (flatStatus === DOWN && ping > 0) {
-            log.debug("uptime-calc", "The ping is not effective when the status is DOWN");
+            log.debug("uptime_calc", "The ping is not effective when the status is DOWN");
         }
 
         let divisionKey = this.getMinutelyKey(date);
@@ -295,7 +295,7 @@ class UptimeCalculator {
 
         // Don't store data in test mode
         if (process.env.TEST_BACKEND) {
-            log.debug("uptime-calc", "Skip storing data in test mode");
+            log.debug("uptime_calc", "Skip storing data in test mode");
             return date;
         }
 
@@ -358,7 +358,7 @@ class UptimeCalculator {
         if (!this.migrationMode) {
             // Remove the old data
             // TODO: Improvement: Convert it to a job?
-            log.debug("uptime-calc", "Remove old data");
+            log.debug("uptime_calc", "Remove old data");
             await R.exec("DELETE FROM stat_minutely WHERE monitor_id = ? AND timestamp < ?", [
                 this.monitorID,
                 this.getMinutelyKey(currentDate.subtract(this.statMinutelyKeepHour, "hour")),