From 92d4e9ea12275c1782ec8560bf97b69407eaf962 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:29:08 +0800
Subject: [PATCH] Add additional metrics

---
 server/service/PulseQueue/PulseQueue.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index f4a1b38a1..50a959559 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -139,6 +139,8 @@ class PulseQueue {
 		const jobs = await this.pulse.jobs();
 		const metrics = jobs.reduce(
 			(acc, job) => {
+				acc.totalRuns += job.attrs.runCount || 0;
+				acc.totalFailures += job.attrs.failCount || 0;
 				acc.jobs++;
 				if (job.attrs.failCount > 0 && job.attrs.failedAt >= job.attrs.lastFinishedAt) {
 					acc.failingJobs++;
@@ -150,13 +152,22 @@ class PulseQueue {
 					acc.jobsWithFailures.push({
 						monitorId: job.attrs.data.monitor._id,
 						monitorUrl: job.attrs.data.monitor.url,
+						monitorType: job.attrs.data.monitor.type,
+						failedAt: job.attrs.failedAt,
 						failCount: job.attrs.failCount,
 						failReason: job.attrs.failReason,
 					});
 				}
 				return acc;
 			},
-			{ jobs: 0, activeJobs: 0, failingJobs: 0, jobsWithFailures: [] }
+			{
+				jobs: 0,
+				activeJobs: 0,
+				failingJobs: 0,
+				jobsWithFailures: [],
+				totalRuns: 0,
+				totalFailures: 0,
+			}
 		);
 		return metrics;
 	};
@@ -167,10 +178,18 @@ class PulseQueue {
 			return {
 				monitorId: job.attrs.data.monitor._id,
 				monitorUrl: job.attrs.data.monitor.url,
+				monitorType: job.attrs.data.monitor.type,
+				active: !job.attrs.disabled,
 				lockedAt: job.attrs.lockedAt,
 				runCount: job.attrs.runCount || 0,
 				failCount: job.attrs.failCount || 0,
 				failReason: job.attrs.failReason,
+				lastRunAt: job.attrs.lastRunAt,
+				lastFinishedAt: job.attrs.lastFinishedAt,
+				lastRunTook: job.attrs.lockedAt
+					? null
+					: job.attrs.lastFinishedAt - job.attrs.lastRunAt,
+				lastFailedAt: job.attrs.failedAt,
 			};
 		});
 	};