From b16aa9c83286a4713aeb69a1e54c7f3687034df1 Mon Sep 17 00:00:00 2001 From: DanielDerefaka Date: Thu, 1 Jan 2026 11:07:16 +0100 Subject: [PATCH 1/8] fix(discord): hide empty Service URL and N/A Ping fields - Only show Service URL field when extractAddress returns a non-empty value - Only show Ping field when ping value is not null - This fixes unnecessary 'https://' and 'N/A' values showing for groups Fixes #3327 Contribution by Gittensor, see my contribution statistics at https://gittensor.io/miners/details?githubId=101010297 --- server/notification-providers/discord.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js index 98e97b85..155281cd 100644 --- a/server/notification-providers/discord.js +++ b/server/notification-providers/discord.js @@ -58,7 +58,7 @@ class Discord extends NotificationProvider { name: "Service Name", value: monitorJSON["name"], }, - ...(!notification.disableUrl ? [{ + ...((!notification.disableUrl && this.extractAddress(monitorJSON)) ? [{ name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL", value: this.extractAddress(monitorJSON), }] : []), @@ -98,7 +98,7 @@ class Discord extends NotificationProvider { name: "Service Name", value: monitorJSON["name"], }, - ...(!notification.disableUrl ? [{ + ...((!notification.disableUrl && this.extractAddress(monitorJSON)) ? [{ name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL", value: this.extractAddress(monitorJSON), }] : []), @@ -106,10 +106,10 @@ class Discord extends NotificationProvider { name: `Time (${heartbeatJSON["timezone"]})`, value: heartbeatJSON["localDateTime"], }, - { + ...(heartbeatJSON["ping"] != null ? [{ name: "Ping", - value: heartbeatJSON["ping"] == null ? "N/A" : heartbeatJSON["ping"] + " ms", - }, + value: heartbeatJSON["ping"] + " ms", + }] : []), ], }], }; From c9381154a6013fedd3923f1201f4f4c5f301c4ba Mon Sep 17 00:00:00 2001 From: DanielDerefaka Date: Thu, 1 Jan 2026 11:41:11 +0100 Subject: [PATCH 2/8] feat(status-page): add og:type and og:image Open Graph meta tags Added additional Open Graph meta tags to status pages for better social media sharing: - og:type (set to "website") - og:image (uses the status page icon if configured) This complements the existing og:title and og:description tags. Fixes #6514 --- server/model/status_page.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/model/status_page.js b/server/model/status_page.js index 22444112..9842f001 100644 --- a/server/model/status_page.js +++ b/server/model/status_page.js @@ -132,6 +132,14 @@ class StatusPage extends BeanModel { let ogDescription = $("").attr("content", description155); head.append(ogDescription); + let ogType = $(""); + head.append(ogType); + + if (statusPage.icon) { + let ogImage = $("").attr("content", statusPage.icon); + head.append(ogImage); + } + // Preload data // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186 const escapedJSONObject = jsesc(await StatusPage.getStatusPageData(statusPage), { From 1d0415f66497128a95e81efdf17ee053c6375f7e Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 2 Jan 2026 05:48:27 +0100 Subject: [PATCH 3/8] fix(ci): update OS versions in auto-test workflow to use github hosted instead of selfhosted runners (#6567) --- .github/workflows/auto-test.yml | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml index c88a5d69..e86d7dd0 100644 --- a/.github/workflows/auto-test.yml +++ b/.github/workflows/auto-test.yml @@ -16,7 +16,6 @@ permissions: {} jobs: auto-test: - needs: [ e2e-test ] runs-on: ${{ matrix.os }} timeout-minutes: 15 permissions: @@ -24,7 +23,7 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-22.04, windows-latest, ARM64] + os: [macos-latest, ubuntu-22.04, windows-latest, ubuntu-22.04-arm] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ node: [ 20, 24 ] # Also test non-LTS, but only on Ubuntu. @@ -49,6 +48,11 @@ jobs: with: node-version: ${{ matrix.node }} - run: npm install + + - name: Rebuild native modules for ARM64 + if: matrix.os == 'ubuntu-22.04-arm' + run: npm rebuild @louislam/sqlite3 + - run: npm run build - run: npm run test-backend env: @@ -57,35 +61,33 @@ jobs: # As a lot of dev dependencies are not supported on ARMv7, we have to test it separately and just test if `npm ci --production` works armv7-simple-test: - needs: [ e2e-test ] - runs-on: ${{ matrix.os }} - timeout-minutes: 15 + runs-on: ubuntu-latest permissions: contents: read - if: ${{ github.repository == 'louislam/uptime-kuma' }} strategy: matrix: - os: [ ARMv7 ] node: [ 20, 22 ] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - run: git config --global core.autocrlf false # Mainly for Windows - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: { persist-credentials: false } - - name: Cache/Restore node_modules - uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1 - id: node-modules-cache + - name: Set up QEMU + uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 with: - path: node_modules - key: node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }} + platforms: linux/arm/v7 - - name: Use Node.js ${{ matrix.node }} - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 - with: - node-version: ${{ matrix.node }} - - run: npm install --production + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + + - name: Test on ARMv7 using Docker with QEMU + run: | + docker run --rm --platform linux/arm/v7 \ + -v $PWD:/workspace \ + -w /workspace \ + arm32v7/node:${{ matrix.node }}-slim \ + bash -c "npm install --production" check-linters: runs-on: ubuntu-latest @@ -112,8 +114,7 @@ jobs: - run: npm run lint:prod e2e-test: - needs: [ check-linters ] - runs-on: ARM64 + runs-on: ubuntu-22.04-arm permissions: contents: read env: @@ -135,6 +136,9 @@ jobs: with: node-version: 22 - run: npm install + + - name: Rebuild native modules for ARM64 + run: npm rebuild @louislam/sqlite3 - name: Install Playwright ${{ env.PLAYWRIGHT_VERSION }} run: npx playwright@${{ env.PLAYWRIGHT_VERSION }} install From 6a95a882139926a2b625e713669536e92fe53b31 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 2 Jan 2026 06:40:27 +0100 Subject: [PATCH 4/8] Update server/model/status_page.js --- server/model/status_page.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/model/status_page.js b/server/model/status_page.js index 9842f001..7087e4e0 100644 --- a/server/model/status_page.js +++ b/server/model/status_page.js @@ -135,11 +135,6 @@ class StatusPage extends BeanModel { let ogType = $(""); head.append(ogType); - if (statusPage.icon) { - let ogImage = $("").attr("content", statusPage.icon); - head.append(ogImage); - } - // Preload data // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186 const escapedJSONObject = jsesc(await StatusPage.getStatusPageData(statusPage), { From 1532acaaf3d4c87f1c2d92b7161bcdc119a1549f Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 2 Jan 2026 06:46:50 +0100 Subject: [PATCH 5/8] don't call extractAddress twice --- server/notification-providers/discord.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js index 155281cd..e560e38d 100644 --- a/server/notification-providers/discord.js +++ b/server/notification-providers/discord.js @@ -47,6 +47,7 @@ class Discord extends NotificationProvider { // If heartbeatJSON is not null, we go into the normal alerting loop. if (heartbeatJSON["status"] === DOWN) { + let addess = this.extractAddress(monitorJSON); let discorddowndata = { username: discordDisplayName, embeds: [{ @@ -58,9 +59,9 @@ class Discord extends NotificationProvider { name: "Service Name", value: monitorJSON["name"], }, - ...((!notification.disableUrl && this.extractAddress(monitorJSON)) ? [{ + ...((!notification.disableUrl && addess) ? [{ name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL", - value: this.extractAddress(monitorJSON), + value: addess, }] : []), { name: `Time (${heartbeatJSON["timezone"]})`, @@ -87,6 +88,7 @@ class Discord extends NotificationProvider { return okMsg; } else if (heartbeatJSON["status"] === UP) { + let addess = this.extractAddress(monitorJSON); let discordupdata = { username: discordDisplayName, embeds: [{ @@ -98,9 +100,9 @@ class Discord extends NotificationProvider { name: "Service Name", value: monitorJSON["name"], }, - ...((!notification.disableUrl && this.extractAddress(monitorJSON)) ? [{ + ...((!notification.disableUrl && addess) ? [{ name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL", - value: this.extractAddress(monitorJSON), + value: addess, }] : []), { name: `Time (${heartbeatJSON["timezone"]})`, From e4552a2184963bf1ab74d74881c512f70fa21f43 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 2 Jan 2026 06:47:29 +0100 Subject: [PATCH 6/8] simplify extractAddress(monitorJSON) a bit more --- server/notification-providers/discord.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js index e560e38d..4c573d63 100644 --- a/server/notification-providers/discord.js +++ b/server/notification-providers/discord.js @@ -46,8 +46,8 @@ class Discord extends NotificationProvider { } // If heartbeatJSON is not null, we go into the normal alerting loop. + let addess = this.extractAddress(monitorJSON); if (heartbeatJSON["status"] === DOWN) { - let addess = this.extractAddress(monitorJSON); let discorddowndata = { username: discordDisplayName, embeds: [{ @@ -88,7 +88,6 @@ class Discord extends NotificationProvider { return okMsg; } else if (heartbeatJSON["status"] === UP) { - let addess = this.extractAddress(monitorJSON); let discordupdata = { username: discordDisplayName, embeds: [{ From c282c2ae3a7c14a96f9cbb05caa7d7b727841a7e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 2 Jan 2026 05:49:53 +0000 Subject: [PATCH 7/8] Initial plan From 78e9d9fb64603f0eb2218862b95334a683140361 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 2 Jan 2026 05:55:39 +0000 Subject: [PATCH 8/8] Add migration to change dns_last_result column to TEXT Co-authored-by: louislam <1336778+louislam@users.noreply.github.com> --- .../2026-01-02-0551-dns-last-result-to-text.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 db/knex_migrations/2026-01-02-0551-dns-last-result-to-text.js diff --git a/db/knex_migrations/2026-01-02-0551-dns-last-result-to-text.js b/db/knex_migrations/2026-01-02-0551-dns-last-result-to-text.js new file mode 100644 index 00000000..76874e3f --- /dev/null +++ b/db/knex_migrations/2026-01-02-0551-dns-last-result-to-text.js @@ -0,0 +1,14 @@ +// Change dns_last_result column from VARCHAR(255) to TEXT to handle longer DNS TXT records +exports.up = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.text("dns_last_result").alter(); + }); +}; + +exports.down = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.string("dns_last_result", 255).alter(); + }); +};