diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 617f8bee1..a6844df60 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -42,4 +42,8 @@ jobs: run: npm run fmt continue-on-error: true + - name: Compile TypeScript + run: npm run tsc + continue-on-error: true + - uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27 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 b797b519b..3b8505ae9 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -147,6 +147,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(), @@ -966,12 +967,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 5efd726ff..885e88340 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(); @@ -908,6 +912,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/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")), diff --git a/src/lang/en.json b/src/lang/en.json index 2ec25d1f7..e68cc6be9 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 399ca9dd2..c87978a67 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -1167,6 +1167,24 @@ + +
+
+ + +
+
+ {{ $t("retryOnlyOnStatusCodeFailureDescription") }} +
+
+
{ - const randomBytes = new Uint8Array(numBytes); - for (let i = 0; i < numBytes; i += 65536) { - window.crypto.getRandomValues(randomBytes.subarray(i, i + Math.min(numBytes - i, 65536))); - } - return randomBytes; - }; - } - : function () { - return require("crypto").randomBytes; - } -)(); +const getRandomBytes = (typeof window !== "undefined" && window.crypto + ? + function () { + return (numBytes) => { + const randomBytes = new Uint8Array(numBytes); + for (let i = 0; i < numBytes; i += 65536) { + window.crypto.getRandomValues(randomBytes.subarray(i, i + Math.min(numBytes - i, 65536))); + } + return randomBytes; + }; + } + : + function () { + return require("crypto").randomBytes; + })(); function getCryptoRandomInt(min, max) { const range = max - min; if (range >= Math.pow(2, 32)) { @@ -386,7 +303,8 @@ function getCryptoRandomInt(min, max) { randomValue = randomValue & mask; if (randomValue <= range) { return min + randomValue; - } else { + } + else { return getCryptoRandomInt(min, max); } } @@ -467,7 +385,8 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue let response; try { response = JSON.parse(data); - } catch (_a) { + } + catch (_a) { response = (typeof data === "object" || typeof data === "number") && !Buffer.isBuffer(data) ? data : data.toString(); } @@ -479,17 +398,13 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue if (Array.isArray(response)) { const responseStr = JSON.stringify(response); const truncatedResponse = responseStr.length > 25 ? responseStr.substring(0, 25) + "...]" : responseStr; - throw new Error( - "JSON query returned the array " + - truncatedResponse + - ", but a primitive value is required. " + - "Modify your query to return a single value via [0] to get the first element or use an aggregation like $count(), $sum() or $boolean()." - ); + throw new Error("JSON query returned the array " + + truncatedResponse + + ", but a primitive value is required. " + + "Modify your query to return a single value via [0] to get the first element or use an aggregation like $count(), $sum() or $boolean()."); } if (typeof response === "object" || response instanceof Date || typeof response === "function") { - throw new Error( - `The post-JSON query evaluated response from the server is of type ${typeof response}, which cannot be directly compared to the expected value` - ); + throw new Error(`The post-JSON query evaluated response from the server is of type ${typeof response}, which cannot be directly compared to the expected value`); } let jsonQueryExpression; switch (jsonPathOperator) { @@ -517,15 +432,14 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue expected: expectedValue.toString(), }); if (status === undefined) { - throw new Error( - "Query evaluation returned undefined. Check query syntax and the structure of the response data" - ); + throw new Error("Query evaluation returned undefined. Check query syntax and the structure of the response data"); } return { status, response, }; - } catch (err) { + } + catch (err) { response = JSON.stringify(response); response = response && response.length > 50 ? `${response.substring(0, 100)}… (truncated)` : response; throw new Error(`Error evaluating JSON query: ${err.message}. Response from server was: ${response}`);