Add address aliases for the Uptime Kuma maintenance sync, and ignore Kuma's "null"
Uptime Kuma often watches a host by another address than the one it was added with here (a Proxmox host monitored over Tailscale, say). Address aliases on the Maintenance page say that an address belongs to a server, integration or DNS provider, so the sync puts the window there; matching stays exact. Migration 0018 adds maintenance_aliases. Also fixes monitors whose empty hostname/URL/port arrive from Kuma's metrics as the text "null": they were taken as an address, hiding the real URL. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
3e6404371b
commit
44cc9d1cf2
12 files changed
+2239
-14
No files matched your search
@@ -23,7 +23,9 @@ process.env.CREDENTIALS_ENCRYPTION_KEY = "ab".repeat(32);
|
||||
const express = (await import("express")).default;
|
||||
const { Server: IOServer } = await import("socket.io");
|
||||
const { db } = await import("../src/db/client.js");
|
||||
const { users, servers, integrations, dnsProviders, maintenanceWindows } = await import("../src/db/schema.js");
|
||||
const { users, servers, integrations, dnsProviders, maintenanceAliases, maintenanceWindows } = await import("../src/db/schema.js");
|
||||
const { eq } = await import("drizzle-orm");
|
||||
const { parsePrometheusText, monitorsFromSamples } = await import("../src/integrations/uptimekuma/adapter.js");
|
||||
const { runMigrations } = await import("../src/db/migrate.js");
|
||||
const { maintenanceRouter } = await import("../src/routes/maintenance.js");
|
||||
const { kumaInstant, normalizeMaintenanceList, monitorIdsFromReply } = await import("../src/integrations/uptimekuma/maintenanceFeed.js");
|
||||
@@ -78,6 +80,21 @@ describe("reading Kuma's lists", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("Uptime Kuma's text \"null\"", () => {
|
||||
test("a monitor field that is the text null is no address, and the URL is used instead", () => {
|
||||
const text = [
|
||||
'monitor_status{monitor_id="1",monitor_name="Site",monitor_type="keyword",monitor_url="https://www.example.com/x",monitor_hostname="null",monitor_port="null"} 1',
|
||||
'monitor_status{monitor_id="2",monitor_name="Empty",monitor_type="group",monitor_url="null",monitor_hostname="null",monitor_port="null"} 1',
|
||||
].join("\n");
|
||||
const monitors = monitorsFromSamples(parsePrometheusText(text));
|
||||
const site = monitors.find((m) => m.name === "Site")!;
|
||||
const empty = monitors.find((m) => m.name === "Empty")!;
|
||||
assert.equal(site.target, "www.example.com");
|
||||
assert.equal(site.port, null);
|
||||
assert.equal(empty.target, null);
|
||||
});
|
||||
});
|
||||
|
||||
describe("which things a monitor's address belongs to", () => {
|
||||
const serverList = [{ id: 1, name: "elsa", hostname: "elsa.lab.example", ips: ["10.0.0.5", "fd00::5"] }];
|
||||
const addressed = [
|
||||
@@ -371,6 +388,54 @@ describe("syncing from a stand-in Uptime Kuma", () => {
|
||||
await sync();
|
||||
});
|
||||
|
||||
test("an alias sends a monitor on some other address to the thing it belongs to, and removing it takes the window away again", async () => {
|
||||
await db.delete(maintenanceWindows);
|
||||
const [felicia] = await db.select().from(integrations).where(eq(integrations.name, "Proxmox Felicia"));
|
||||
const start = Date.now() + 4 * HOUR;
|
||||
kuma.list = { "7": daily(start, start + HOUR, { id: 7, title: "Over Tailscale" }) };
|
||||
kuma.monitorsOf = { "7": [3] }; // watches 10.9.9.9, which nothing here is called
|
||||
|
||||
assert.equal((await sync()).body.started, 0, "before the alias there is nothing to attach to");
|
||||
|
||||
const added = await fetch(`${base}/aliases`, {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: JSON.stringify({ address: "https://10.9.9.9:8006/", targetType: "integration", targetId: felicia.id }),
|
||||
});
|
||||
assert.equal(added.status, 201, await added.clone().text());
|
||||
const alias = (await added.json()).alias;
|
||||
assert.equal(alias.address, "10.9.9.9", "stored as a bare host");
|
||||
|
||||
const { body } = await sync();
|
||||
assert.equal(body.started, 1);
|
||||
assert.deepEqual(body.maintenances[0].targets, [{ type: "integration", name: "Proxmox Felicia" }]);
|
||||
|
||||
const listed = await (await fetch(base)).json();
|
||||
assert.equal(listed.aliases.length, 1);
|
||||
assert.equal(listed.aliases[0].targetName, "Proxmox Felicia");
|
||||
|
||||
assert.equal((await fetch(`${base}/aliases/${alias.id}`, { method: "DELETE" })).status, 204);
|
||||
const after = await sync();
|
||||
assert.equal(after.body.removed, 1, "with the alias gone, the window that depended on it goes too");
|
||||
assert.equal((await listUpcomingWindows()).length, 0);
|
||||
|
||||
kuma.list = { "5": daily(start, start + HOUR) };
|
||||
kuma.monitorsOf = { "5": [1, 2, 3] };
|
||||
await sync();
|
||||
});
|
||||
|
||||
test("an alias must be a real address, can't be added twice, and must point at something that exists", async () => {
|
||||
const [felicia] = await db.select().from(integrations).where(eq(integrations.name, "Proxmox Felicia"));
|
||||
const post = (body: unknown) =>
|
||||
fetch(`${base}/aliases`, { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
|
||||
assert.equal((await post({ address: " ", targetType: "integration", targetId: felicia.id })).status, 400);
|
||||
assert.equal((await post({ address: "10.1.1.1", targetType: "integration", targetId: 99999 })).status, 404);
|
||||
assert.equal((await post({ address: "10.1.1.1", targetType: "integration", targetId: felicia.id })).status, 201);
|
||||
assert.equal((await post({ address: "10.1.1.1", targetType: "integration", targetId: felicia.id })).status, 409);
|
||||
const [row] = await db.select().from(maintenanceAliases);
|
||||
await fetch(`${base}/aliases/${row.id}`, { method: "DELETE" });
|
||||
});
|
||||
|
||||
test("syncing again adds nothing", async () => {
|
||||
const { body } = await sync();
|
||||
assert.deepEqual([body.started, body.updated, body.removed], [0, 0, 0]);
|
||||
|
||||
Reference in new issue
Block a user