Exclude maintenance history from activity log

This commit is contained in:
2026-10-07 23:31:21 -04:00
parent c0c34d8735
commit 584084c09c
8 changed files with 76 additions and 13 deletions
+35 -1
View File
@@ -58,6 +58,37 @@ describe('Activity query parameters', () => {
});
describe('unified retained Activity', () => {
it('excludes everything in Maintenance history, including shared recovery campaigns, without changing that history', async () => {
const api = await setup();
api.maintenance(1);
api.maintenance(2);
api.handle.prepare("UPDATE maintenance_jobs SET kind='schedule' WHERE id=2").run();
api.operation('shared');
api.maintenance(3, 'failed', 'shared');
api.link('shared', 'campaign', 'release');
api.incident('health');
api.incident('drift', 'drift');
api.remote('check', { kind: 'instance.inspect', routine: 1 });
for (const [id, trigger] of [['recovery', 'watchdog'], ['release', 'ui']]) {
api.handle.prepare("INSERT INTO deployments(id,action,started_at,triggered_by) VALUES(?,'drift',?,?)").run(id, at, trigger);
api.handle.prepare("INSERT INTO deployment_servers(deployment_id,server,files_changed,restart_state) VALUES(?,?,1,'done')").run(id, server);
}
const maintenance = api.activityHistory({ source: 'maintenance' });
expect(maintenance.total).toBe(6);
const query = { excludeProvisioning: true, excludeMaintenance: true, limit: 1 };
const first = api.activityHistory(query);
const second = api.activityHistory({ ...query, offset: 1 });
expect(first.total).toBe(2);
expect(second.total).toBe(2);
expect([...first.rows, ...second.rows].map(row => row.id).sort()).toEqual([`campaign:release:${server}`, 'host:check']);
for (const source of ['maintenance', 'recovery'] as const) {
expect(api.activityHistory({ ...query, source }).total).toBe(0);
}
expect(api.activityHistory({ ...query, source: 'campaign' }).total).toBe(1);
expect(api.activityHistory({ source: 'maintenance' })).toEqual(maintenance);
expect(api.activityHistory({ server }).total).toBe(8);
});
it('excludes provisioning jobs from log totals and pages regardless of action or trigger, while retaining contextual history', async () => {
const api = await setup();
for (const action of ['create', 'start', 'restart', 'rebuild', 'stop', 'destroy']) {
@@ -233,7 +264,9 @@ describe('unified retained Activity', () => {
const api = await setup();
api.operation('a'); api.operation('b', { state: 'failed' });
api.remote('failed-check', { kind: 'instance.inspect', routine: 1, state: 'failed' });
const url = new URL('http://localhost/activity?state=failed&limit=1&excludeProvisioning=true');
api.maintenance(1, 'failed');
api.incident('finding', 'health', 'attention');
const url = new URL('http://localhost/activity?state=failed&limit=1&excludeProvisioning=true&excludeMaintenance=true');
const { GET } = await import('../../src/routes/api/activity/+server.js');
const { load } = await import('../../src/routes/activity/+page.server.js');
const response = GET({ url });
@@ -241,5 +274,6 @@ describe('unified retained Activity', () => {
expect(await response.json()).toEqual(JSON.parse(JSON.stringify(load({ url }).activity)));
expect(load({ url }).activity.rows[0].id).toBe('host:failed-check');
expect(load({ url: new URL('http://localhost/activity?excludeProvisioning=false') }).activity.rows.some(row => row.id.startsWith('provisioning:'))).toBe(false);
expect(load({ url: new URL('http://localhost/activity?excludeMaintenance=false') }).activity.rows.map(row => row.id)).toEqual(['host:failed-check']);
});
});