From f27811c3946f400f91956351c05f3cff67cf4f6b Mon Sep 17 00:00:00 2001 From: Andrea Mastellone Date: Tue, 10 Jun 2025 19:41:09 -0400 Subject: [PATCH 1/8] ntfy.sh separate down priority (#5893) Co-authored-by: Frank Elsinga --- server/notification-providers/ntfy.js | 4 ++-- src/components/notifications/Ntfy.vue | 16 ++++++++++++++-- src/lang/en.json | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js index ad1d39f8f..e44e7e868 100644 --- a/server/notification-providers/ntfy.js +++ b/server/notification-providers/ntfy.js @@ -41,8 +41,8 @@ class Ntfy extends NotificationProvider { if (heartbeatJSON.status === DOWN) { tags = [ "red_circle" ]; status = "Down"; - // if priority is not 5, increase priority for down alerts - priority = priority === 5 ? priority : priority + 1; + // defaults to max(priority + 1, 5) + priority = notification.ntfyPriorityDown || (priority === 5 ? priority : priority + 1); } else if (heartbeatJSON["status"] === UP) { tags = [ "green_circle" ]; status = "Up"; diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue index ba94451a2..3de807d1e 100644 --- a/src/components/notifications/Ntfy.vue +++ b/src/components/notifications/Ntfy.vue @@ -13,13 +13,20 @@
+ +
-

+

{{ $t("ntfyPriorityHelptextAllEvents") }}

+ + DOWN + {{ $parent.notification.ntfyPriority }} + {{ $parent.notification.ntfyPriorityDown }} + DOWN - {{ $parent.notification.ntfyPriority + 1 }} + {{ $parent.notification.ntfyPriorityDown }}
@@ -69,6 +76,11 @@ export default { this.$parent.notification.ntfyPriority = 5; } + // Setting down priority if it's undefined + if (typeof this.$parent.notification.ntfyPriorityDown === "undefined") { + this.$parent.notification.ntfyPriorityDown = 5; + } + // Handling notifications that added before 1.22.0 if (typeof this.$parent.notification.ntfyAuthenticationMethod === "undefined") { if (!this.$parent.notification.ntfyusername) { diff --git a/src/lang/en.json b/src/lang/en.json index ef4d92fcb..1ca6ef105 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -841,6 +841,8 @@ "ntfyAuthenticationMethod": "Authentication Method", "ntfyPriorityHelptextAllEvents": "All events are sent with the maximum priority", "ntfyPriorityHelptextAllExceptDown": "All events are sent with this priority, except {0}-events, which have a priority of {1}", + "ntfyPriorityHelptextPriorityHigherThanDown": "Regular priority should be higher than {0} priority. Priority {1} is higher than {0} priority {2}", + "ntfyPriorityDown": "Priority for DOWN-events", "ntfyUsernameAndPassword": "Username and Password", "twilioAccountSID": "Account SID", "twilioApiKey": "Api Key (optional)", From 4d51aaa6f8b6b847ce8779e4659718faf5bd6f62 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Thu, 12 Jun 2025 00:28:04 +0200 Subject: [PATCH 2/8] Fix invalid maintenance date (#5901) --- server/model/maintenance.js | 10 ++++++++++ src/pages/EditMaintenance.vue | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/model/maintenance.js b/server/model/maintenance.js index 7111a18cb..d3314d3f8 100644 --- a/server/model/maintenance.js +++ b/server/model/maintenance.js @@ -158,12 +158,22 @@ class Maintenance extends BeanModel { bean.active = obj.active; if (obj.dateRange[0]) { + const parsedDate = new Date(obj.dateRange[0]); + if (isNaN(parsedDate.getTime()) || parsedDate.getFullYear() > 9999) { + throw new Error("Invalid start date"); + } + bean.start_date = obj.dateRange[0]; } else { bean.start_date = null; } if (obj.dateRange[1]) { + const parsedDate = new Date(obj.dateRange[1]); + if (isNaN(parsedDate.getTime()) || parsedDate.getFullYear() > 9999) { + throw new Error("Invalid end date"); + } + bean.end_date = obj.dateRange[1]; } else { bean.end_date = null; diff --git a/src/pages/EditMaintenance.vue b/src/pages/EditMaintenance.vue index 953fe337c..6341c5bed 100644 --- a/src/pages/EditMaintenance.vue +++ b/src/pages/EditMaintenance.vue @@ -223,12 +223,12 @@
{{ $t("startDateTime") }}
- +
{{ $t("endDateTime") }}
- +
From c7bacbb7fe89ed14855c5237c10f497281432247 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Thu, 12 Jun 2025 01:42:25 +0200 Subject: [PATCH 3/8] Ensure maintenance are always runned at the right moment (#5903) Co-authored-by: Frank Elsinga --- server/model/maintenance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/model/maintenance.js b/server/model/maintenance.js index d3314d3f8..0a70063ff 100644 --- a/server/model/maintenance.js +++ b/server/model/maintenance.js @@ -243,7 +243,7 @@ class Maintenance extends BeanModel { try { this.beanMeta.status = "scheduled"; - let startEvent = (customDuration = 0) => { + let startEvent = async (customDuration = 0) => { log.info("maintenance", "Maintenance id: " + this.id + " is under maintenance now"); this.beanMeta.status = "under-maintenance"; From 8909cd008c87f7ba9c4a70f93f5f7a40e9504683 Mon Sep 17 00:00:00 2001 From: grvwy <147989282+grvwy@users.noreply.github.com> Date: Thu, 12 Jun 2025 03:52:35 +0200 Subject: [PATCH 4/8] feat: add multiple tags in bulk for a monitor (#5846) Co-authored-by: Frank Elsinga --- server/model/status_page.js | 4 +- src/components/TagsManager.vue | 353 +++++++++++++++++++++-------- src/lang/en.json | 10 +- test/e2e/specs/status-page.spec.js | 34 ++- 4 files changed, 296 insertions(+), 105 deletions(-) diff --git a/server/model/status_page.js b/server/model/status_page.js index 38f548ebb..2f3511ec5 100644 --- a/server/model/status_page.js +++ b/server/model/status_page.js @@ -120,8 +120,8 @@ class StatusPage extends BeanModel { const head = $("head"); - if (statusPage.googleAnalyticsTagId) { - let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.googleAnalyticsTagId); + if (statusPage.google_analytics_tag_id) { + let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.google_analytics_tag_id); head.append($(escapedGoogleAnalyticsScript)); } diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue index aa8f93a83..e7e370a4c 100644 --- a/src/components/TagsManager.vue +++ b/src/components/TagsManager.vue @@ -4,7 +4,7 @@
@@ -20,10 +20,20 @@ {{ $t("Add") }}
-
+
+

{{ $t("Add Tags") }}

+
+ +
+ -
- {{ $t("Tag with this name already exist.") }} -
-
- {{ $t("Tag with this value already exist.") }} -
-
- + +
+ {{ $t(validateDraftTag.messageKey, validateDraftTag.messageParams) }}
+
+ + + +
@@ -176,71 +180,146 @@ export default { newTags: [], /** @type {Tag[]} */ deleteTags: [], + /** + * @type {Array} Holds tag objects staged for addition. + * Each object: { name, color, value, isNewSystemTag, systemTagId, keyForList } + */ + stagedForBatchAdd: [], newDraftTag: { name: null, select: null, color: null, value: "", - invalid: true, - nameInvalid: false, }, }; }, computed: { tagOptions() { - const tagOptions = this.existingTags; + const tagOptions = [ ...this.existingTags ]; // Create a copy + + // Add tags from newTags for (const tag of this.newTags) { if (!tagOptions.find(t => t.name === tag.name && t.color === tag.color)) { tagOptions.push(tag); } } + + // Add newly created system tags from staging area + for (const stagedTag of this.stagedForBatchAdd) { + if (stagedTag.isNewSystemTag) { + // Check if this system tag is already in the options + if (!tagOptions.find(t => t.name === stagedTag.name && t.color === stagedTag.color)) { + // Create a tag option object for the dropdown + tagOptions.push({ + id: null, // Will be assigned when actually created + name: stagedTag.name, + color: stagedTag.color + }); + } + } + } + return tagOptions; }, selectedTags() { - return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.tag_id === tag.tag_id)); + // Helper function to normalize tag values for comparison + const normalizeValue = (value) => { + if (value === null || value === undefined) { + return ""; + } + return String(value).trim(); + }; + + // Helper function to get tag ID from different structures + const getTagId = (tag) => tag.tag_id || tag.id; + + return this.preSelectedTags.concat(this.newTags).filter(tag => + !this.deleteTags.find(monitorTag => { + const tagIdMatch = getTagId(monitorTag) === getTagId(tag); + const valueMatch = normalizeValue(monitorTag.value) === normalizeValue(tag.value); + return tagIdMatch && valueMatch; + }) + ); }, + /** + * @returns {boolean} True if more new system tags can be staged, false otherwise. + */ + canStageMoreNewSystemTags() { + return true; // Always allow adding more tags, no limit + }, + /** + * Provides the color options for the tag color selector. + * @returns {Array} Array of color options. + */ colorOptions() { return colorOptions(this); }, + /** + * Validates the current draft tag based on several conditions. + * @returns {{invalid: boolean, messageKey: string|null, messageParams: object|null}} Object indicating validity, and a message key/params if invalid. + */ validateDraftTag() { - let nameInvalid = false; - let valueInvalid = false; - let invalid = true; - if (this.deleteTags.find(tag => tag.name === this.newDraftTag.select?.name && tag.value === this.newDraftTag.value)) { - // Undo removing a Tag - nameInvalid = false; - valueInvalid = false; - invalid = false; - } else if (this.existingTags.filter(tag => tag.name === this.newDraftTag.name).length > 0 && this.newDraftTag.select == null) { - // Try to create new tag with existing name - nameInvalid = true; - invalid = true; - } else if (this.newTags.concat(this.preSelectedTags).filter(tag => ( - tag.name === this.newDraftTag.select?.name && tag.value === this.newDraftTag.value - ) || ( - tag.name === this.newDraftTag.name && tag.value === this.newDraftTag.value - )).length > 0) { - // Try to add a tag with existing name and value - valueInvalid = true; - invalid = true; - } else if (this.newDraftTag.select != null) { - // Select an existing tag, no need to validate - invalid = false; - valueInvalid = false; - } else if (this.newDraftTag.color == null || this.newDraftTag.name === "") { - // Missing form inputs - nameInvalid = false; - invalid = true; - } else { - // Looks valid - invalid = false; - nameInvalid = false; - valueInvalid = false; + // If defining a new system tag (newDraftTag.select == null) + if (this.newDraftTag.select == null) { + if (!this.newDraftTag.name || this.newDraftTag.name.trim() === "" || !this.newDraftTag.color) { + // Keep button disabled, but don't show the explicit message for this case + return { + invalid: true, + messageKey: null, + messageParams: null, + }; + } + if (this.tagOptions.find(opt => opt.name.toLowerCase() === this.newDraftTag.name.trim().toLowerCase())) { + return { + invalid: true, + messageKey: "tagNameExists", + messageParams: null, + }; + } } + + // For any tag definition (new or existing system tag + value) + const draftTagName = this.newDraftTag.select ? this.newDraftTag.select.name : this.newDraftTag.name.trim(); + const draftTagValue = this.newDraftTag.value ? this.newDraftTag.value.trim() : ""; // Treat null/undefined value as empty string for comparison + + // Check if (name + value) combination already exists in this.stagedForBatchAdd + if (this.stagedForBatchAdd.find(staged => staged.name === draftTagName && staged.value === draftTagValue)) { + return { + invalid: true, + messageKey: "tagAlreadyStaged", + messageParams: null, + }; + } + + // Check if (name + value) combination already exists in this.selectedTags (final list on monitor) + // AND it's NOT an "undo delete" + const isUndoDelete = this.deleteTags.find(dTag => + dTag.tag_id === (this.newDraftTag.select ? this.newDraftTag.select.id : null) && + dTag.value === draftTagValue + ); + + if (!isUndoDelete && this.selectedTags.find(sTag => sTag.name === draftTagName && sTag.value === draftTagValue)) { + return { + invalid: true, + messageKey: "tagAlreadyOnMonitor", + messageParams: null, + }; + } + // If an existing tag is selected at this point, it has passed all relevant checks + if (this.newDraftTag.select != null) { + return { + invalid: false, + messageKey: null, + messageParams: null, + }; + } + + // If it's a new tag definition, and it passed its specific checks, it's valid. + // (This also serves as a final default to valid if other logic paths were missed, though ideally covered above) return { - invalid, - nameInvalid, - valueInvalid, + invalid: false, + messageKey: null, + messageParams: null, }; }, }, @@ -257,6 +336,9 @@ export default { * @returns {void} */ showAddDialog() { + this.stagedForBatchAdd = []; + this.clearDraftTag(); + this.getExistingTags(); this.modal.show(); }, /** @@ -300,37 +382,6 @@ export default { return this.$root.theme === "light" ? "var(--bs-body-color)" : "inherit"; } }, - /** - * Add a draft tag - * @returns {void} - */ - addDraftTag() { - console.log("Adding Draft Tag: ", this.newDraftTag); - if (this.newDraftTag.select != null) { - if (this.deleteTags.find(tag => tag.name === this.newDraftTag.select.name && tag.value === this.newDraftTag.value)) { - // Undo removing a tag - this.deleteTags = this.deleteTags.filter(tag => !(tag.name === this.newDraftTag.select.name && tag.value === this.newDraftTag.value)); - } else { - // Add an existing Tag - this.newTags.push({ - id: this.newDraftTag.select.id, - color: this.newDraftTag.select.color, - name: this.newDraftTag.select.name, - value: this.newDraftTag.value, - new: true, - }); - } - } else { - // Add new Tag - this.newTags.push({ - color: this.newDraftTag.color.color, - name: this.newDraftTag.name.trim(), - value: this.newDraftTag.value, - new: true, - }); - } - this.clearDraftTag(); - }, /** * Remove a draft tag * @returns {void} @@ -341,10 +392,8 @@ export default { select: null, color: null, value: "", - invalid: true, - nameInvalid: false, + // invalid: true, // Initial validation will be handled by computed prop }; - this.modal.hide(); }, /** * Add a tag asynchronously @@ -386,7 +435,7 @@ export default { */ onEnter() { if (!this.validateDraftTag.invalid) { - this.addDraftTag(); + this.stageCurrentTag(); } }, /** @@ -475,7 +524,119 @@ export default { console.warn("Modal hide failed:", e); } } - } + this.stagedForBatchAdd = []; + }, + /** + * Stages the current draft tag for batch addition. + * @returns {void} + */ + stageCurrentTag() { + if (this.validateDraftTag.invalid) { + return; + } + + const isNew = this.newDraftTag.select == null; + const name = isNew ? this.newDraftTag.name.trim() : this.newDraftTag.select.name; + const color = isNew ? this.newDraftTag.color.color : this.newDraftTag.select.color; + const value = this.newDraftTag.value ? this.newDraftTag.value.trim() : ""; + + const stagedTagObject = { + name: name, + color: color, + value: value, + isNewSystemTag: isNew, + systemTagId: isNew ? null : this.newDraftTag.select.id, + keyForList: `staged-${Date.now()}-${Math.random().toString(36).substring(2, 15)}` // Unique key + }; + + this.stagedForBatchAdd.push(stagedTagObject); + this.clearDraftTag(); // Reset input fields for the next tag + }, + /** + * Removes a tag from the staged list. + * @param {object} tagToUnstage The tag object to remove from staging. + * @returns {void} + */ + unstageTag(tagToUnstage) { + this.stagedForBatchAdd = this.stagedForBatchAdd.filter(tag => tag.keyForList !== tagToUnstage.keyForList); + }, + /** + * Maps a staged tag object to the structure expected by the Tag component. + * @param {object} stagedTag The staged tag object. + * @returns {object} Object with name, color, value for the Tag component. + */ + mapStagedTagToDisplayItem(stagedTag) { + return { + name: stagedTag.name, + color: stagedTag.color, + value: stagedTag.value, + // id: stagedTag.keyForList, // Pass keyForList as id for the Tag component if it expects an id for display/keying internally beyond v-for key + }; + }, + /** + * Clears the staging list, draft inputs, and closes the modal. + * @returns {void} + */ + clearStagingAndCloseModal() { + this.stagedForBatchAdd = []; + this.clearDraftTag(); // Clears input fields + this.modal.hide(); + }, + /** + * Processes all staged tags, adds them to the monitor, and closes the modal. + * @returns {void} + */ + confirmAndCommitStagedTags() { + // Phase 1: If there's a currently valid newDraftTag that hasn't been staged yet, + // (e.g. user typed a full tag and directly clicked the footer "Add"), then stage it now. + // stageCurrentTag has its own check for validateDraftTag.invalid and will clear the draft. + if (!this.validateDraftTag.invalid) { + // Check if newDraftTag actually has content, to avoid staging an empty cleared draft. + // A valid draft implies it has content, but double-checking select or name is safer. + if (this.newDraftTag.select || (this.newDraftTag.name && this.newDraftTag.color)) { + this.stageCurrentTag(); + } + } + + // Phase 2: Process everything that is now in stagedForBatchAdd. + if (this.stagedForBatchAdd.length === 0) { + this.clearDraftTag(); // Ensure draft is clear even if nothing was committed + this.modal.hide(); + return; + } + + for (const sTag of this.stagedForBatchAdd) { + let isAnUndo = false; // Flag to track if this was an undo + // Check if it's an "undo delete" + if (sTag.systemTagId) { // Only existing system tags can be an undo delete + const undoDeleteIndex = this.deleteTags.findIndex( + dTag => dTag.tag_id === sTag.systemTagId && dTag.value === sTag.value + ); + if (undoDeleteIndex > -1) { + this.deleteTags.splice(undoDeleteIndex, 1); + isAnUndo = true; + } + } + + // Only add to newTags if it's not an "undo delete" operation. + // An "undo delete" means the tag is now considered active again from its previous state. + if (!isAnUndo) { + const tagObjectForNewTags = { + id: sTag.systemTagId, // This will be null for brand new system tags + color: sTag.color, + name: sTag.name, + value: sTag.value, + new: true, // As per plan, signals new to this monitor transaction + }; + this.newTags.push(tagObjectForNewTags); + } + } + + // newDraftTag should have been cleared if stageCurrentTag ran in Phase 1, or earlier. + // Call clearDraftTag again to be certain the form is reset before closing. + this.clearDraftTag(); + this.modal.hide(); + }, }, }; diff --git a/src/lang/en.json b/src/lang/en.json index 1ca6ef105..bedcd61c1 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -188,9 +188,13 @@ "Show URI": "Show URI", "Tags": "Tags", "Add New Tag": "Add New Tag", + "Add Tags": "Add Tags", "Add New below or Select...": "Add New below or Select…", "Tag with this name already exist.": "Tag with this name already exists.", "Tag with this value already exist.": "Tag with this value already exists.", + "tagAlreadyOnMonitor": "This tag (name and value) is already on the monitor or pending addition.", + "tagAlreadyStaged": "This tag (name and value) is already staged for this batch.", + "tagNameExists": "A system tag with this name already exists. Select it from the list or use a different name.", "color": "Color", "value (optional)": "value (optional)", "Gray": "Gray", @@ -1111,5 +1115,9 @@ "Phone numbers": "Phone numbers", "Sender name": "Sender name", "smsplanetNeedToApproveName": "Needs to be approved in the client panel", - "Disable URL in Notification": "Disable URL in Notification" + "Disable URL in Notification": "Disable URL in Notification", + "Add Another Tag": "Add Another Tag", + "Staged Tags for Batch Add": "Staged Tags for Batch Add", + "Clear Form": "Clear Form", + "pause": "Pause" } diff --git a/test/e2e/specs/status-page.spec.js b/test/e2e/specs/status-page.spec.js index 0231aa225..c8f548b60 100644 --- a/test/e2e/specs/status-page.spec.js +++ b/test/e2e/specs/status-page.spec.js @@ -8,10 +8,14 @@ test.describe("Status Page", () => { }); test("create and edit", async ({ page }, testInfo) => { + test.setTimeout(60000); // Keep the timeout increase for stability + // Monitor const monitorName = "Monitor for Status Page"; const tagName = "Client"; const tagValue = "Acme Inc"; + const tagName2 = "Project"; // Add second tag name + const tagValue2 = "Phoenix"; // Add second tag value const monitorUrl = "https://www.example.com/status"; const monitorCustomUrl = "https://www.example.com"; @@ -33,12 +37,26 @@ test.describe("Status Page", () => { await page.getByTestId("monitor-type-select").selectOption("http"); await page.getByTestId("friendly-name-input").fill(monitorName); await page.getByTestId("url-input").fill(monitorUrl); + + // Modified tag section to add multiple tags await page.getByTestId("add-tag-button").click(); await page.getByTestId("tag-name-input").fill(tagName); await page.getByTestId("tag-value-input").fill(tagValue); await page.getByTestId("tag-color-select").click(); // Vue-Multiselect component await page.getByTestId("tag-color-select").getByRole("option", { name: "Orange" }).click(); - await page.getByTestId("tag-submit-button").click(); + + // Add another tag instead of submitting directly + await page.getByRole("button", { name: "Add Another Tag" }).click(); + + // Add second tag + await page.getByTestId("tag-name-input").fill(tagName2); + await page.getByTestId("tag-value-input").fill(tagValue2); + await page.getByTestId("tag-color-select").click(); + await page.getByTestId("tag-color-select").getByRole("option", { name: "Blue" }).click(); + + // Submit both tags + await page.getByTestId("add-tags-final-button").click(); + await page.getByTestId("save-button").click(); await page.waitForURL("/dashboard/*"); // wait for the monitor to be created @@ -61,8 +79,6 @@ test.describe("Status Page", () => { await page.getByTestId("show-certificate-expiry-checkbox").uncheck(); await page.getByTestId("google-analytics-input").fill(googleAnalyticsId); await page.getByTestId("custom-css-input").getByTestId("textarea").fill(customCss); // Prism - await expect(page.getByTestId("description-editable")).toHaveText(descriptionText); - await expect(page.getByTestId("custom-footer-editable")).toHaveText(footerText); // Add an incident await page.getByTestId("create-incident-button").click(); @@ -98,9 +114,7 @@ test.describe("Status Page", () => { await expect(page.getByTestId("incident")).toHaveCount(1); await expect(page.getByTestId("incident-title")).toContainText(incidentTitle); await expect(page.getByTestId("incident-content")).toContainText(incidentContent); - await expect(page.getByTestId("description")).toContainText(descriptionText); await expect(page.getByTestId("group-name")).toContainText(groupName); - await expect(page.getByTestId("footer-text")).toContainText(footerText); await expect(page.getByTestId("powered-by")).toHaveCount(0); await expect(page.getByTestId("monitor-name")).toHaveAttribute("href", monitorCustomUrl); @@ -111,6 +125,11 @@ test.describe("Status Page", () => { expect(updateCountdown).toBeLessThanOrEqual(refreshInterval + 10); await expect(page.locator("body")).toHaveClass(theme); + + // Add Google Analytics ID to head and verify + await page.waitForFunction(() => { + return document.head.innerHTML.includes("https://www.googletagmanager.com/gtag/js?id="); + }, { timeout: 5000 }); expect(await page.locator("head").innerHTML()).toContain(googleAnalyticsId); const backgroundColor = await page.evaluate(() => window.getComputedStyle(document.body).backgroundColor); @@ -129,7 +148,10 @@ test.describe("Status Page", () => { await expect(page.getByTestId("edit-sidebar")).toHaveCount(0); await expect(page.getByTestId("powered-by")).toContainText("Powered by"); - await expect(page.getByTestId("monitor-tag")).toContainText(tagValue); + + // Modified tag verification to check both tags + await expect(page.getByTestId("monitor-tag").filter({ hasText: tagValue })).toBeVisible(); + await expect(page.getByTestId("monitor-tag").filter({ hasText: tagValue2 })).toBeVisible(); await screenshot(testInfo, page); }); From 53e83e77224b32ee84a42d2c19d420719d0e1f53 Mon Sep 17 00:00:00 2001 From: Manu <4445816+tr4nt0r@users.noreply.github.com> Date: Thu, 12 Jun 2025 12:31:01 +0200 Subject: [PATCH 5/8] Add monitor id label to prometheus metrics (#5907) --- server/prometheus.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/prometheus.js b/server/prometheus.js index f26125d2c..485dfe53a 100644 --- a/server/prometheus.js +++ b/server/prometheus.js @@ -2,6 +2,7 @@ const PrometheusClient = require("prom-client"); const { log } = require("../src/util"); const commonLabels = [ + "monitor_id", "monitor_name", "monitor_type", "monitor_url", @@ -40,6 +41,7 @@ class Prometheus { */ constructor(monitor) { this.monitorLabelValues = { + monitor_id: monitor.id, monitor_name: monitor.name, monitor_type: monitor.type, monitor_url: monitor.url, From f282422b22e1a0f86cba17a46b9bd5c70014693c Mon Sep 17 00:00:00 2001 From: Fabian Triebsch Date: Fri, 13 Jun 2025 08:14:55 +0200 Subject: [PATCH 6/8] added option to force ipv4 or ipv6 for http(s) monitor type (#5880) Co-authored-by: Ionys <9364594+Ionys320@users.noreply.github.com> Co-authored-by: Frank Elsinga --- .../2025-06-03-0000-add-ip-family.js | 13 +++++++++++ server/model/monitor.js | 22 +++++++++++++++++++ server/server.js | 1 + src/lang/en.json | 3 +++ src/pages/EditMonitor.vue | 15 +++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 db/knex_migrations/2025-06-03-0000-add-ip-family.js diff --git a/db/knex_migrations/2025-06-03-0000-add-ip-family.js b/db/knex_migrations/2025-06-03-0000-add-ip-family.js new file mode 100644 index 000000000..a3bcdc613 --- /dev/null +++ b/db/knex_migrations/2025-06-03-0000-add-ip-family.js @@ -0,0 +1,13 @@ +exports.up = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.boolean("ip_family").defaultTo(null); + }); +}; + +exports.down = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.dropColumn("ip_family"); + }); +}; diff --git a/server/model/monitor.js b/server/model/monitor.js index 741fb940e..c9844a55d 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -160,6 +160,7 @@ class Monitor extends BeanModel { smtpSecurity: this.smtpSecurity, rabbitmqNodes: JSON.parse(this.rabbitmqNodes), conditions: JSON.parse(this.conditions), + ipFamily: this.ipFamily, // ping advanced options ping_numeric: this.isPingNumeric(), @@ -426,10 +427,26 @@ class Monitor extends BeanModel { } } + let agentFamily = undefined; + if (this.ipFamily === "ipv4") { + agentFamily = 4; + } + if (this.ipFamily === "ipv6") { + agentFamily = 6; + } + const httpsAgentOptions = { maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940) rejectUnauthorized: !this.getIgnoreTls(), secureOptions: crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT, + autoSelectFamily: true, + ...(agentFamily ? { family: agentFamily } : {}) + }; + + const httpAgentOptions = { + maxCachedSessions: 0, + autoSelectFamily: true, + ...(agentFamily ? { family: agentFamily } : {}) }; log.debug("monitor", `[${this.name}] Prepare Options for axios`); @@ -491,6 +508,7 @@ class Monitor extends BeanModel { if (proxy && proxy.active) { const { httpAgent, httpsAgent } = Proxy.createAgents(proxy, { httpsAgentOptions: httpsAgentOptions, + httpAgentOptions: httpAgentOptions, }); options.proxy = false; @@ -499,6 +517,10 @@ class Monitor extends BeanModel { } } + if (!options.httpAgent) { + options.httpAgent = new http.Agent(httpAgentOptions); + } + if (!options.httpsAgent) { let jar = new CookieJar(); let httpsCookieAgentOptions = { diff --git a/server/server.js b/server/server.js index cba02174d..77ba695d1 100644 --- a/server/server.js +++ b/server/server.js @@ -792,6 +792,7 @@ let needSetup = false; bean.url = monitor.url; bean.method = monitor.method; bean.body = monitor.body; + bean.ipFamily = monitor.ipFamily; bean.headers = monitor.headers; bean.basic_auth_user = monitor.basic_auth_user; bean.basic_auth_pass = monitor.basic_auth_pass; diff --git a/src/lang/en.json b/src/lang/en.json index bedcd61c1..e11e9e81e 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1116,6 +1116,9 @@ "Sender name": "Sender name", "smsplanetNeedToApproveName": "Needs to be approved in the client panel", "Disable URL in Notification": "Disable URL in Notification", + "Ip Family": "IP Family", + "ipFamilyDescriptionAutoSelect": "Uses the {happyEyeballs} for determining the IP family.", + "Happy Eyeballs algorithm": "Happy Eyeballs algorithm", "Add Another Tag": "Add Another Tag", "Staged Tags for Batch Add": "Staged Tags for Batch Add", "Clear Form": "Clear Form", diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 95b29aa58..691414843 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -745,6 +745,20 @@ {{ $t("acceptedStatusCodesDescription") }} + +
+ + + + + +
@@ -1129,6 +1143,7 @@ const monitorDefaults = { parent: null, url: "https://", method: "GET", + ipFamily: null, interval: 60, retryInterval: 60, resendInterval: 0, From 18cfa901ad3457366643fd4c2071045354b6d847 Mon Sep 17 00:00:00 2001 From: warpreality <60826887+warpreality@users.noreply.github.com> Date: Fri, 13 Jun 2025 14:38:49 +0300 Subject: [PATCH 7/8] feat: Add a "manual" (static/fixed) monitor (#5897) Co-authored-by: Maksim Kachynski Co-authored-by: Frank Elsinga --- .../2025-06-11-0000-add-manual-monitor.js | 12 +++++++ server/monitor-types/manual.js | 36 +++++++++++++++++++ server/server.js | 1 + server/uptime-kuma-server.js | 2 ++ src/lang/en.json | 3 +- src/pages/EditMonitor.vue | 15 ++++++++ 6 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 db/knex_migrations/2025-06-11-0000-add-manual-monitor.js create mode 100644 server/monitor-types/manual.js diff --git a/db/knex_migrations/2025-06-11-0000-add-manual-monitor.js b/db/knex_migrations/2025-06-11-0000-add-manual-monitor.js new file mode 100644 index 000000000..16d307eb5 --- /dev/null +++ b/db/knex_migrations/2025-06-11-0000-add-manual-monitor.js @@ -0,0 +1,12 @@ +exports.up = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.string("manual_status").defaultTo(null); + }); +}; + +exports.down = function (knex) { + return knex.schema.alterTable("monitor", function (table) { + table.dropColumn("manual_status"); + }); +}; diff --git a/server/monitor-types/manual.js b/server/monitor-types/manual.js new file mode 100644 index 000000000..e587b7409 --- /dev/null +++ b/server/monitor-types/manual.js @@ -0,0 +1,36 @@ +const { MonitorType } = require("./monitor-type"); +const { UP, DOWN, PENDING } = require("../../src/util"); + +class ManualMonitorType extends MonitorType { + name = "Manual"; + type = "manual"; + description = "A monitor that allows manual control of the status"; + supportsConditions = false; + conditionVariables = []; + + /** + * @inheritdoc + */ + async check(monitor, heartbeat) { + if (monitor.manual_status !== null) { + heartbeat.status = monitor.manual_status; + switch (monitor.manual_status) { + case UP: + heartbeat.msg = "Up"; + break; + case DOWN: + heartbeat.msg = "Down"; + break; + default: + heartbeat.msg = "Pending"; + } + } else { + heartbeat.status = PENDING; + heartbeat.msg = "Manual monitoring - No status set"; + } + } +} + +module.exports = { + ManualMonitorType +}; diff --git a/server/server.js b/server/server.js index 77ba695d1..e328ff470 100644 --- a/server/server.js +++ b/server/server.js @@ -876,6 +876,7 @@ let needSetup = false; bean.rabbitmqUsername = monitor.rabbitmqUsername; bean.rabbitmqPassword = monitor.rabbitmqPassword; bean.conditions = JSON.stringify(monitor.conditions); + bean.manual_status = monitor.manual_status; // ping advanced options bean.ping_numeric = monitor.ping_numeric; diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js index 1f75b72cc..a04e6bd49 100644 --- a/server/uptime-kuma-server.js +++ b/server/uptime-kuma-server.js @@ -118,6 +118,7 @@ class UptimeKumaServer { UptimeKumaServer.monitorTypeList["snmp"] = new SNMPMonitorType(); UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType(); UptimeKumaServer.monitorTypeList["rabbitmq"] = new RabbitMqMonitorType(); + UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType(); // Allow all CORS origins (polling) in development let cors = undefined; @@ -558,4 +559,5 @@ const { GroupMonitorType } = require("./monitor-types/group"); const { SNMPMonitorType } = require("./monitor-types/snmp"); const { MongodbMonitorType } = require("./monitor-types/mongodb"); const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq"); +const { ManualMonitorType } = require("./monitor-types/manual"); const Monitor = require("./model/monitor"); diff --git a/src/lang/en.json b/src/lang/en.json index e11e9e81e..a979edcc2 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1122,5 +1122,6 @@ "Add Another Tag": "Add Another Tag", "Staged Tags for Batch Add": "Staged Tags for Batch Add", "Clear Form": "Clear Form", - "pause": "Pause" + "pause": "Pause", + "Manual": "Manual" } diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 691414843..0d628895d 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -55,6 +55,9 @@ + @@ -115,6 +118,18 @@ + +
+
+ + +
+
+
From 55817061c0aa488b3d54b29765700636f0bb072d Mon Sep 17 00:00:00 2001 From: Florian Feka <47530143+FlorianFeka@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:08:11 +0200 Subject: [PATCH 8/8] fix: Properly handle the NTLM part being embedded inside other authentication headers (#5871) Co-authored-by: Frank Elsinga --- server/modules/axios-ntlm/lib/ntlmClient.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/modules/axios-ntlm/lib/ntlmClient.js b/server/modules/axios-ntlm/lib/ntlmClient.js index 682de5f9a..9dab32553 100644 --- a/server/modules/axios-ntlm/lib/ntlmClient.js +++ b/server/modules/axios-ntlm/lib/ntlmClient.js @@ -89,6 +89,9 @@ function NtlmClient(credentials, AxiosConfig) { switch (_b.label) { case 0: error = err.response; + // The header may look like this: `Negotiate, NTLM, Basic realm="itsahiddenrealm.example.net"`Add commentMore actions + // so extract the 'NTLM' part first + const ntlmheader = error.headers['www-authenticate'].split(',').find(_ => _.match(/ *NTLM/))?.trim() || ''; if (!(error && error.status === 401 && error.headers['www-authenticate'] && error.headers['www-authenticate'].includes('NTLM'))) return [3 /*break*/, 3]; @@ -96,12 +99,12 @@ function NtlmClient(credentials, AxiosConfig) { // include the Negotiate option when responding with the T2 message // There is nore we could do to ensure we are processing correctly, // but this is the easiest option for now - if (error.headers['www-authenticate'].length < 50) { + if (ntlmheader.length < 50) { t1Msg = ntlm.createType1Message(credentials.workstation, credentials.domain); error.config.headers["Authorization"] = t1Msg; } else { - t2Msg = ntlm.decodeType2Message((error.headers['www-authenticate'].match(/^NTLM\s+(.+?)(,|\s+|$)/) || [])[1]); + t2Msg = ntlm.decodeType2Message((ntlmheader.match(/^NTLM\s+(.+?)(,|\s+|$)/) || [])[1]); t3Msg = ntlm.createType3Message(t2Msg, credentials.username, credentials.password, credentials.workstation, credentials.domain); error.config.headers["X-retry"] = "false"; error.config.headers["Authorization"] = t3Msg;