From d2aca30a933f01925e2b9d07303e72c01c60da19 Mon Sep 17 00:00:00 2001 From: Jason Taylor Date: Tue, 1 Jul 2025 11:41:58 +1000 Subject: [PATCH 1/4] Add monitoring resources for maintainability --- src/Frontend/public/mockServiceWorker.js | 2 +- .../components/monitoring/EndpointBacklog.vue | 3 +- .../monitoring/EndpointInstances.vue | 19 ++++--- .../components/monitoring/EndpointList.vue | 25 +++++---- .../monitoring/EndpointMessageTypes.vue | 19 ++++--- .../components/monitoring/EndpointTimings.vue | 5 +- .../monitoring/EndpointWorkload.vue | 5 +- .../src/resources/MonitoringResources.ts | 56 +++++++++++++++++++ 8 files changed, 98 insertions(+), 36 deletions(-) create mode 100644 src/Frontend/src/resources/MonitoringResources.ts diff --git a/src/Frontend/public/mockServiceWorker.js b/src/Frontend/public/mockServiceWorker.js index baa12a328..de7bc0f29 100644 --- a/src/Frontend/public/mockServiceWorker.js +++ b/src/Frontend/public/mockServiceWorker.js @@ -7,7 +7,7 @@ * - Please do NOT modify this file. */ -const PACKAGE_VERSION = '2.9.0' +const PACKAGE_VERSION = '2.10.2' const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af' const IS_MOCKED_RESPONSE = Symbol('isMockedResponse') const activeClientIds = new Set() diff --git a/src/Frontend/src/components/monitoring/EndpointBacklog.vue b/src/Frontend/src/components/monitoring/EndpointBacklog.vue index ddb346e62..a36a09f0c 100644 --- a/src/Frontend/src/components/monitoring/EndpointBacklog.vue +++ b/src/Frontend/src/components/monitoring/EndpointBacklog.vue @@ -2,6 +2,7 @@ import type { ExtendedEndpointDetails } from "@/resources/MonitoringEndpoint"; import { formatGraphDecimalFromNumber, largeGraphsMinimumYAxis } from "./formatGraph"; import LargeGraph from "./LargeGraph.vue"; +import { QueueLength } from "@/resources/MonitoringResources"; const endpoint = defineModel({ required: true, @@ -24,7 +25,7 @@ const endpoint = defineModel({
- Queue Length + {{ QueueLength.label }}
diff --git a/src/Frontend/src/components/monitoring/EndpointInstances.vue b/src/Frontend/src/components/monitoring/EndpointInstances.vue index a9720b996..05c0caa5b 100644 --- a/src/Frontend/src/components/monitoring/EndpointInstances.vue +++ b/src/Frontend/src/components/monitoring/EndpointInstances.vue @@ -10,6 +10,7 @@ import SmallGraph from "./SmallGraph.vue"; import type { ExtendedEndpointInstance } from "@/resources/MonitoringEndpoint"; import routeLinks from "@/router/routeLinks"; import ColumnHeader from "@/components/ColumnHeader.vue"; +import { CriticalTime, InstanceName, ProcessingTime, ScheduledRetries, Throughput } from "@/resources/MonitoringResources"; import FAIcon from "@/components/FAIcon.vue"; import { faEnvelope, faTrash } from "@fortawesome/free-solid-svg-icons"; @@ -60,18 +61,18 @@ onMounted(async () => {
- - - + + + - - + + - - + + - - + +
diff --git a/src/Frontend/src/components/monitoring/EndpointList.vue b/src/Frontend/src/components/monitoring/EndpointList.vue index 3d98c73c4..73cbaeb66 100644 --- a/src/Frontend/src/components/monitoring/EndpointList.vue +++ b/src/Frontend/src/components/monitoring/EndpointList.vue @@ -1,7 +1,8 @@  @@ -24,7 +25,7 @@ const endpoint = defineModel({ required: true });
- Throughput + {{ Throughput.label }}
{{ formatGraphDecimalFromNumber(endpoint.digest.metrics.throughput?.latest, 2) }} MSGS/S
@@ -37,7 +38,7 @@ const endpoint = defineModel({ required: true });
- Scheduled retries + {{ ScheduledRetries.label }}
diff --git a/src/Frontend/src/resources/MonitoringResources.ts b/src/Frontend/src/resources/MonitoringResources.ts new file mode 100644 index 000000000..4e8fb9d08 --- /dev/null +++ b/src/Frontend/src/resources/MonitoringResources.ts @@ -0,0 +1,56 @@ +export interface MonitoringResource { + name: string; + label: string; + unit?: string; + tooltip?: string; +} + +export const MessageType: MonitoringResource = { + name: "message-type-name", + label: "Message type name", +}; + +export const InstanceName: MonitoringResource = { + name: "instanceName", + label: "Instance Name", +}; + +export const EndpointName: MonitoringResource = { + name: "name", + label: "Endpoint Name", +}; + +export const Throughput: MonitoringResource = { + name: "throughput", + label: "Throughput", + unit: "(msgs/s)", + tooltip: "Throughput: The number of messages per second successfully processed by a receiving endpoint.", +}; + +export const ScheduledRetries: MonitoringResource = { + name: "retries", + label: "Scheduled retries", + unit: "(msgs/s)", + tooltip: "Scheduled retries: The number of messages per second scheduled for retries (immediate or delayed).", +}; + +export const ProcessingTime: MonitoringResource = { + name: "processingTime", + label: "Processing time", + unit: "(t)", + tooltip: "Processing time: The time taken for a receiving endpoint to successfully process a message.", +}; + +export const CriticalTime: MonitoringResource = { + name: "criticalTime", + label: "Critical time", + unit: "(t)", + tooltip: "Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.", +}; + +export const QueueLength: MonitoringResource = { + name: "queueLength", + label: "Queue length", + unit: "(msgs)", + tooltip: "Queue length: The number of messages waiting to be processed in the input queue(s) of the endpoint.", +}; From f908ab3004dbcb91b9e49f7115caa6a9ec08b20b Mon Sep 17 00:00:00 2001 From: Jason Taylor Date: Thu, 3 Jul 2025 10:36:43 +1000 Subject: [PATCH 2/4] Fix spelling --- src/Frontend/src/components/monitoring/EndpointInstances.vue | 2 +- src/Frontend/src/components/monitoring/EndpointMessageTypes.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Frontend/src/components/monitoring/EndpointInstances.vue b/src/Frontend/src/components/monitoring/EndpointInstances.vue index 05c0caa5b..feb4565ae 100644 --- a/src/Frontend/src/components/monitoring/EndpointInstances.vue +++ b/src/Frontend/src/components/monitoring/EndpointInstances.vue @@ -119,7 +119,7 @@ onMounted(async () => {
-
+
diff --git a/src/Frontend/src/components/monitoring/EndpointMessageTypes.vue b/src/Frontend/src/components/monitoring/EndpointMessageTypes.vue index 42b8527e3..93d610e1b 100644 --- a/src/Frontend/src/components/monitoring/EndpointMessageTypes.vue +++ b/src/Frontend/src/components/monitoring/EndpointMessageTypes.vue @@ -110,7 +110,7 @@ const paginatedMessageTypes = computed(() => {
-
+
From 6d32e2fd37d599a220c1341fccbeda2f9fe948b6 Mon Sep 17 00:00:00 2001 From: Jason Taylor Date: Thu, 3 Jul 2025 10:54:04 +1000 Subject: [PATCH 3/4] Use monitoring resources --- .../components/monitoring/EndpointListRow.vue | 42 ++++++------------- .../monitoring/actions/sortEndpointsBy.ts | 3 +- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/Frontend/src/components/monitoring/EndpointListRow.vue b/src/Frontend/src/components/monitoring/EndpointListRow.vue index 8bf7db0b4..2eff118fc 100644 --- a/src/Frontend/src/components/monitoring/EndpointListRow.vue +++ b/src/Frontend/src/components/monitoring/EndpointListRow.vue @@ -1,13 +1,3 @@ -