From afecf71143b193a7624d657d585fd1bf321371dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 13:41:54 +0200
Subject: [PATCH 01/67] Add platform health dashboard

---
 src/Frontend/src/components/PageFooter.vue    |  44 ----
 src/Frontend/src/components/PageHeader.vue    |   2 +
 .../components/monitoring/monitoringClient.ts |  20 +-
 .../platformcapabilities/CapabilityCard.vue   |  11 +-
 .../PlatformCapabilitiesDashboardItem.vue     |   2 +
 .../capabilities/AuditingCapability.ts        |  21 +-
 .../capabilities/ErrorCapability.ts           |  21 +-
 .../capabilities/MonitoringCapability.ts      |  23 +-
 .../platformhealth/PlatformHealthMenuItem.vue |  37 +++
 .../PlatformHealthSupportModal.vue            |  94 +++++++
 .../src/components/serviceControlClient.ts    |  20 +-
 .../usePlatformHealthStoreAutoRefresh.ts      |   4 +
 .../usePlatformModelAutoRefresh.ts            |   4 +
 src/Frontend/src/logger.ts                    |   2 -
 src/Frontend/src/resources/PlatformHealth.ts  |  39 +++
 src/Frontend/src/resources/PlatformModel.ts   |  24 ++
 src/Frontend/src/resources/RemoteInstance.ts  |   2 +
 src/Frontend/src/resources/RootUrls.ts        |   4 +
 src/Frontend/src/router/config.ts             |   6 +
 src/Frontend/src/router/routeLinks.spec.ts    |   4 +
 src/Frontend/src/router/routeLinks.ts         |   1 +
 .../src/stores/EnvironmentAndVersionsStore.ts |  16 +-
 .../src/stores/PlatformHealthStore.spec.ts    | 172 ++++++++++++
 .../src/stores/PlatformHealthStore.ts         | 246 ++++++++++++++++++
 .../src/stores/PlatformModelStore.spec.ts     |  70 +++++
 src/Frontend/src/stores/PlatformModelStore.ts | 193 ++++++++++++++
 .../src/views/PlatformHealthView.spec.ts      | 143 ++++++++++
 src/Frontend/src/views/PlatformHealthView.vue | 228 ++++++++++++++++
 .../licenseDetails/UploadMetadata.vue         |   4 +-
 src/Frontend/test/drivers/vitest/driver.ts    |   4 +-
 .../test/mocks/platform-health-state.ts       | 224 ++++++++++++++++
 .../test/mocks/platform-updates-template.ts   | 159 ++---------
 src/Frontend/test/mocks/scenarios/index.ts    |   3 +-
 .../platform-health/platform-health.ts        |  40 +++
 .../test/mocks/scenarios/scenario-helper.ts   |   2 +-
 .../test/preconditions/configuration.ts       |  14 +
 .../serviceControlWithMonitoring.ts           |   3 +
 37 files changed, 1668 insertions(+), 238 deletions(-)
 create mode 100644 src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
 create mode 100644 src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
 create mode 100644 src/Frontend/src/composables/usePlatformHealthStoreAutoRefresh.ts
 create mode 100644 src/Frontend/src/composables/usePlatformModelAutoRefresh.ts
 create mode 100644 src/Frontend/src/resources/PlatformHealth.ts
 create mode 100644 src/Frontend/src/resources/PlatformModel.ts
 create mode 100644 src/Frontend/src/stores/PlatformHealthStore.spec.ts
 create mode 100644 src/Frontend/src/stores/PlatformHealthStore.ts
 create mode 100644 src/Frontend/src/stores/PlatformModelStore.spec.ts
 create mode 100644 src/Frontend/src/stores/PlatformModelStore.ts
 create mode 100644 src/Frontend/src/views/PlatformHealthView.spec.ts
 create mode 100644 src/Frontend/src/views/PlatformHealthView.vue
 create mode 100644 src/Frontend/test/mocks/platform-health-state.ts
 create mode 100644 src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts

diff --git a/src/Frontend/src/components/PageFooter.vue b/src/Frontend/src/components/PageFooter.vue
index 976bd36c2d..b1ef748f7a 100644
--- a/src/Frontend/src/components/PageFooter.vue
+++ b/src/Frontend/src/components/PageFooter.vue
@@ -1,36 +1,20 @@
 <script setup lang="ts">
-import { computed } from "vue";
 import { LicenseStatus } from "@/resources/LicenseInfo";
 import routeLinks from "@/router/routeLinks";
 import FAIcon from "@/components/FAIcon.vue";
 import { faArrowTurnUp, faPlus } from "@fortawesome/free-solid-svg-icons";
-import useConnectionsAndStatsAutoRefresh from "@/composables/useConnectionsAndStatsAutoRefresh";
 import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
-import serviceControlClient from "@/components/serviceControlClient";
 import { storeToRefs } from "pinia";
 import { useConfigurationStore } from "@/stores/ConfigurationStore";
 import { useLicenseStore } from "@/stores/LicenseStore";
-import monitoringClient from "./monitoring/monitoringClient";
 
-const { store: connectionStore } = useConnectionsAndStatsAutoRefresh();
-const connectionState = connectionStore.connectionState;
-const monitoringConnectionState = connectionStore.monitoringConnectionState;
 const { store: environmentAndVersionsStore } = useEnvironmentAndVersionsAutoRefresh();
 const newVersions = environmentAndVersionsStore.newVersions;
 const environment = environmentAndVersionsStore.environment;
 const licenseStore = useLicenseStore();
 const { licenseStatus, license } = licenseStore;
-const isMonitoringEnabled = monitoringClient.isMonitoringEnabled;
 const isIntegrated = window.defaultConfig.isIntegrated;
 
-const scAddressTooltip = computed(() => {
-  return `ServiceControl URL ${serviceControlClient.url}`;
-});
-
-const scMonitoringAddressTooltip = computed(() => {
-  return `Monitoring URL ${monitoringClient.url}`;
-});
-
 const configurationStore = useConfigurationStore();
 const { configuration } = storeToRefs(configurationStore);
 </script>
@@ -53,34 +37,6 @@ const { configuration } = storeToRefs(configurationStore);
               <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>)
             </span>
           </template>
-          <span :title="scAddressTooltip">
-            Service Control:
-            <span class="connected-status" v-if="connectionState.connected && !connectionState.connecting">
-              <div class="fa pa-connection-success"></div>
-              <span v-if="!environment.sc_version">Connected</span>
-              <span v-if="environment.sc_version" class="versionnumber">v{{ environment.sc_version }}</span>
-              <span v-if="newVersions.newSCVersion.newscversion" class="newscversion"
-                >(<FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" /> <a :href="newVersions.newSCVersion.newscversionlink" target="_blank">v{{ newVersions.newSCVersion.newscversionnumber }} available</a>)</span
-              >
-            </span>
-            <span v-if="!connectionState.connected && !connectionState.connecting" class="connection-failed"> <i class="fa pa-connection-failed"></i> Not connected </span>
-            <span v-if="connectionState.connecting" class="connection-establishing"> <i class="fa pa-connection-establishing"></i> Connecting </span>
-          </span>
-
-          <template v-if="isMonitoringEnabled">
-            <span class="monitoring-connected" :title="scMonitoringAddressTooltip">
-              SC Monitoring:
-              <span class="connected-status" v-if="monitoringConnectionState.connected && !monitoringConnectionState.connecting">
-                <div class="fa pa-connection-success"></div>
-                <span v-if="environment.monitoring_version"> v{{ environment.monitoring_version }}</span>
-                <span v-if="newVersions.newMVersion.newmversion"
-                  >(<FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" /> <a :href="newVersions.newMVersion.newmversionlink" target="_blank">v{{ newVersions.newMVersion.newmversionnumber }} available</a>)</span
-                >
-              </span>
-              <span v-if="!monitoringConnectionState.connected && !monitoringConnectionState.connecting" class="connection-failed"> <i class="fa pa-connection-failed"></i> Not connected </span>
-              <span v-if="monitoringConnectionState.connecting" class="connection-establishing"> <i class="fa pa-connection-establishing"></i> Connecting </span>
-            </span>
-          </template>
         </div>
       </div>
       <template v-if="license.license_status !== LicenseStatus.Unavailable && !configuration?.mass_transit_connector && licenseStatus.isTrialLicense">
diff --git a/src/Frontend/src/components/PageHeader.vue b/src/Frontend/src/components/PageHeader.vue
index f465a267ca..faec383e79 100644
--- a/src/Frontend/src/components/PageHeader.vue
+++ b/src/Frontend/src/components/PageHeader.vue
@@ -12,6 +12,7 @@ import DashboardMenuItem from "@/components/dashboard/DashboardMenuItem.vue";
 import FeedbackButton from "@/components/FeedbackButton.vue";
 import ThroughputMenuItem from "@/views/throughputreport/ThroughputMenuItem.vue";
 import AuditMenuItem from "./audit/AuditMenuItem.vue";
+import PlatformHealthMenuItem from "@/components/platformhealth/PlatformHealthMenuItem.vue";
 import monitoringClient from "@/components/monitoring/monitoringClient";
 import UserProfileMenuItem from "@/components/UserProfileMenuItem.vue";
 import { useAuthStore } from "@/stores/AuthStore";
@@ -40,6 +41,7 @@ const menuItems = computed(() => {
     ...(canCall(ApiRoutes.viewFailedMessages) ? [FailedMessagesMenuItem] : []),
     ...(canCall(ApiRoutes.viewCustomChecks) ? [CustomChecksMenuItem] : []),
     ...(canCall(ApiRoutes.viewEventLog) ? [EventsMenuItem] : []),
+    PlatformHealthMenuItem,
     ...(canCall(ApiRoutes.viewThroughput) ? [ThroughputMenuItem] : []),
     ConfigurationMenuItem,
     FeedbackButton,
diff --git a/src/Frontend/src/components/monitoring/monitoringClient.ts b/src/Frontend/src/components/monitoring/monitoringClient.ts
index 0c6b207851..144c00e0f4 100644
--- a/src/Frontend/src/components/monitoring/monitoringClient.ts
+++ b/src/Frontend/src/components/monitoring/monitoringClient.ts
@@ -126,11 +126,11 @@ class MonitoringClient {
   private getUrl() {
     const searchParams = new URLSearchParams(window.location.search);
     const mu = searchParams.get("mu");
-    const existingMu = window.localStorage.getItem("mu");
+    const existingMu = safeStorageGet("mu");
 
     if (mu) {
       if (mu !== existingMu) {
-        window.localStorage.setItem("mu", mu);
+        safeStorageSet("mu", mu);
       }
       return mu;
     } else if (existingMu) {
@@ -143,4 +143,20 @@ class MonitoringClient {
   }
 }
 
+function safeStorageGet(key: string) {
+  try {
+    return window.localStorage?.getItem(key) ?? null;
+  } catch {
+    return null;
+  }
+}
+
+function safeStorageSet(key: string, value: string) {
+  try {
+    window.localStorage?.setItem(key, value);
+  } catch {
+    // ignore storage access errors
+  }
+}
+
 export default new MonitoringClient();
diff --git a/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue b/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
index b9d61921f2..62c78ea718 100644
--- a/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
+++ b/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { ref, computed } from "vue";
-import { useRouter } from "vue-router";
+import { RouterLink, useRouter } from "vue-router";
 import FAIcon from "@/components/FAIcon.vue";
 import { faCircle, faExternalLink, faTimes } from "@fortawesome/free-solid-svg-icons";
 import type { StatusIndicator, WizardPage } from "@/components/platformcapabilities/types";
 import { Capability, CapabilityStatus } from "@/components/platformcapabilities/constants";
 import WizardDialog from "./WizardDialog.vue";
+import routeLinks from "@/router/routeLinks";
 
 const router = useRouter();
 
@@ -74,8 +75,9 @@ function handleButtonClick() {
           </div>
         </div>
         <div class="title-row-actions">
-          <span
+          <RouterLink
             v-if="props.status !== CapabilityStatus.EndpointsNotConfigured && props.status !== CapabilityStatus.InstanceNotConfigured"
+            :to="routeLinks.platformHealth"
             class="status-badge"
             :class="{
               'status-available': props.status === CapabilityStatus.Available,
@@ -84,7 +86,7 @@ function handleButtonClick() {
             }"
           >
             {{ props.status }}
-          </span>
+          </RouterLink>
           <button v-if="allowDismiss" class="hide-card-btn" @click="emit('hide')" v-tippy="'Hide this card'">
             <FAIcon :icon="faTimes" />
           </button>
@@ -235,6 +237,8 @@ function handleButtonClick() {
 }
 
 .status-badge {
+  display: inline-flex;
+  align-items: center;
   white-space: nowrap;
   padding: 4px 12px;
   border-radius: 12px;
@@ -242,6 +246,7 @@ function handleButtonClick() {
   font-weight: 600;
   text-transform: uppercase;
   letter-spacing: 0.5px;
+  text-decoration: none;
 }
 
 .status-available {
diff --git a/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.vue b/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.vue
index 0ddf52ed07..c51ef8cc40 100644
--- a/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.vue
+++ b/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.vue
@@ -11,9 +11,11 @@ import { getMonitoringWizardPages } from "@/components/platformcapabilities/wiza
 import { usePlatformCapabilitiesStore } from "@/stores/PlatformCapabilitiesStore";
 import FAIcon from "@/components/FAIcon.vue";
 import { faChevronRight } from "@fortawesome/free-solid-svg-icons";
+import usePlatformModelAutoRefresh from "@/composables/usePlatformModelAutoRefresh";
 
 const platformCapabilitiesStore = usePlatformCapabilitiesStore();
 const { visibility } = storeToRefs(platformCapabilitiesStore);
+usePlatformModelAutoRefresh();
 
 const auditing = useAuditingCapability();
 const monitoring = useMonitoringCapability();
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
index 659b720563..1f170aab83 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
@@ -4,10 +4,10 @@ import { CapabilityStatus } from "@/components/platformcapabilities/constants";
 import useIsAllMessagesSupported, { minimumSCVersionForAllMessages } from "@/components/audit/isAllMessagesSupported";
 import { storeToRefs } from "pinia";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
-import useRemoteInstancesAutoRefresh from "@/composables/useRemoteInstancesAutoRefresh";
 import usePlatformCapabilitiesRefresh from "@/composables/usePlatformCapabilitiesRefresh";
 import { RemoteInstanceStatus, RemoteInstanceType, type RemoteInstance } from "@/resources/RemoteInstance";
 import routeLinks from "@/router/routeLinks";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 /**
  * Checks if a remote instance is an audit instance using the cached instance type
@@ -99,14 +99,15 @@ export function hasPartiallyUnavailableAuditInstances(instances: RemoteInstance[
 
 export function useAuditingCapability(): CapabilityComposable {
   const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
-
-  // This gives us the list of remote instances configured in ServiceControl.
-  // Uses auto-refresh to periodically check status (every 5 seconds)
-  const { store: remoteInstancesStore } = useRemoteInstancesAutoRefresh();
-  const { remoteInstances } = storeToRefs(remoteInstancesStore);
-
-  // Filter to only include audit instances (those with audit_retention_period in configuration)
-  const auditInstances = computed(() => filterAuditInstances(remoteInstances.value));
+  const platformModelStore = usePlatformModelStore();
+  const auditInstances = computed(() =>
+    platformModelStore.auditInstances.map((instance) => ({
+      api_uri: instance.sourceUrl ?? instance.name,
+      version: instance.version,
+      status: instance.health === "healthy" ? RemoteInstanceStatus.Online : RemoteInstanceStatus.Unavailable,
+      cachedInstanceType: RemoteInstanceType.Audit,
+    }))
+  );
 
   // This gives us the hasSuccessfulMessages flag which indicates if any successful messages exist.
   // Uses auto-refresh (minimal) to periodically check for at least 1 successful message (every 5 seconds)
@@ -186,7 +187,7 @@ export function useAuditingCapability(): CapabilityComposable {
   });
 
   // Loading state - true if remote instances haven't been loaded yet
-  const isLoading = computed(() => remoteInstances.value === null || remoteInstances.value === undefined);
+  const isLoading = computed(() => platformModelStore.model === null);
 
   return {
     status: auditStatus,
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index d2ea056c11..724f8e0639 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -1,12 +1,9 @@
 import { computed } from "vue";
-import { storeToRefs } from "pinia";
 import type { StatusIndicator } from "@/components/platformcapabilities/types";
 import { CapabilityStatus } from "@/components/platformcapabilities/constants";
-import { useConnectionsAndStatsStore } from "@/stores/ConnectionsAndStatsStore";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
-import serviceControlClient from "@/components/serviceControlClient";
-import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import routeLinks from "@/router/routeLinks";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 const ErrorDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.Unavailable]: "The ServiceControl instance is not responding.",
@@ -29,18 +26,10 @@ enum ErrorIndicatorTooltip {
 
 export function useErrorCapability(): CapabilityComposable {
   const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
-
-  // This tells us the connection state to the ServiceControl instance.
-  // Auto refreshed every 5 seconds.
-  const connectionsStore = useConnectionsAndStatsStore();
-  const connectionState = connectionsStore.connectionState;
-
-  // This gives us version information for the ServiceControl instance
-  const environmentStore = useEnvironmentAndVersionsStore();
-  const { environment } = storeToRefs(environmentStore);
+  const platformModelStore = usePlatformModelStore();
 
   // Check if instance is connected
-  const isConnected = computed(() => connectionState.connected && !connectionState.unableToConnect);
+  const isConnected = computed(() => platformModelStore.primary?.health === "healthy");
 
   // Determine overall error status
   const errorStatus = computed(() => {
@@ -64,13 +53,13 @@ export function useErrorCapability(): CapabilityComposable {
     const indicators: StatusIndicator[] = [];
 
     const tooltip = isConnected.value ? ErrorIndicatorTooltip.InstanceAvailable : ErrorIndicatorTooltip.InstanceUnavailable;
-    indicators.push(createIndicator("Instance", isConnected.value ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, serviceControlClient.url, environment.value.sc_version));
+    indicators.push(createIndicator("Instance", isConnected.value ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, platformModelStore.primary?.sourceUrl, platformModelStore.primary?.version));
 
     return indicators;
   });
 
   // Loading state - error is loading if we haven't attempted connection yet
-  const isLoading = computed(() => !connectionState.connected && !connectionState.unableToConnect && connectionState.connecting);
+  const isLoading = computed(() => platformModelStore.model === null);
 
   return {
     status: errorStatus,
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index 63a7016ffd..e67b3a7e1f 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -2,12 +2,11 @@ import { computed } from "vue";
 import type { StatusIndicator } from "@/components/platformcapabilities/types";
 import { CapabilityStatus } from "@/components/platformcapabilities/constants";
 import { storeToRefs } from "pinia";
-import { useConnectionsAndStatsStore } from "@/stores/ConnectionsAndStatsStore";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
 import monitoringClient from "@/components/monitoring/monitoringClient";
-import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import usePlatformCapabilitiesRefresh from "@/composables/usePlatformCapabilitiesRefresh";
 import routeLinks from "@/router/routeLinks";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 const MonitoringDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.EndpointsNotConfigured]:
@@ -48,20 +47,12 @@ export function useMonitoringCapability(): CapabilityComposable {
   // Uses auto-refresh to periodically check for monitored endpoints (every 5 seconds)
   const { store: platformCapabilitiesStore } = usePlatformCapabilitiesRefresh();
   const { hasMonitoredEndpoints } = storeToRefs(platformCapabilitiesStore);
-
-  // this tells us the connection state to the monitoring instance
-  // this is auto refreshed in the ConnectionsAndStatsStore (every 5 seconds)
-  const connectionsStore = useConnectionsAndStatsStore();
-  const monitoringConnectionState = connectionsStore.monitoringConnectionState;
-
-  // this gives us version information for the monitoring instance
-  const environmentStore = useEnvironmentAndVersionsStore();
-  const { environment } = storeToRefs(environmentStore);
+  const platformModelStore = usePlatformModelStore();
 
   // Determine overall monitoring status
   const monitoringStatus = computed(() => {
     const isConfiguredInServicePulse = isMonitoringEnabled;
-    const connectionSuccessful = monitoringConnectionState.connected && !monitoringConnectionState.unableToConnect;
+    const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
 
     // 1. Check if monitoring is configured in ServicePulse
     if (!isConfiguredInServicePulse) {
@@ -96,13 +87,15 @@ export function useMonitoringCapability(): CapabilityComposable {
     const indicators: StatusIndicator[] = [];
 
     // Instance specific states
-    const connectionSuccessful = monitoringConnectionState.connected && !monitoringConnectionState.unableToConnect;
+    const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
     const instanceAvailable = isMonitoringEnabled && connectionSuccessful;
 
     const instanceTooltip = instanceAvailable ? MonitoringIndicatorTooltip.InstanceAvailable : !isMonitoringEnabled ? MonitoringIndicatorTooltip.InstanceNotConfigured : MonitoringIndicatorTooltip.InstanceUnavailable;
 
     if (isMonitoringEnabled) {
-      indicators.push(createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, monitoringClient.url, environment.value.monitoring_version));
+      indicators.push(
+        createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, platformModelStore.monitoring?.sourceUrl ?? monitoringClient.url, platformModelStore.monitoring?.version)
+      );
     }
 
     // data available indicator - only show if instance is connected
@@ -120,7 +113,7 @@ export function useMonitoringCapability(): CapabilityComposable {
   });
 
   // Loading state - monitoring is loading if we haven't attempted connection yet
-  const isLoading = computed(() => !monitoringConnectionState.connected && !monitoringConnectionState.unableToConnect && monitoringConnectionState.connecting);
+  const isLoading = computed(() => platformModelStore.model === null);
 
   return {
     status: monitoringStatus,
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
new file mode 100644
index 0000000000..7fcf557462
--- /dev/null
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { RouterLink } from "vue-router";
+import { computed } from "vue";
+import { faServer } from "@fortawesome/free-solid-svg-icons";
+import FAIcon from "@/components/FAIcon.vue";
+import ExclamationMark from "@/components/ExclamationMark.vue";
+import routeLinks from "@/router/routeLinks";
+import { WarningLevel } from "@/components/WarningLevel";
+import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
+
+const { store } = usePlatformHealthStoreAutoRefresh();
+
+const warningLevel = computed(() => {
+  if (store.severity === "danger") {
+    return WarningLevel.Danger;
+  }
+
+  if (store.severity === "warning") {
+    return WarningLevel.Warning;
+  }
+
+  return WarningLevel.None;
+});
+</script>
+
+<template>
+  <RouterLink :to="routeLinks.platformHealth">
+    <FAIcon :icon="faServer" title="Platform health" />
+    <span class="navbar-label">Platform health</span>
+    <ExclamationMark :type="warningLevel" v-if="warningLevel !== WarningLevel.None" />
+  </RouterLink>
+</template>
+
+<style scoped>
+@import "@/assets/navbar.css";
+@import "@/assets/header-menu-item.css";
+</style>
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue b/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
new file mode 100644
index 0000000000..64722faa0b
--- /dev/null
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import ActionButton from "@/components/ActionButton.vue";
+import { downloadFileFromString } from "@/composables/fileDownloadCreator";
+import { onMounted, onUnmounted, ref } from "vue";
+
+const props = defineProps<{
+  downloadJson: string;
+  supportCaseUrl: string;
+}>();
+
+const emit = defineEmits<{ close: [] }>();
+const hasDownloaded = ref(false);
+
+function close() {
+  emit("close");
+}
+
+function download() {
+  downloadFileFromString(props.downloadJson, "application/json", "platform-configuration.json");
+  hasDownloaded.value = true;
+}
+
+function onKeydown(event: KeyboardEvent) {
+  if (event.key === "Escape") {
+    close();
+  }
+}
+
+onMounted(() => {
+  document.body.className = "modal-open";
+  document.addEventListener("keydown", onKeydown);
+});
+
+onUnmounted(() => {
+  document.body.className = "";
+  document.removeEventListener("keydown", onKeydown);
+});
+</script>
+
+<template>
+  <div class="modal-mask" @click.self="close">
+    <div class="modal-wrapper">
+      <div class="modal-container platform-health-modal" role="dialog" aria-modal="true" aria-labelledby="platform-health-support-title">
+        <div class="modal-header">
+          <div class="modal-title">
+            <h3 id="platform-health-support-title">Open support case</h3>
+          </div>
+        </div>
+        <div class="modal-body">
+          <p>First download the platform configuration. Then open the support case and attach the downloaded configuration file.</p>
+          <ol>
+            <li>Download <code>platform-configuration.json</code>.</li>
+            <li>Open the support case.</li>
+            <li>Attach the downloaded file when raising the case.</li>
+          </ol>
+        </div>
+        <div class="modal-footer modal-actions">
+          <ActionButton variant="primary" aria-label="Download platform configuration" @click="download">Download platform-configuration.json</ActionButton>
+          <a :href="supportCaseUrl" class="btn btn-default" :class="{ disabled: !hasDownloaded }" target="_blank" rel="noreferrer" :aria-disabled="!hasDownloaded" :tabindex="hasDownloaded ? 0 : -1">Then open the support case</a>
+          <ActionButton aria-label="Close support dialog" @click="close">Close</ActionButton>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+@import "@/components/modal.css";
+
+.platform-health-modal {
+  max-width: 560px;
+}
+
+.modal-body p {
+  margin-bottom: 1rem;
+}
+
+.modal-body ol {
+  padding-left: 1.25rem;
+  margin-bottom: 0;
+}
+
+.modal-actions {
+  display: flex;
+  gap: 0.75rem;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
+.disabled {
+  pointer-events: none;
+  opacity: 0.65;
+}
+</style>
diff --git a/src/Frontend/src/components/serviceControlClient.ts b/src/Frontend/src/components/serviceControlClient.ts
index f6fd54a024..323bf08eaf 100644
--- a/src/Frontend/src/components/serviceControlClient.ts
+++ b/src/Frontend/src/components/serviceControlClient.ts
@@ -135,11 +135,11 @@ class ServiceControlClient {
 
     const searchParams = new URLSearchParams(window.location.search);
     const scu = searchParams.get("scu");
-    const existingScu = window.localStorage.getItem("scu");
+    const existingScu = safeStorageGet("scu");
 
     if (scu) {
       if (scu !== existingScu) {
-        window.localStorage.setItem("scu", scu);
+        safeStorageSet("scu", scu);
       }
       return scu;
     } else if (existingScu) {
@@ -152,4 +152,20 @@ class ServiceControlClient {
   }
 }
 
+function safeStorageGet(key: string) {
+  try {
+    return window.localStorage?.getItem(key) ?? null;
+  } catch {
+    return null;
+  }
+}
+
+function safeStorageSet(key: string, value: string) {
+  try {
+    window.localStorage?.setItem(key, value);
+  } catch {
+    // ignore storage access errors
+  }
+}
+
 export default new ServiceControlClient();
diff --git a/src/Frontend/src/composables/usePlatformHealthStoreAutoRefresh.ts b/src/Frontend/src/composables/usePlatformHealthStoreAutoRefresh.ts
new file mode 100644
index 0000000000..0f0d8d07a6
--- /dev/null
+++ b/src/Frontend/src/composables/usePlatformHealthStoreAutoRefresh.ts
@@ -0,0 +1,4 @@
+import { useStoreAutoRefresh } from "./useAutoRefresh";
+import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
+
+export default useStoreAutoRefresh("platformHealth", usePlatformHealthStore, 5000).autoRefresh;
diff --git a/src/Frontend/src/composables/usePlatformModelAutoRefresh.ts b/src/Frontend/src/composables/usePlatformModelAutoRefresh.ts
new file mode 100644
index 0000000000..256b4387cf
--- /dev/null
+++ b/src/Frontend/src/composables/usePlatformModelAutoRefresh.ts
@@ -0,0 +1,4 @@
+import { useStoreAutoRefresh } from "./useAutoRefresh";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+
+export default useStoreAutoRefresh("platformModel", usePlatformModelStore, 5000).autoRefresh;
diff --git a/src/Frontend/src/logger.ts b/src/Frontend/src/logger.ts
index 9762c9ca14..848325bf41 100644
--- a/src/Frontend/src/logger.ts
+++ b/src/Frontend/src/logger.ts
@@ -3,11 +3,9 @@
 // a single point of control if log behaviour ever needs to change (e.g. send errors to
 // a remote service, suppress output in specific environments, etc.).
 
-/* eslint-disable no-console */
 const logger = {
   error: ((...args) => console.error(...args)) as typeof console.error,
   warn: ((...args) => console.warn(...args)) as typeof console.warn,
 };
-/* eslint-enable no-console */
 
 export default logger;
diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
new file mode 100644
index 0000000000..766e5d8e3b
--- /dev/null
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -0,0 +1,39 @@
+export type PlatformHealthMode = "single-region" | "multi-region";
+export type PlatformHealthStatus = "healthy" | "degraded" | "unavailable";
+export type PlatformHealthSeverity = "danger" | "warning" | "none";
+
+export interface PlatformHealthInstance {
+  name: string;
+  instanceType: "error" | "audit";
+  role: "primary-error" | "cross-region-primary" | "remote-audit" | "remote-error";
+  version: string;
+  status: PlatformHealthStatus;
+  ingestErrorMessages?: boolean;
+}
+
+export interface PlatformHealthMonitoring {
+  configured: boolean;
+  name: string;
+  instanceType: "monitoring";
+  version: string;
+  status: PlatformHealthStatus;
+}
+
+export interface PlatformHealthResponse {
+  mode: PlatformHealthMode;
+  primary: PlatformHealthInstance;
+  remotes: PlatformHealthInstance[];
+  monitoring: PlatformHealthMonitoring | null;
+  warnings: string[];
+}
+
+export interface PlatformHealthRow {
+  type: string;
+  instanceName: string;
+  version: string;
+  health: PlatformHealthStatus;
+  note: string;
+  upgradeAvailable: boolean;
+  latestVersion: string;
+  upgradeLink: string;
+}
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
new file mode 100644
index 0000000000..5c49ddb444
--- /dev/null
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -0,0 +1,24 @@
+export type PlatformModelMode = "single-region" | "multi-region";
+export type PlatformInstanceKind = "error" | "audit" | "monitoring";
+export type PlatformInstanceRole = "primary-error" | "cross-region-primary" | "remote-error" | "remote-audit" | "monitoring";
+export type PlatformInstanceHealth = "healthy" | "degraded" | "unavailable";
+
+export interface PlatformInstanceModel {
+  id: string;
+  name: string;
+  kind: PlatformInstanceKind;
+  role: PlatformInstanceRole;
+  version: string;
+  health: PlatformInstanceHealth;
+  configured: boolean;
+  sourceUrl?: string;
+  ingestErrorMessages?: boolean;
+}
+
+export interface PlatformModel {
+  mode: PlatformModelMode;
+  primary: PlatformInstanceModel | null;
+  remotes: PlatformInstanceModel[];
+  monitoring: PlatformInstanceModel | null;
+  warnings: string[];
+}
diff --git a/src/Frontend/src/resources/RemoteInstance.ts b/src/Frontend/src/resources/RemoteInstance.ts
index 8eff3e4cc1..ef31cc98db 100644
--- a/src/Frontend/src/resources/RemoteInstance.ts
+++ b/src/Frontend/src/resources/RemoteInstance.ts
@@ -18,6 +18,8 @@ export interface RemoteInstance {
   version: string;
   status: RemoteInstanceStatus;
   configuration?: RemoteInstanceConfiguration;
+  platform_health_status?: "healthy" | "degraded" | "unavailable";
+  platform_health_id?: string;
   /** Cached instance type - determined when the instance was last online */
   cachedInstanceType?: RemoteInstanceType;
 }
diff --git a/src/Frontend/src/resources/RootUrls.ts b/src/Frontend/src/resources/RootUrls.ts
index cc991b35b0..822d7d83fb 100644
--- a/src/Frontend/src/resources/RootUrls.ts
+++ b/src/Frontend/src/resources/RootUrls.ts
@@ -20,4 +20,8 @@ export default interface RootUrls {
   mypermissions_all?: string;
   mypermissions_summary?: string;
   my_routes_url?: string;
+  platform_health_status?: "healthy" | "degraded" | "unavailable";
+  platform_health_mode?: "single-region" | "multi-region";
+  platform_health_warnings?: string[];
+  platform_health_version?: string;
 }
diff --git a/src/Frontend/src/router/config.ts b/src/Frontend/src/router/config.ts
index 9f52b219bc..1664a8acf1 100644
--- a/src/Frontend/src/router/config.ts
+++ b/src/Frontend/src/router/config.ts
@@ -10,6 +10,7 @@ import HeartbeatsView from "@/views/HeartbeatsView.vue";
 import ThroughputReportView from "@/views/ThroughputReportView.vue";
 import AuditView from "@/views/AuditView.vue";
 import LoggedOutView from "@/views/LoggedOutView.vue";
+import PlatformHealthView from "@/views/PlatformHealthView.vue";
 
 export interface RouteItem {
   path: string;
@@ -33,6 +34,11 @@ const config: RouteItem[] = [
     component: DashboardView,
     title: "Dashboard",
   },
+  {
+    path: routeLinks.platformHealth,
+    component: PlatformHealthView,
+    title: "Platform health",
+  },
   {
     path: routeLinks.heartbeats.instances.template,
     component: () => import("@/components/heartbeats/EndpointInstances.vue"),
diff --git a/src/Frontend/src/router/routeLinks.spec.ts b/src/Frontend/src/router/routeLinks.spec.ts
index f6716b1db7..23c2d08b39 100644
--- a/src/Frontend/src/router/routeLinks.spec.ts
+++ b/src/Frontend/src/router/routeLinks.spec.ts
@@ -2,6 +2,10 @@ import { describe, expect, test } from "vitest";
 import routeLinks from "./routeLinks";
 
 describe("routeLinks", () => {
+  test("platform health link is stable", () => {
+    expect(routeLinks.platformHealth).toBe("/platform-health");
+  });
+
   test.each([
     ["id\\with\\backslash", "id%5Cwith%5Cbackslash"],
     ["id/with/slash", "id%2Fwith%2Fslash"],
diff --git a/src/Frontend/src/router/routeLinks.ts b/src/Frontend/src/router/routeLinks.ts
index 6bfb979d8a..1a60d58da9 100644
--- a/src/Frontend/src/router/routeLinks.ts
+++ b/src/Frontend/src/router/routeLinks.ts
@@ -115,6 +115,7 @@ const monitoringLinks = (root: string) => {
 
 const routeLinks = {
   dashboard: "/dashboard",
+  platformHealth: "/platform-health",
   heartbeats: heartbeatLinks("/heartbeats"),
   monitoring: monitoringLinks("/monitoring"),
   failedMessage: failedMessagesLinks("/failed-messages"),
diff --git a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
index 0f15264f93..e62c0a4050 100644
--- a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
+++ b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
@@ -67,20 +67,24 @@ export const useEnvironmentAndVersionsStore = defineStore("EnvironmentAndVersion
       environment.message_search_url = scVer.message_search_url;
       environment.sagas_url = scVer.sagas_url;
     }
-    if (products.latestSP && isUpgradeAvailable(environment.sp_version, products.latestSP.tag)) {
-      newVersions.newSPVersion.newspversion = true;
+    if (products.latestSP) {
       newVersions.newSPVersion.newspversionlink = products.latestSP.release;
       newVersions.newSPVersion.newspversionnumber = products.latestSP.tag;
     }
-    if (products.latestSC && isUpgradeAvailable(environment.sc_version, products.latestSC.tag)) {
-      newVersions.newSCVersion.newscversion = true;
+    if (products.latestSP && isUpgradeAvailable(environment.sp_version, products.latestSP.tag)) {
+      newVersions.newSPVersion.newspversion = true;
+    }
+    if (products.latestSC) {
       newVersions.newSCVersion.newscversionlink = products.latestSC.release;
       newVersions.newSCVersion.newscversionnumber = products.latestSC.tag;
+      newVersions.newMVersion.newmversionlink = products.latestSC.release;
+      newVersions.newMVersion.newmversionnumber = products.latestSC.tag;
+    }
+    if (products.latestSC && isUpgradeAvailable(environment.sc_version, products.latestSC.tag)) {
+      newVersions.newSCVersion.newscversion = true;
     }
     if (products.latestSC && isUpgradeAvailable(environment.monitoring_version, products.latestSC.tag)) {
       newVersions.newMVersion.newmversion = true;
-      newVersions.newMVersion.newmversionlink = products.latestSC.release;
-      newVersions.newMVersion.newmversionnumber = products.latestSC.tag;
     }
   }
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
new file mode 100644
index 0000000000..5f4f41584f
--- /dev/null
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -0,0 +1,172 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { createPinia, setActivePinia } from "pinia";
+import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
+import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+import type { PlatformModel } from "@/resources/PlatformModel";
+
+describe("PlatformHealthStore", () => {
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    window.__platformHealth = undefined;
+
+    const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversion = true;
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber = "6.19.3";
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+    environmentAndVersionsStore.newVersions.newMVersion.newmversion = true;
+    environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber = "6.19.3";
+    environmentAndVersionsStore.newVersions.newMVersion.newmversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+  });
+
+  test("derives warning severity and single-region rows", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = singleRegionWarningModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.isMultiRegion).toBe(false);
+    expect(store.severity).toBe("danger");
+    expect(store.rows).toHaveLength(4);
+    expect(store.rows[2].upgradeAvailable).toBe(true);
+    expect(store.rows[2].latestVersion).toBe("6.19.3");
+    expect(store.issueSummary).toContain("2 issues detected");
+    expect(store.issueSummary).toContain("degraded Audit instance");
+    expect(store.issueSummary).toContain("unavailable Monitoring instance");
+    expect(store.supportDownloadJson).toContain('"platformHealth"');
+  });
+
+  test("derives danger severity for multi-region degraded remote error", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = multiRegionDangerModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.isMultiRegion).toBe(true);
+    expect(store.severity).toBe("danger");
+    expect(store.rows).toHaveLength(3);
+    expect(store.rows.every((row) => row.type === "Error instance" || row.type === "Monitoring instance")).toBe(true);
+    expect(store.issueSummary).toContain("degraded Error instance");
+  });
+
+  test("uses dev mock state as a latest-version fallback for upgrade cues", async () => {
+    const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber = "";
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "";
+    window.__platformHealth = {
+      getState: () => ({
+        scenario: "single-region-warning",
+        primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
+        remotes: [],
+        monitoring: { configured: true, version: "6.19.3", status: "healthy" },
+        warnings: [],
+      }),
+      reset: vi.fn(),
+      setScenario: vi.fn(),
+      setStatus: vi.fn(),
+      setWarnings: vi.fn(),
+      clearWarnings: vi.fn(),
+    };
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = singleRegionWarningModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.rows[2].upgradeAvailable).toBe(true);
+    expect(store.rows[2].latestVersion).toBe("6.19.3");
+  });
+});
+
+const singleRegionWarningModel: PlatformModel = {
+  mode: "single-region",
+  primary: {
+    id: "primary",
+    name: "Particular.ServiceControl",
+    kind: "error",
+    role: "primary-error",
+    version: "6.19.3",
+    health: "healthy",
+    configured: true,
+    ingestErrorMessages: true,
+  },
+  remotes: [
+    {
+      id: "remote-0",
+      name: "Particular.ServiceControl.Audit",
+      kind: "audit",
+      role: "remote-audit",
+      version: "6.19.3",
+      health: "healthy",
+      configured: true,
+    },
+    {
+      id: "remote-1",
+      name: "Particular.ServiceControl.Audit-Blue",
+      kind: "audit",
+      role: "remote-audit",
+      version: "6.17.0",
+      health: "degraded",
+      configured: true,
+    },
+  ],
+  monitoring: {
+    id: "monitoring",
+    name: "Particular.ServiceControl.Monitoring",
+    kind: "monitoring",
+    role: "monitoring",
+    version: "6.19.3",
+    health: "unavailable",
+    configured: true,
+  },
+  warnings: [],
+};
+
+const multiRegionDangerModel: PlatformModel = {
+  mode: "multi-region",
+  primary: {
+    id: "primary",
+    name: "Particular.ServiceControl.CrossRegion",
+    kind: "error",
+    role: "cross-region-primary",
+    version: "6.19.3",
+    health: "healthy",
+    configured: true,
+    ingestErrorMessages: false,
+  },
+  remotes: [
+    {
+      id: "remote-0",
+      name: "Particular.ServiceControl.RegionA",
+      kind: "error",
+      role: "remote-error",
+      version: "6.19.3",
+      health: "healthy",
+      configured: true,
+      ingestErrorMessages: true,
+    },
+    {
+      id: "remote-1",
+      name: "Particular.ServiceControl.RegionB",
+      kind: "error",
+      role: "remote-error",
+      version: "6.19.3",
+      health: "degraded",
+      configured: true,
+      ingestErrorMessages: true,
+    },
+  ],
+  monitoring: null,
+  warnings: [],
+};
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
new file mode 100644
index 0000000000..33794beaae
--- /dev/null
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -0,0 +1,246 @@
+import { acceptHMRUpdate, defineStore } from "pinia";
+import { computed, ref } from "vue";
+import { isUpgradeAvailable } from "@/composables/serviceSemVer";
+import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
+import type { PlatformInstanceRole } from "@/resources/PlatformModel";
+import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+
+const supportCaseUrl = "https://customers.particular.net/request-support";
+const serviceControlReleaseBaseUrl = "https://github.com/Particular/ServiceControl/releases/tag/";
+
+export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
+  const payload = ref<PlatformHealthResponse | null>(null);
+  const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
+  const platformModelStore = usePlatformModelStore();
+
+  const isMultiRegion = computed(() => payload.value?.mode === "multi-region");
+
+  const severity = computed<PlatformHealthSeverity>(() => {
+    const current = payload.value;
+    if (!current) {
+      return "none";
+    }
+
+    if (current.primary.status === "unavailable") {
+      return "danger";
+    }
+
+    if (current.mode === "multi-region" && current.remotes.some((remote) => remote.instanceType === "error" && remote.status !== "healthy")) {
+      return "danger";
+    }
+
+    if (current.monitoring?.configured && current.monitoring.status === "unavailable") {
+      return "danger";
+    }
+
+    if (current.remotes.some((remote) => remote.instanceType === "audit" && remote.status === "degraded")) {
+      return "warning";
+    }
+
+    if (current.warnings.length > 0) {
+      return "warning";
+    }
+
+    return "none";
+  });
+
+  const rows = computed<PlatformHealthRow[]>(() => {
+    const current = payload.value;
+    if (!current) {
+      return [];
+    }
+
+    const latestServiceControlVersion = environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber || firstKnownVersion(current.primary.version, window.__platformHealth?.getState().primary.version);
+    const latestServiceControlLink = environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink || buildReleaseLink(latestServiceControlVersion);
+    const latestMonitoringVersion = environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber || firstKnownVersion(current.monitoring?.version, window.__platformHealth?.getState().monitoring?.version, latestServiceControlVersion);
+    const latestMonitoringLink = environmentAndVersionsStore.newVersions.newMVersion.newmversionlink || buildReleaseLink(latestMonitoringVersion);
+
+    const nextRows: PlatformHealthRow[] = [toRow(current.primary, latestServiceControlVersion, latestServiceControlLink), ...current.remotes.map((remote) => toRow(remote, latestServiceControlVersion, latestServiceControlLink))];
+
+    if (current.monitoring?.configured) {
+      nextRows.push({
+        type: "Monitoring instance",
+        instanceName: current.monitoring.name,
+        version: current.monitoring.version,
+        health: current.monitoring.status,
+        note: "Monitoring instance",
+        upgradeAvailable: hasMonitoringUpgrade(current.monitoring.version, latestMonitoringVersion),
+        latestVersion: latestMonitoringVersion,
+        upgradeLink: latestMonitoringLink,
+      });
+    }
+
+    return nextRows;
+  });
+
+  const issueSummary = computed(() => {
+    const current = payload.value;
+    if (!current) {
+      return "No issues detected.";
+    }
+
+    const issues: string[] = [];
+
+    if (current.primary.status === "unavailable") {
+      issues.push("primary Error instance unavailable");
+    }
+
+    issues.push(...current.remotes.filter((remote) => remote.status === "degraded").map((remote) => `degraded ${formatInstanceType(remote.instanceType)}`));
+    issues.push(...current.remotes.filter((remote) => remote.status === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.instanceType)}`));
+
+    if (current.mode === "single-region" && current.monitoring?.configured && current.monitoring.status === "unavailable") {
+      issues.push("unavailable Monitoring instance");
+    }
+
+    issues.push(...current.warnings.map((warning) => `topology warning: ${warning}`));
+
+    if (issues.length === 0) {
+      return "No issues detected.";
+    }
+
+    return `${issues.length} issue${issues.length === 1 ? "" : "s"} detected: ${issues.join(", ")}.`;
+  });
+
+  const supportDownloadJson = computed(() => {
+    if (!payload.value) {
+      return "";
+    }
+
+    return JSON.stringify(
+      {
+        schemaVersion: 1,
+        generatedAt: new Date().toISOString(),
+        supportCaseUrl,
+        platformHealth: payload.value,
+      },
+      null,
+      2
+    );
+  });
+
+  async function refresh() {
+    await platformModelStore.refresh();
+
+    payload.value = {
+      mode: platformModelStore.model?.mode ?? "single-region",
+      primary: {
+        name: platformModelStore.primary?.name ?? "Particular.ServiceControl",
+        instanceType: "error",
+        role: toPlatformHealthRole(platformModelStore.primary?.role),
+        version: platformModelStore.primary?.version ?? "Unknown",
+        status: platformModelStore.primary?.health ?? "unavailable",
+        ingestErrorMessages: platformModelStore.primary?.ingestErrorMessages,
+      },
+      remotes: platformModelStore.remotes.map((instance) => ({
+        name: instance.name,
+        instanceType: instance.kind === "error" ? "error" : "audit",
+        role: instance.role === "remote-error" ? "remote-error" : "remote-audit",
+        version: instance.version,
+        status: instance.health,
+        ingestErrorMessages: instance.ingestErrorMessages,
+      })),
+      monitoring: platformModelStore.monitoring
+        ? {
+            configured: platformModelStore.monitoring.configured,
+            name: platformModelStore.monitoring.name,
+            instanceType: "monitoring",
+            version: platformModelStore.monitoring.version,
+            status: platformModelStore.monitoring.health,
+          }
+        : null,
+      warnings: platformModelStore.warnings,
+    };
+  }
+
+  return {
+    payload,
+    refresh,
+    severity,
+    isMultiRegion,
+    issueSummary,
+    rows,
+    latestServiceControlVersion: computed(() => {
+      const current = payload.value;
+      if (!current) {
+        return "";
+      }
+
+      return environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber || firstKnownVersion(current.primary.version, window.__platformHealth?.getState().primary.version);
+    }),
+    supportCaseUrl,
+    supportDownloadJson,
+  };
+});
+
+function toRow(instance: PlatformHealthResponse["primary"], latestVersion: string, upgradeLink: string): PlatformHealthRow {
+  return {
+    type: formatRowType(instance),
+    instanceName: instance.name,
+    version: instance.version,
+    health: instance.status,
+    note: formatRole(instance.role),
+    upgradeAvailable: hasUpgrade(instance.version, latestVersion),
+    latestVersion,
+    upgradeLink,
+  };
+}
+
+function formatRowType(instance: PlatformHealthResponse["primary"]) {
+  if (instance.instanceType === "audit") {
+    return "Audit instance";
+  }
+
+  if (instance.role === "cross-region-primary") {
+    return "Error instance";
+  }
+
+  return "Error instance";
+}
+
+function formatRole(role: PlatformHealthResponse["primary"]["role"]) {
+  switch (role) {
+    case "primary-error":
+      return "Primary error processing instance";
+    case "cross-region-primary":
+      return "Connected cross-region primary";
+    case "remote-audit":
+      return "Audit instance";
+    case "remote-error":
+      return "Regional error instance";
+  }
+}
+
+function formatInstanceType(instanceType: PlatformHealthResponse["primary"]["instanceType"]) {
+  return instanceType === "audit" ? "Audit instance" : "Error instance";
+}
+
+function hasUpgrade(currentVersion: string, latestVersion: string) {
+  return !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
+}
+
+function hasMonitoringUpgrade(currentVersion: string, latestVersion: string) {
+  return !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
+}
+
+function buildReleaseLink(version: string) {
+  return version ? `${serviceControlReleaseBaseUrl}${version}` : "";
+}
+
+function firstKnownVersion(...versions: Array<string | null | undefined>) {
+  return versions.find((version) => version && version !== "Unknown") ?? "";
+}
+
+function toPlatformHealthRole(role: PlatformInstanceRole | undefined): PlatformHealthResponse["primary"]["role"] {
+  if (role === "cross-region-primary") {
+    return role;
+  }
+
+  return "primary-error";
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept(acceptHMRUpdate(usePlatformHealthStore, import.meta.hot));
+}
+
+export type PlatformHealthStore = ReturnType<typeof usePlatformHealthStore>;
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
new file mode 100644
index 0000000000..2aded5e0fe
--- /dev/null
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -0,0 +1,70 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { createPinia, setActivePinia } from "pinia";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+
+const fetchTypedFromServiceControl = vi.fn();
+const authFetch = vi.fn();
+
+vi.mock("@/components/serviceControlClient", () => ({
+  default: {
+    url: "http://localhost:33333/api/",
+    fetchTypedFromServiceControl: (...args: unknown[]) => fetchTypedFromServiceControl(...args),
+  },
+}));
+
+vi.mock("@/components/monitoring/monitoringClient", () => ({
+  default: {
+    url: "http://localhost:33633/",
+    isMonitoringEnabled: true,
+  },
+}));
+
+vi.mock("@/composables/useAuthenticatedFetch", () => ({
+  authFetch: (...args: unknown[]) => authFetch(...args),
+}));
+
+describe("PlatformModelStore", () => {
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    fetchTypedFromServiceControl.mockReset();
+    authFetch.mockReset();
+    window.__platformHealth = undefined;
+  });
+
+  test("keeps monitoring in the shared model for multi-region", async () => {
+    fetchTypedFromServiceControl
+      .mockResolvedValueOnce([
+        { headers: new Headers() },
+        {
+          name: "Particular.ServiceControl.CrossRegion",
+          platform_health_mode: "multi-region",
+          platform_health_status: "healthy",
+          platform_health_version: "6.19.3",
+          platform_health_warnings: [],
+        },
+      ])
+      .mockResolvedValueOnce([
+        { headers: new Headers() },
+        [
+          {
+            api_uri: "http://Particular.ServiceControl.RegionA/api/",
+            version: "6.19.3",
+            status: "online",
+            configuration: { data_retention: { error_retention_period: "14.00:00:00" } },
+          },
+        ],
+      ]);
+    authFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve({ platform_health_status: "healthy", platform_health_version: "6.19.3", Metrics: {} }),
+    } as Response);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.isMultiRegion).toBe(true);
+    expect(store.monitoring).not.toBeNull();
+    expect(store.monitoring?.role).toBe("monitoring");
+    expect(store.errorInstances).toHaveLength(1);
+  });
+});
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
new file mode 100644
index 0000000000..8c60444c18
--- /dev/null
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -0,0 +1,193 @@
+import { acceptHMRUpdate, defineStore } from "pinia";
+import { computed, ref } from "vue";
+import serviceControlClient from "@/components/serviceControlClient";
+import monitoringClient from "@/components/monitoring/monitoringClient";
+import { authFetch } from "@/composables/useAuthenticatedFetch";
+import type RootUrls from "@/resources/RootUrls";
+import type { RemoteInstance } from "@/resources/RemoteInstance";
+import type { PlatformInstanceHealth, PlatformInstanceModel, PlatformModel, PlatformModelMode } from "@/resources/PlatformModel";
+
+interface ServiceControlRoot {
+  name?: string;
+  platform_health_status?: PlatformInstanceHealth;
+  platform_health_mode?: PlatformModelMode;
+  platform_health_warnings?: string[];
+  platform_health_version?: string;
+}
+
+type ServiceControlRootDocument = RootUrls & ServiceControlRoot;
+
+interface MonitoringRoot {
+  Metrics?: object | null;
+  platform_health_status?: PlatformInstanceHealth;
+  platform_health_version?: string;
+}
+
+export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
+  const model = ref<PlatformModel | null>(null);
+
+  const primary = computed(() => model.value?.primary ?? null);
+  const remotes = computed(() => model.value?.remotes ?? []);
+  const monitoring = computed(() => model.value?.monitoring ?? null);
+  const auditInstances = computed(() => remotes.value.filter((instance) => instance.kind === "audit"));
+  const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
+  const isMultiRegion = computed(() => model.value?.mode === "multi-region");
+  const warnings = computed(() => model.value?.warnings ?? []);
+
+  async function refresh() {
+    const [primaryRoot, remotesResponse, monitoringResponse] = await Promise.all([getPrimaryRoot(), getRemotes(), getMonitoringRoot()]);
+    const mode = detectMode(primaryRoot, remotesResponse);
+
+    model.value = {
+      mode,
+      primary: mapPrimary(primaryRoot, mode),
+      remotes: mapRemotes(remotesResponse),
+      monitoring: mapMonitoring(monitoringResponse),
+      warnings: primaryRoot?.platform_health_warnings ?? readDevWarnings(),
+    };
+  }
+
+  return {
+    model,
+    primary,
+    remotes,
+    monitoring,
+    auditInstances,
+    errorInstances,
+    isMultiRegion,
+    warnings,
+    refresh,
+  };
+});
+
+async function getPrimaryRoot(): Promise<ServiceControlRootDocument | null> {
+  try {
+    const [, data] = await serviceControlClient.fetchTypedFromServiceControl<ServiceControlRootDocument>("");
+    return data;
+  } catch {
+    return null;
+  }
+}
+
+async function getRemotes(): Promise<RemoteInstance[]> {
+  try {
+    const [, data] = await serviceControlClient.fetchTypedFromServiceControl<RemoteInstance[]>("configuration/remotes");
+    return data;
+  } catch {
+    return [];
+  }
+}
+
+async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
+  if (!monitoringClient.isMonitoringEnabled) {
+    return null;
+  }
+
+  try {
+    const response = await authFetch(`${monitoringClient.url ?? ""}`);
+    if (!response.ok) {
+      throw new Error("Monitoring unavailable");
+    }
+    return (await response.json()) as MonitoringRoot;
+  } catch {
+    return {
+      Metrics: null,
+      platform_health_status: "unavailable",
+      platform_health_version: "Unknown",
+    };
+  }
+}
+
+function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformModelMode): PlatformInstanceModel | null {
+  if (!primaryRoot) {
+    return {
+      id: "primary",
+      name: "Particular.ServiceControl",
+      kind: "error",
+      role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
+      version: "Unknown",
+      health: "unavailable",
+      configured: true,
+      ingestErrorMessages: mode !== "multi-region",
+    };
+  }
+
+  return {
+    id: "primary",
+    name: primaryRoot.name || "Particular.ServiceControl",
+    kind: "error",
+    role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
+    version: primaryRoot.platform_health_version ?? "Unknown",
+    health: primaryRoot.platform_health_status ?? "healthy",
+    configured: true,
+    sourceUrl: serviceControlClient.url,
+    ingestErrorMessages: mode !== "multi-region",
+  };
+}
+
+function mapRemotes(remotes: RemoteInstance[]): PlatformInstanceModel[] {
+  return remotes.map((remote, index) => {
+    const isError = remote.configuration?.data_retention?.error_retention_period !== undefined;
+    const kind = isError ? "error" : "audit";
+
+    return {
+      id: remote.platform_health_id ?? `remote-${index}`,
+      name: extractInstanceName(remote.api_uri),
+      kind,
+      role: isError ? "remote-error" : "remote-audit",
+      version: remote.version,
+      health: remote.platform_health_status ?? (remote.status === "online" ? "healthy" : "unavailable"),
+      configured: true,
+      sourceUrl: remote.api_uri,
+      ingestErrorMessages: isError ? true : undefined,
+    };
+  });
+}
+
+function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstanceModel | null {
+  if (!monitoringClient.isMonitoringEnabled) {
+    return null;
+  }
+
+  return {
+    id: "monitoring",
+    name: "Particular.ServiceControl.Monitoring",
+    kind: "monitoring",
+    role: "monitoring",
+    version: monitoringRoot?.platform_health_version ?? "Unknown",
+    health: monitoringRoot?.platform_health_status ?? "healthy",
+    configured: true,
+    sourceUrl: monitoringClient.url,
+  };
+}
+
+function detectMode(primaryRoot: ServiceControlRootDocument | null, remotes: RemoteInstance[]): PlatformModelMode {
+  if (primaryRoot?.platform_health_mode) {
+    return primaryRoot.platform_health_mode;
+  }
+
+  const primaryName = primaryRoot?.name?.toLowerCase() ?? "";
+  const hasCrossRegionName = primaryName.includes("crossregion") || primaryName.includes("cross-region");
+  const hasRemoteErrors = remotes.some((remote) => remote.configuration?.data_retention?.error_retention_period !== undefined);
+
+  return hasCrossRegionName || hasRemoteErrors ? "multi-region" : "single-region";
+}
+
+function extractInstanceName(apiUri: string) {
+  try {
+    const uri = new URL(apiUri);
+    return uri.hostname;
+  } catch {
+    return apiUri;
+  }
+}
+
+function readDevWarnings() {
+  return window.__platformHealth?.getState().warnings ?? [];
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept(acceptHMRUpdate(usePlatformModelStore, import.meta.hot));
+}
+
+export type PlatformModelStore = ReturnType<typeof usePlatformModelStore>;
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
new file mode 100644
index 0000000000..24f1a74e9f
--- /dev/null
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -0,0 +1,143 @@
+import { describe, expect, render, screen, test, userEvent } from "@component-test-utils";
+import { createTestingPinia } from "@pinia/testing";
+import { setActivePinia } from "pinia";
+import { beforeEach, vi } from "vitest";
+import PlatformHealthView from "@/views/PlatformHealthView.vue";
+import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
+import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
+
+const downloadFileFromString = vi.fn();
+
+vi.mock("@/composables/fileDownloadCreator", () => ({
+  downloadFileFromString: (...args: unknown[]) => downloadFileFromString(...args),
+}));
+
+vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
+  default: () => ({
+    store: usePlatformHealthStore(),
+  }),
+}));
+
+describe("PlatformHealthView", () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }));
+    downloadFileFromString.mockReset();
+
+    const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversion = true;
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber = "6.19.3";
+    environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+  });
+
+  test("requires the configuration download before enabling the support link", async () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      mode: "single-region",
+      primary: {
+        name: "Particular.ServiceControl",
+        instanceType: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        status: "healthy",
+        ingestErrorMessages: true,
+      },
+      remotes: [],
+      monitoring: null,
+      warnings: [],
+    };
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    const user = userEvent.setup();
+
+    await user.click(screen.getByRole("button", { name: /Open support case/i }));
+
+    const supportLink = screen.getByRole("link", { name: /Then open the support case/i });
+    expect(supportLink).toHaveAttribute("aria-disabled", "true");
+
+    await user.click(screen.getByRole("button", { name: /Download platform configuration/i }));
+
+    expect(downloadFileFromString).toHaveBeenCalledTimes(1);
+    expect(downloadFileFromString).toHaveBeenCalledWith(expect.stringContaining('"platformHealth"'), "application/json", "platform-configuration.json");
+    expect(supportLink).toHaveAttribute("aria-disabled", "false");
+  });
+
+  test("shows an inline upgrade cue for an outdated instance version", () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      mode: "single-region",
+      primary: {
+        name: "Particular.ServiceControl",
+        instanceType: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        status: "healthy",
+        ingestErrorMessages: true,
+      },
+      remotes: [
+        {
+          name: "Particular.ServiceControl.Audit-Blue",
+          instanceType: "audit",
+          role: "remote-audit",
+          version: "6.17.0",
+          status: "healthy",
+        },
+      ],
+      monitoring: null,
+      warnings: [],
+    };
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.getByText(/v6.19.3 available/i)).toBeInTheDocument();
+  });
+
+  test("renders monitoring when present even in multi-region", () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      mode: "multi-region",
+      primary: {
+        name: "Particular.ServiceControl.CrossRegion",
+        instanceType: "error",
+        role: "cross-region-primary",
+        version: "6.19.3",
+        status: "healthy",
+        ingestErrorMessages: false,
+      },
+      remotes: [
+        {
+          name: "Particular.ServiceControl.RegionA",
+          instanceType: "error",
+          role: "remote-error",
+          version: "6.19.3",
+          status: "healthy",
+          ingestErrorMessages: true,
+        },
+      ],
+      monitoring: {
+        configured: true,
+        name: "Particular.ServiceControl.Monitoring",
+        instanceType: "monitoring",
+        version: "6.19.3",
+        status: "healthy",
+      },
+      warnings: [],
+    };
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.getByText(/Particular.ServiceControl.Monitoring/i)).toBeInTheDocument();
+  });
+});
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
new file mode 100644
index 0000000000..3127236181
--- /dev/null
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import LicenseNotExpired from "@/components/LicenseNotExpired.vue";
+import ActionButton from "@/components/ActionButton.vue";
+import PlatformHealthSupportModal from "@/components/platformhealth/PlatformHealthSupportModal.vue";
+import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
+import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
+import FAIcon from "@/components/FAIcon.vue";
+import { faArrowTurnUp } from "@fortawesome/free-solid-svg-icons";
+
+const { store } = usePlatformHealthStoreAutoRefresh();
+useEnvironmentAndVersionsAutoRefresh();
+const showSupportModal = ref(false);
+
+const issueSummaryClass = computed(() => ({
+  "issues-summary": true,
+  warning: store.severity === "warning",
+  danger: store.severity === "danger",
+}));
+
+function openSupportModal() {
+  showSupportModal.value = true;
+}
+
+function getUpgradeTargetVersion(row: (typeof store.rows)[number]) {
+  return row.latestVersion || store.payload?.primary.version || "";
+}
+
+function getUpgradeTargetLink(row: (typeof store.rows)[number]) {
+  return row.upgradeLink || `https://github.com/Particular/ServiceControl/releases/tag/${getUpgradeTargetVersion(row)}`;
+}
+
+function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
+  const targetVersion = getUpgradeTargetVersion(row);
+
+  return row.upgradeAvailable || (!!targetVersion && row.version !== "Unknown" && row.version !== targetVersion);
+}
+</script>
+
+<template>
+  <LicenseNotExpired>
+    <div class="container platform-health-view">
+      <div class="row">
+        <div class="col-sm-12 page-header-row">
+          <div>
+            <h1>Platform health</h1>
+          </div>
+          <ActionButton variant="primary" aria-label="Open support case" @click="openSupportModal">Open support case</ActionButton>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-sm-12">
+          <p :class="issueSummaryClass">{{ store.issueSummary }}</p>
+          <div v-if="store.payload?.warnings.length" class="platform-warning-list alert alert-warning" role="note">
+            <div v-for="warning in store.payload.warnings" :key="warning">{{ warning }}</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-sm-12">
+          <section class="panel table-wrap" aria-label="Platform health table">
+            <table>
+              <thead>
+                <tr>
+                  <th>Type</th>
+                  <th>Instance name</th>
+                  <th>Version</th>
+                  <th>Health</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="row in store.rows" :key="`${row.type}-${row.instanceName}`">
+                  <td class="type-cell">{{ row.type }}</td>
+                  <td>
+                    <div class="instance-name">{{ row.instanceName }}</div>
+                    <div class="instance-note">{{ row.note }}</div>
+                  </td>
+                  <td>
+                    <span>{{ row.version }}</span>
+                    <span v-if="shouldShowUpgradeCue(row)" class="upgrade-cue">
+                      (<FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" /> <a :href="getUpgradeTargetLink(row)" target="_blank">v{{ getUpgradeTargetVersion(row) }} available</a>)</span
+                    >
+                  </td>
+                  <td>
+                    <span class="health-badge" :class="row.health">{{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}</span>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </section>
+        </div>
+      </div>
+
+      <PlatformHealthSupportModal v-if="showSupportModal && store.supportDownloadJson" :download-json="store.supportDownloadJson" :support-case-url="store.supportCaseUrl" @close="showSupportModal = false" />
+    </div>
+  </LicenseNotExpired>
+</template>
+
+<style scoped>
+.platform-health-view {
+  padding-bottom: 2rem;
+}
+
+.page-header-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 1rem;
+}
+
+.lede {
+  color: #4c5b5c;
+  margin: 0 0 1.5rem;
+  max-width: 760px;
+}
+
+.issues-summary {
+  font-weight: 700;
+  margin-bottom: 1rem;
+}
+
+.issues-summary.warning {
+  color: #9b6200;
+}
+
+.issues-summary.danger {
+  color: #b53a31;
+}
+
+.panel {
+  background: #fff;
+  border: 1px solid #dfe7e8;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.table-wrap {
+  overflow-x: auto;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+  min-width: 720px;
+}
+
+thead th {
+  text-align: left;
+  font-size: 12px;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: #5f6e6f;
+  background: #f9fbfb;
+  padding: 16px 18px;
+  border-bottom: 1px solid #e6ecec;
+}
+
+tbody td {
+  padding: 18px;
+  border-bottom: 1px solid #e6ecec;
+  vertical-align: top;
+}
+
+tbody tr:last-child td {
+  border-bottom: none;
+}
+
+.type-cell,
+.instance-name {
+  font-weight: 700;
+}
+
+.type-cell {
+  width: 180px;
+}
+
+.instance-note {
+  color: #617071;
+}
+
+.health-badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 104px;
+  padding: 5px 10px;
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 700;
+  white-space: nowrap;
+}
+
+.health-badge.healthy {
+  background: #e3f6ea;
+  color: #1f7a3f;
+}
+
+.health-badge.degraded {
+  background: #fff2d9;
+  color: #9b6200;
+}
+
+.health-badge.unavailable {
+  background: #fde5e3;
+  color: #b53a31;
+}
+
+.platform-warning-list {
+  margin-bottom: 1rem;
+}
+
+.footer-icon {
+  color: var(--sp-blue);
+  margin-right: 4px;
+}
+
+.upgrade-cue {
+  margin-left: 0.25rem;
+}
+
+@media (max-width: 600px) {
+  .page-header-row {
+    flex-direction: column;
+  }
+}
+</style>
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/UploadMetadata.vue b/src/Frontend/src/views/throughputreport/licenseDetails/UploadMetadata.vue
index f5824d1220..742e638a87 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/UploadMetadata.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/UploadMetadata.vue
@@ -2,6 +2,7 @@
 import ActionButton from "@/components/ActionButton.vue";
 import { useLicenseDetailsStore } from "@/stores/LicenseDetailsStore";
 import { computed, ref } from "vue";
+import logger from "@/logger";
 
 const licenseDetailsStore = useLicenseDetailsStore();
 
@@ -21,8 +22,7 @@ async function handleSubmit() {
   try {
     await licenseDetailsStore.uploadEndpointMetadata(file.value);
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
+    logger.error(e);
     uploadError.value = true;
   } finally {
     saving.value = false;
diff --git a/src/Frontend/test/drivers/vitest/driver.ts b/src/Frontend/test/drivers/vitest/driver.ts
index 14e0549b38..87554c758a 100644
--- a/src/Frontend/test/drivers/vitest/driver.ts
+++ b/src/Frontend/test/drivers/vitest/driver.ts
@@ -86,8 +86,8 @@ const test = testVitest.extend<{ driver: Driver }>({
     mockServer.resetHandlers();
     //Make JSDOM create a fresh document per each test run
     jsdom.reconfigure({ url: "http://localhost:3000/" });
-    localStorage.clear();
-    sessionStorage.clear();
+    globalThis.localStorage?.clear?.();
+    globalThis.sessionStorage?.clear?.();
     deleteAllCookies();
   },
 });
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
new file mode 100644
index 0000000000..ff810b864a
--- /dev/null
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -0,0 +1,224 @@
+import type { RemoteInstance } from "@/resources/RemoteInstance";
+import type RootUrls from "@/resources/RootUrls";
+
+const latestPlatformVersion = "6.19.3";
+
+export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-warning" | "multi-region-danger";
+
+export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
+
+export interface PlatformHealthMockState {
+  scenario: PlatformHealthMockScenarioName;
+  primary: {
+    name: string;
+    version: string;
+    status: PlatformHealthMockStatus;
+  };
+  remotes: Array<{
+    id: `remote-${number}`;
+    apiUri: string;
+    version: string;
+    status: PlatformHealthMockStatus;
+    instanceType: "audit" | "error";
+  }>;
+  monitoring: {
+    configured: boolean;
+    version: string;
+    status: PlatformHealthMockStatus;
+  } | null;
+  warnings: string[];
+}
+
+declare global {
+  interface Window {
+    __platformHealth?: {
+      getState: () => PlatformHealthMockState;
+      reset: () => PlatformHealthMockState;
+      setScenario: (name: PlatformHealthMockScenarioName) => PlatformHealthMockState;
+      setStatus: (id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) => PlatformHealthMockState;
+      setWarnings: (warnings: string[]) => PlatformHealthMockState;
+      clearWarnings: () => PlatformHealthMockState;
+    };
+  }
+}
+
+let state = createScenario("single-region-warning");
+
+export function installPlatformHealthDevControls() {
+  window.__platformHealth = {
+    getState: () => cloneState(state),
+    reset: () => {
+      state = createScenario("single-region-warning");
+      return cloneState(state);
+    },
+    setScenario: (name) => {
+      state = createScenario(name);
+      return cloneState(state);
+    },
+    setStatus: (id, status) => {
+      state = updateStatus(state, id, status);
+      return cloneState(state);
+    },
+    setWarnings: (warnings) => {
+      state = { ...state, warnings: [...warnings] };
+      return cloneState(state);
+    },
+    clearWarnings: () => {
+      state = { ...state, warnings: [] };
+      return cloneState(state);
+    },
+  };
+}
+
+export function getPlatformHealthPrimaryRoot(): RootUrls {
+  const current = state;
+
+  return {
+    description: "The management backend for the Particular Service Platform",
+    endpoints_error_url: "http://localhost:33333/api/endpoints/{name}/errors/{?page,per_page,direction,sort}",
+    known_endpoints_url: "/endpoints/known",
+    endpoints_message_search_url: "http://localhost:33333/api/endpoints/{name}/messages/search/{keyword}/{?page,per_page,direction,sort}",
+    endpoints_messages_url: "http://localhost:33333/api/endpoints/{name}/messages/{?page,per_page,direction,sort}",
+    audit_count_url: "http://localhost:33333/api/endpoints/{name}/audit-count",
+    endpoints_url: "http://localhost:33333/api/endpoints",
+    errors_url: "http://localhost:33333/api/errors/{?page,per_page,direction,sort}",
+    configuration: "http://localhost:33333/api/configuration",
+    remote_configuration: "http://localhost:33333/api/configuration/remotes",
+    message_search_url: "http://localhost:33333/api/messages/search/{keyword}/{?page,per_page,direction,sort}",
+    license_status: "valid",
+    license_details: "http://localhost:33333/api/license",
+    name: current.primary.name,
+    sagas_url: "http://localhost:33333/api/sagas",
+    event_log_items: "http://localhost:33333/api/eventlogitems",
+    archived_groups_url: "http://localhost:33333/api/errors/groups/{classifier?}",
+    get_archive_group: "http://localhost:33333/api/archive/groups/id/{groupId}",
+    platform_health_status: current.primary.status,
+    platform_health_mode: current.scenario.startsWith("multi-region") ? "multi-region" : "single-region",
+    platform_health_warnings: current.warnings,
+    platform_health_version: current.primary.version,
+  } as RootUrls;
+}
+
+export function getPlatformHealthRemoteInstances(): RemoteInstance[] {
+  return state.remotes.map(
+    (remote) =>
+      ({
+        api_uri: remote.apiUri,
+        version: remote.version,
+        status: remote.status === "healthy" ? "online" : "unavailable",
+        configuration: {
+          data_retention: remote.instanceType === "error" ? { error_retention_period: "14.00:00:00" } : { audit_retention_period: "7.00:00:00" },
+        },
+        platform_health_status: remote.status,
+        platform_health_id: remote.id,
+      }) as RemoteInstance
+  );
+}
+
+export function getPlatformHealthMonitoringRoot() {
+  return {
+    Metrics: state.monitoring?.status === "unavailable" ? null : {},
+    platform_health_status: state.monitoring?.status ?? "healthy",
+    platform_health_version: state.monitoring?.version ?? latestPlatformVersion,
+  };
+}
+
+export function getPlatformHealthWarnings() {
+  return [...state.warnings];
+}
+
+function updateStatus(current: PlatformHealthMockState, id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) {
+  if (id === "primary") {
+    return { ...current, primary: { ...current.primary, status } };
+  }
+
+  if (id === "monitoring" && current.monitoring) {
+    return { ...current, monitoring: { ...current.monitoring, status } };
+  }
+
+  return {
+    ...current,
+    remotes: current.remotes.map((remote) => (remote.id === id ? { ...remote, status } : remote)),
+  };
+}
+
+function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMockState {
+  switch (name) {
+    case "single-region-healthy":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+        warnings: [],
+      };
+    case "single-region-warning":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+        warnings: [],
+      };
+    case "single-region-danger":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+        warnings: [],
+      };
+    case "multi-region-healthy":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+        ],
+        monitoring: null,
+        warnings: [],
+      };
+    case "multi-region-warning":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+        ],
+        monitoring: null,
+        warnings: ["Cross-region topology metadata is inferred in this prototype."],
+      };
+    case "multi-region-danger":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "degraded", instanceType: "error" },
+        ],
+        monitoring: null,
+        warnings: [],
+      };
+  }
+}
+
+function cloneState(current: PlatformHealthMockState): PlatformHealthMockState {
+  return {
+    ...current,
+    primary: { ...current.primary },
+    remotes: current.remotes.map((remote) => ({ ...remote })),
+    monitoring: current.monitoring ? { ...current.monitoring } : null,
+    warnings: [...current.warnings],
+  };
+}
diff --git a/src/Frontend/test/mocks/platform-updates-template.ts b/src/Frontend/test/mocks/platform-updates-template.ts
index 6e3130a9ca..2e8d33f73a 100644
--- a/src/Frontend/test/mocks/platform-updates-template.ts
+++ b/src/Frontend/test/mocks/platform-updates-template.ts
@@ -2,154 +2,49 @@ import type Release from "@/resources/Release";
 
 export const serviceControlNoPlatformUpdatesNeeded: Release[] = [
   {
-    tag: "5.0.4",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/5.0.4",
-    published: "2024-01-23T09:56:56Z",
+    tag: "6.19.3",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.19.3",
+    published: "2026-08-25T03:57:15Z",
   },
   {
-    tag: "4.33.2",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.33.2",
-    published: "2024-01-23T15:47:12Z",
+    tag: "6.19.2",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.19.2",
+    published: "2026-08-19T23:24:34Z",
   },
   {
-    tag: "5.0.3",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/5.0.3",
-    published: "2023-12-19T23:44:11Z",
+    tag: "6.19.1",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.19.1",
+    published: "2026-08-12T18:44:08Z",
   },
   {
-    tag: "5.0.2",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/5.0.2",
-    published: "2023-12-19T13:31:02Z",
+    tag: "6.19.0",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.19.0",
+    published: "2026-08-07T06:35:30Z",
   },
   {
-    tag: "5.0.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/5.0.1",
-    published: "2023-12-08T10:33:57Z",
+    tag: "6.18.3",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.18.3",
+    published: "2026-07-30T14:35:49Z",
   },
   {
-    tag: "4.33.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.33.1",
-    published: "2023-12-08T10:00:43Z",
+    tag: "6.18.2",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.18.2",
+    published: "2026-07-14T19:41:34Z",
   },
   {
-    tag: "5.0.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/5.0.0",
-    published: "2023-12-01T20:15:16Z",
+    tag: "6.18.1",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.18.1",
+    published: "2026-07-10T07:52:09Z",
   },
   {
-    tag: "4.33.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.33.0",
-    published: "2023-11-20T20:07:51Z",
+    tag: "6.18.0",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.18.0",
+    published: "2026-07-07T16:19:05Z",
   },
   {
-    tag: "4.32.4",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.32.4",
-    published: "2023-11-15T10:06:55Z",
-  },
-  {
-    tag: "4.32.3",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.32.3",
-    published: "2023-11-06T11:33:37Z",
-  },
-  {
-    tag: "4.32.2",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.32.2",
-    published: "2023-07-21T16:50:47Z",
-  },
-  {
-    tag: "4.32.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.32.1",
-    published: "2023-07-05T07:00:57Z",
-  },
-  {
-    tag: "4.32.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.32.0",
-    published: "2023-06-22T19:11:16Z",
-  },
-  {
-    tag: "4.31.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.31.0",
-    published: "2023-06-07T01:38:57Z",
-  },
-  {
-    tag: "4.30.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.30.1",
-    published: "2023-05-29T09:26:53Z",
-  },
-  {
-    tag: "4.30.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.30.0",
-    published: "2023-04-14T12:46:46Z",
-  },
-  {
-    tag: "4.29.3",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.29.3",
-    published: "2023-03-07T04:52:45Z",
-  },
-  {
-    tag: "4.29.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.29.1",
-    published: "2023-02-24T22:58:52Z",
-  },
-  {
-    tag: "4.29.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.29.0",
-    published: "2023-02-23T01:08:20Z",
-  },
-  {
-    tag: "4.28.4",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.28.4",
-    published: "2023-02-10T18:38:48Z",
-  },
-  {
-    tag: "4.28.3",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.28.3",
-    published: "2023-02-03T06:32:00Z",
-  },
-  {
-    tag: "4.27.7",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.27.7",
-    published: "2023-02-02T09:36:05Z",
-  },
-  {
-    tag: "4.27.6",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.27.6",
-    published: "2023-01-18T19:22:00Z",
-  },
-  {
-    tag: "4.27.4",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.27.4",
-    published: "2022-12-21T18:23:30Z",
-  },
-  {
-    tag: "4.26.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.26.0",
-    published: "2022-11-08T15:15:42Z",
-  },
-  {
-    tag: "4.25.2",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.25.2",
-    published: "2022-09-07T23:55:39Z",
-  },
-  {
-    tag: "4.25.1",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.25.1",
-    published: "2022-09-06T04:56:05Z",
-  },
-  {
-    tag: "4.23.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.23.0",
-    published: "2022-08-05T20:51:49Z",
-  },
-  {
-    tag: "4.22.0",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.22.0",
-    published: "2022-06-15T09:24:56Z",
-  },
-  {
-    tag: "4.21.8",
-    release: "https://github.com/Particular/ServiceControl/releases/tag/4.21.8",
-    published: "2022-03-03T12:33:24Z",
+    tag: "6.17.0",
+    release: "https://github.com/Particular/ServiceControl/releases/tag/6.17.0",
+    published: "2026-06-23T05:13:55Z",
   },
 ];
 
diff --git a/src/Frontend/test/mocks/scenarios/index.ts b/src/Frontend/test/mocks/scenarios/index.ts
index 728c0c5715..81c019f494 100644
--- a/src/Frontend/test/mocks/scenarios/index.ts
+++ b/src/Frontend/test/mocks/scenarios/index.ts
@@ -34,6 +34,8 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
   "monitoring-available": () => import("./monitoring/monitoring-available"),
   "monitoring-unavailable": () => import("./monitoring/monitoring-unavailable"),
   "monitoring-no-endpoints": () => import("./monitoring/monitoring-no-endpoints"),
+  // Platform health scenarios
+  "platform-health": () => import("./platform-health/platform-health"),
   // Recoverability scenarios
   "recoverability-available": () => import("./recoverability/recoverability-available"),
   "recoverability-unavailable": () => import("./recoverability/recoverability-unavailable"),
@@ -45,7 +47,6 @@ export async function loadScenario(): Promise<ScenarioModule> {
   const loader = scenarios[scenarioName];
 
   if (!loader) {
-    // eslint-disable-next-line no-console
     console.warn(`Unknown mock scenario: "${scenarioName}", falling back to default. Available: ${Object.keys(scenarios).join(", ")}`);
     const module = await scenarios.default();
     if (module.setupComplete) await module.setupComplete;
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
new file mode 100644
index 0000000000..0ecf9ba4f5
--- /dev/null
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -0,0 +1,40 @@
+import * as precondition from "../../../preconditions";
+import { createScenario } from "../scenario-helper";
+import { getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
+
+const { worker, driver, runScenario } = createScenario();
+
+export { worker };
+
+export const setupComplete = (async () => {
+  await runScenario(precondition.scenarioAuthenticatedUser);
+  await runScenario(precondition.hasNoDisconnectedEndpoints);
+  await runScenario(precondition.hasActiveLicense);
+  await runScenario(() => {
+    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}`, "get", () => {
+      const body = getPlatformHealthPrimaryRoot();
+
+      return Promise.resolve({
+        body,
+        status: body.platform_health_status === "unavailable" ? 503 : 200,
+        headers: { "X-Particular-Version": stateVersion() },
+      });
+    });
+    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}configuration/remotes`, "get", () => Promise.resolve({ body: getPlatformHealthRemoteInstances() }));
+    driver.mockEndpointDynamic(`${window.defaultConfig.monitoring_urls[0]}`, "get", () => {
+      const body = getPlatformHealthMonitoringRoot();
+
+      return Promise.resolve({
+        body,
+        status: 200,
+        headers: { "X-Particular-Version": stateVersion() },
+      });
+    });
+    return Promise.resolve();
+  });
+  installPlatformHealthDevControls();
+})();
+
+function stateVersion() {
+  return "6.19.3";
+}
diff --git a/src/Frontend/test/mocks/scenarios/scenario-helper.ts b/src/Frontend/test/mocks/scenarios/scenario-helper.ts
index 9c1482dd9d..5410b79aaa 100644
--- a/src/Frontend/test/mocks/scenarios/scenario-helper.ts
+++ b/src/Frontend/test/mocks/scenarios/scenario-helper.ts
@@ -8,7 +8,7 @@ import { setupWorker, type SetupWorker } from "msw/browser";
 import type { Driver, SetupFactoryOptions } from "../../driver";
 import { makeMockEndpoint, makeMockEndpointDynamic } from "../../mock-endpoint";
 
-type SetupFactory = ({ driver }: SetupFactoryOptions) => Promise<unknown>;
+type SetupFactory = ({ driver }: SetupFactoryOptions) => unknown | Promise<unknown>;
 
 export interface ScenarioSetup {
   worker: SetupWorker;
diff --git a/src/Frontend/test/preconditions/configuration.ts b/src/Frontend/test/preconditions/configuration.ts
index 6574b04c42..2a04c556ec 100644
--- a/src/Frontend/test/preconditions/configuration.ts
+++ b/src/Frontend/test/preconditions/configuration.ts
@@ -2,6 +2,7 @@ import type QueueAddress from "@/resources/QueueAddress";
 import type Redirect from "@/resources/Redirect";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
 import type Message from "@/resources/Message";
+import type { LicensedEndpointDetails } from "@/resources/LicenseDetails";
 import type { SetupFactoryOptions } from "../driver";
 
 export const knownQueuesDefaultHandler = ({ driver }: SetupFactoryOptions) => {
@@ -33,3 +34,16 @@ export const hasMessages =
       })
     );
   };
+
+export const licenseDetailsDefaultHandler = ({ driver }: SetupFactoryOptions) => {
+  driver.mockEndpoint(`${window.defaultConfig.service_control_url}license/details`, {
+    body: <LicensedEndpointDetails>{
+      products: [],
+      endpoints: [],
+      infrastructure_queues: [],
+      excluded_queues: [],
+      service_end_date: "2026-12-31T00:00:00Z",
+      valid_id: true,
+    },
+  });
+};
diff --git a/src/Frontend/test/preconditions/serviceControlWithMonitoring.ts b/src/Frontend/test/preconditions/serviceControlWithMonitoring.ts
index faa1b91148..0e03c72615 100644
--- a/src/Frontend/test/preconditions/serviceControlWithMonitoring.ts
+++ b/src/Frontend/test/preconditions/serviceControlWithMonitoring.ts
@@ -92,4 +92,7 @@ export const serviceControlWithMonitoring = async ({ driver }: SetupFactoryOptio
 
   //default handler for /api/messages2
   await driver.setUp(precondition.hasMessages());
+
+  //default handler for /api/license/details
+  await driver.setUp(precondition.licenseDetailsDefaultHandler);
 };

From 24cb60f7ac15e6f9a61a3136871627238b2fb23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 14:19:12 +0200
Subject: [PATCH 02/67] Refine platform health indicators

---
 .../src/components/ExclamationMark.vue        | 23 +++++++++-
 src/Frontend/src/components/WarningLevel.ts   |  1 +
 .../capabilities/AuditingCapability.ts        |  9 +---
 .../PlatformHealthMenuItem.spec.ts            | 28 +++++++++++
 .../platformhealth/PlatformHealthMenuItem.vue |  4 ++
 .../src/stores/PlatformHealthStore.spec.ts    |  4 +-
 .../src/stores/PlatformHealthStore.ts         |  3 ++
 .../src/views/PlatformHealthView.spec.ts      |  5 +-
 src/Frontend/src/views/PlatformHealthView.vue | 30 +++++++++---
 .../test/mocks/platform-health-state.ts       | 19 ++++++--
 src/Frontend/test/mocks/scenarios/index.ts    |  1 +
 .../platform-health-outdated.ts               | 46 +++++++++++++++++++
 .../audit-capability-card.spec.ts             | 20 ++++----
 13 files changed, 163 insertions(+), 30 deletions(-)
 create mode 100644 src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
 create mode 100644 src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts

diff --git a/src/Frontend/src/components/ExclamationMark.vue b/src/Frontend/src/components/ExclamationMark.vue
index 397cf31cfb..392613b5fc 100644
--- a/src/Frontend/src/components/ExclamationMark.vue
+++ b/src/Frontend/src/components/ExclamationMark.vue
@@ -9,17 +9,31 @@ const props = withDefaults(
   }>(),
   { type: WarningLevel.None }
 );
+
+const iconClass = (() => {
+  switch (props.type) {
+    case WarningLevel.Danger:
+      return "danger";
+    case WarningLevel.Warning:
+      return "warning";
+    case WarningLevel.Info:
+      return "info";
+    default:
+      return "warning";
+  }
+})();
 </script>
 
 <template>
   <template v-if="props.type !== WarningLevel.None">
-    <FAIcon :icon="faExclamationTriangle" :class="props.type === WarningLevel.Danger ? 'danger' : 'warning'" />
+    <FAIcon :icon="faExclamationTriangle" :class="iconClass" />
   </template>
 </template>
 
 <style scoped>
 .danger,
-.warning {
+.warning,
+.info {
   margin: 0 2px;
 }
 
@@ -32,4 +46,9 @@ const props = withDefaults(
 .warning {
   color: var(--bs-warning);
 }
+
+.info {
+  color: #8fa2a8;
+  background: linear-gradient(white, white) center/20% 72% no-repeat;
+}
 </style>
diff --git a/src/Frontend/src/components/WarningLevel.ts b/src/Frontend/src/components/WarningLevel.ts
index eef486b287..1ff68c3a2e 100644
--- a/src/Frontend/src/components/WarningLevel.ts
+++ b/src/Frontend/src/components/WarningLevel.ts
@@ -1,5 +1,6 @@
 export enum WarningLevel {
   None = "none",
+  Info = "info",
   Warning = "warning",
   Danger = "danger",
 }
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
index 1f170aab83..cf6a4a9e9a 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
@@ -32,7 +32,7 @@ const AuditingDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.InstanceNotConfigured]: "A ServiceControl Audit instance has not been configured. Click 'Get Started' to learn more about setting up auditing.",
   [CapabilityStatus.Unavailable]: "All ServiceControl Audit instances are configured but not responding. Click 'Learn More' for troubleshooting steps.",
   [CapabilityStatus.PartiallyUnavailable]: "Some ServiceControl Audit instances are not responding.",
-  [CapabilityStatus.Available]: "All ServiceControl Audit instances are available and endpoints have been configured to send audit messages.",
+  [CapabilityStatus.Available]: "All ServiceControl Audit instances are available.",
 };
 
 const AuditingHelpButtonText: CapabilityStatusToStringMap = {
@@ -134,12 +134,7 @@ export function useAuditingCapability(): CapabilityComposable {
       return CapabilityStatus.PartiallyUnavailable;
     }
 
-    // 4. Check if the 'All Messages' feature is not supported OR there are no successful messages
-    if (!isAllMessagesSupported.value || !hasSuccessfulMessages.value) {
-      return CapabilityStatus.EndpointsNotConfigured;
-    }
-
-    // 5. Audit instance is available and there are successful audit messages
+    // 4. All configured audit instances are available.
     return CapabilityStatus.Available;
   });
 
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
new file mode 100644
index 0000000000..5e32c87786
--- /dev/null
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
@@ -0,0 +1,28 @@
+import { describe, expect, test, vi } from "vitest";
+import { render, screen } from "@component-test-utils";
+import { RouterLinkStub } from "@vue/test-utils";
+import PlatformHealthMenuItem from "@/components/platformhealth/PlatformHealthMenuItem.vue";
+
+vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
+  default: () => ({
+    store: {
+      severity: "none",
+      outdatedOnly: true,
+    },
+  }),
+}));
+
+describe("PlatformHealthMenuItem", () => {
+  test("shows a white info exclamation when instances are only outdated", () => {
+    const { container } = render(PlatformHealthMenuItem, {
+      global: {
+        stubs: {
+          RouterLink: RouterLinkStub,
+        },
+      },
+    });
+
+    expect(screen.getByText(/Platform health/i)).toBeInTheDocument();
+    expect(container.querySelector(".info")).not.toBeNull();
+  });
+});
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
index 7fcf557462..3d69468d4d 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
@@ -19,6 +19,10 @@ const warningLevel = computed(() => {
     return WarningLevel.Warning;
   }
 
+  if (store.outdatedOnly) {
+    return WarningLevel.Info;
+  }
+
   return WarningLevel.None;
 });
 </script>
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 5f4f41584f..9d08a99e56 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -32,6 +32,7 @@ describe("PlatformHealthStore", () => {
     expect(store.isMultiRegion).toBe(false);
     expect(store.severity).toBe("danger");
     expect(store.rows).toHaveLength(4);
+    expect(store.outdatedOnly).toBe(false);
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
     expect(store.issueSummary).toContain("2 issues detected");
@@ -86,6 +87,7 @@ describe("PlatformHealthStore", () => {
 
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
+    expect(store.outdatedOnly).toBe(false);
   });
 });
 
@@ -107,7 +109,7 @@ const singleRegionWarningModel: PlatformModel = {
       name: "Particular.ServiceControl.Audit",
       kind: "audit",
       role: "remote-audit",
-      version: "6.19.3",
+      version: "6.18.0",
       health: "healthy",
       configured: true,
     },
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 33794beaae..866929cf71 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -45,6 +45,8 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     return "none";
   });
 
+  const outdatedOnly = computed(() => severity.value === "none" && rows.value.some((row) => row.upgradeAvailable));
+
   const rows = computed<PlatformHealthRow[]>(() => {
     const current = payload.value;
     if (!current) {
@@ -157,6 +159,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     payload,
     refresh,
     severity,
+    outdatedOnly,
     isMultiRegion,
     issueSummary,
     rows,
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 24f1a74e9f..14c6539885 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -80,10 +80,10 @@ describe("PlatformHealthView", () => {
       },
       remotes: [
         {
-          name: "Particular.ServiceControl.Audit-Blue",
+          name: "Particular.ServiceControl.Audit",
           instanceType: "audit",
           role: "remote-audit",
-          version: "6.17.0",
+          version: "6.18.0",
           status: "healthy",
         },
       ],
@@ -97,6 +97,7 @@ describe("PlatformHealthView", () => {
       },
     });
 
+    expect(screen.queryByText(/Outdated/i)).not.toBeInTheDocument();
     expect(screen.getByText(/v6.19.3 available/i)).toBeInTheDocument();
   });
 
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 3127236181..0a0041e7d6 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -51,7 +51,7 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
 
       <div class="row">
         <div class="col-sm-12">
-          <p :class="issueSummaryClass">{{ store.issueSummary }}</p>
+          <p v-if="store.issueSummary !== 'No issues detected.'" :class="issueSummaryClass">{{ store.issueSummary }}</p>
           <div v-if="store.payload?.warnings.length" class="platform-warning-list alert alert-warning" role="note">
             <div v-for="warning in store.payload.warnings" :key="warning">{{ warning }}</div>
           </div>
@@ -79,9 +79,10 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
                   </td>
                   <td>
                     <span>{{ row.version }}</span>
-                    <span v-if="shouldShowUpgradeCue(row)" class="upgrade-cue">
-                      (<FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" /> <a :href="getUpgradeTargetLink(row)" target="_blank">v{{ getUpgradeTargetVersion(row) }} available</a>)</span
-                    >
+                    <a v-if="shouldShowUpgradeCue(row)" class="upgrade-badge" :href="getUpgradeTargetLink(row)" target="_blank">
+                      <FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" />
+                      <span>v{{ getUpgradeTargetVersion(row) }} available</span>
+                    </a>
                   </td>
                   <td>
                     <span class="health-badge" :class="row.health">{{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}</span>
@@ -216,8 +217,25 @@ tbody tr:last-child td {
   margin-right: 4px;
 }
 
-.upgrade-cue {
-  margin-left: 0.25rem;
+.upgrade-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  margin-left: 0.5rem;
+  padding: 2px 8px;
+  border-radius: 999px;
+  background: #eef7fa;
+  color: var(--sp-blue);
+  font-size: 11px;
+  font-weight: 700;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+.upgrade-badge:hover {
+  color: #007f98;
+  background: #dff1f6;
+  text-decoration: none;
 }
 
 @media (max-width: 600px) {
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index ff810b864a..11b9c5141f 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -3,7 +3,7 @@ import type RootUrls from "@/resources/RootUrls";
 
 const latestPlatformVersion = "6.19.3";
 
-export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-warning" | "multi-region-danger";
+export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "single-region-outdated" | "multi-region-healthy" | "multi-region-warning" | "multi-region-danger";
 
 export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
 
@@ -149,7 +149,7 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
@@ -160,7 +160,7 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
@@ -171,12 +171,23 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
         warnings: [],
       };
+    case "single-region-outdated":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+        warnings: [],
+      };
     case "multi-region-healthy":
       return {
         scenario: name,
diff --git a/src/Frontend/test/mocks/scenarios/index.ts b/src/Frontend/test/mocks/scenarios/index.ts
index 81c019f494..6462bd3ef1 100644
--- a/src/Frontend/test/mocks/scenarios/index.ts
+++ b/src/Frontend/test/mocks/scenarios/index.ts
@@ -36,6 +36,7 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
   "monitoring-no-endpoints": () => import("./monitoring/monitoring-no-endpoints"),
   // Platform health scenarios
   "platform-health": () => import("./platform-health/platform-health"),
+  "platform-health-outdated": () => import("./platform-health/platform-health-outdated"),
   // Recoverability scenarios
   "recoverability-available": () => import("./recoverability/recoverability-available"),
   "recoverability-unavailable": () => import("./recoverability/recoverability-unavailable"),
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts
new file mode 100644
index 0000000000..f25ca67de4
--- /dev/null
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts
@@ -0,0 +1,46 @@
+import { worker, setupComplete as baseSetupComplete } from "./platform-health";
+import { installPlatformHealthDevControls } from "../../platform-health-state";
+import { makeMockEndpoint, makeMockEndpointDynamic } from "../../../mock-endpoint";
+
+export { worker };
+
+const mockEndpoint = makeMockEndpoint({ mockServer: worker });
+const mockEndpointDynamic = makeMockEndpointDynamic({ mockServer: worker });
+
+export const setupComplete = Promise.resolve().then(async () => {
+  await baseSetupComplete;
+
+  mockEndpointDynamic(`${window.defaultConfig.service_control_url}messages2/*`, "get", () =>
+    Promise.resolve({
+      body: [
+        {
+          id: "msg-1",
+          message_id: "msg-1",
+          message_type: "TestMessage",
+          sending_endpoint: { name: "Sender", host_id: "host-1", host: "localhost" },
+          receiving_endpoint: { name: "Receiver", host_id: "host-2", host: "localhost" },
+          time_sent: new Date().toISOString(),
+          processed_at: new Date().toISOString(),
+          critical_time: "00:00:00.1234567",
+          processing_time: "00:00:00.0123456",
+          delivery_time: "00:00:00.0012345",
+          is_system_message: false,
+          conversation_id: "conv-1",
+          headers: [],
+          status: "Successful",
+          message_intent: "send",
+          body_url: "",
+          body_size: 100,
+          instance_id: "instance-1",
+        },
+      ],
+    })
+  );
+
+  mockEndpoint(`${window.defaultConfig.monitoring_urls[0]}monitored-endpoints`, {
+    body: [{ name: "TestEndpoint" }],
+  });
+
+  installPlatformHealthDevControls();
+  window.__platformHealth?.setScenario("single-region-outdated");
+});
diff --git a/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
index 832c7ad0f6..47f5b7b836 100644
--- a/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
@@ -98,7 +98,7 @@ describe("FEATURE: Audit capability card", () => {
   });
 
   describe("RULE: When audit instance is available but no messages exist, show 'Endpoints Not Configured' status", () => {
-    test("EXAMPLE: Audit instance available but no successful messages shows not configured status", async ({ driver }) => {
+    test("EXAMPLE: Audit instance available but no successful messages still shows available status", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasAvailableAuditInstance());
@@ -114,12 +114,15 @@ describe("FEATURE: Audit capability card", () => {
       });
 
       await waitFor(async () => {
-        expect(await isAuditingCardNotConfigured()).toBe(true);
+        expect(await isAuditingCardAvailable()).toBe(true);
       });
 
       const actionButton = await auditingActionButton();
       expect(actionButton).toBeInTheDocument();
-      expect(actionButton?.textContent).toMatch(/Learn More/i);
+      expect(actionButton?.textContent).toMatch(/View Messages/i);
+
+      const messagesIndicator = await auditingIndicatorByLabel("Messages");
+      expect(messagesIndicator).toBeInTheDocument();
     });
   });
 
@@ -259,7 +262,7 @@ describe("FEATURE: Audit capability card", () => {
   });
 
   describe("RULE: When ServiceControl version does not support 'All Messages' feature, show 'Endpoints Not Configured' status", () => {
-    test("EXAMPLE: ServiceControl version < 6.6.0 with successful messages still shows not configured status", async ({ driver }) => {
+    test("EXAMPLE: ServiceControl version < 6.6.0 with successful messages still shows available status", async ({ driver }) => {
       // Arrange
       // Set up ServiceControl with version < 6.6.0 which does NOT support "All Messages" feature
       await driver.setUp(precondition.hasAuthenticationDisabled());
@@ -303,15 +306,16 @@ describe("FEATURE: Audit capability card", () => {
         expect(card).toBeInTheDocument();
       });
 
-      // Even though there are successful messages, the status should be "not configured"
-      // because the ServiceControl version doesn't support the "All Messages" feature
       await waitFor(async () => {
-        expect(await isAuditingCardNotConfigured()).toBe(true);
+        expect(await isAuditingCardAvailable()).toBe(true);
       });
 
       const actionButton = await auditingActionButton();
       expect(actionButton).toBeInTheDocument();
-      expect(actionButton?.textContent).toMatch(/Learn More/i);
+      expect(actionButton?.textContent).toMatch(/View Messages/i);
+
+      const messagesIndicator = await auditingIndicatorByLabel("Messages");
+      expect(messagesIndicator).toBeInTheDocument();
     });
   });
 });

From e695a63f8355507b152eae1d2024764228de1412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 14:43:08 +0200
Subject: [PATCH 03/67] Fix frontend lint failures

---
 src/Frontend/src/logger.ts                 | 8 ++++++--
 src/Frontend/test/mocks/scenarios/index.ts | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Frontend/src/logger.ts b/src/Frontend/src/logger.ts
index 848325bf41..5bfca1aaa2 100644
--- a/src/Frontend/src/logger.ts
+++ b/src/Frontend/src/logger.ts
@@ -3,9 +3,13 @@
 // a single point of control if log behaviour ever needs to change (e.g. send errors to
 // a remote service, suppress output in specific environments, etc.).
 
+function consoleMethod(method: "error" | "warn") {
+  return ((...args: Parameters<Console[typeof method]>) => globalThis.console[method](...args)) as Console[typeof method];
+}
+
 const logger = {
-  error: ((...args) => console.error(...args)) as typeof console.error,
-  warn: ((...args) => console.warn(...args)) as typeof console.warn,
+  error: consoleMethod("error"),
+  warn: consoleMethod("warn"),
 };
 
 export default logger;
diff --git a/src/Frontend/test/mocks/scenarios/index.ts b/src/Frontend/test/mocks/scenarios/index.ts
index 6462bd3ef1..94466ccd1a 100644
--- a/src/Frontend/test/mocks/scenarios/index.ts
+++ b/src/Frontend/test/mocks/scenarios/index.ts
@@ -11,6 +11,8 @@
  *   "dev:mocks:auth-disabled": "cross-env NODE_ENV=dev-mocks VITE_MOCK_SCENARIO=auth-disabled vite"
  */
 
+import logger from "@/logger";
+
 type ScenarioModule = {
   worker: import("msw/browser").SetupWorker;
   setupComplete?: Promise<void>;
@@ -48,7 +50,7 @@ export async function loadScenario(): Promise<ScenarioModule> {
   const loader = scenarios[scenarioName];
 
   if (!loader) {
-    console.warn(`Unknown mock scenario: "${scenarioName}", falling back to default. Available: ${Object.keys(scenarios).join(", ")}`);
+    logger.warn(`Unknown mock scenario: "${scenarioName}", falling back to default. Available: ${Object.keys(scenarios).join(", ")}`);
     const module = await scenarios.default();
     if (module.setupComplete) await module.setupComplete;
     return module;

From 5d07b311de40bb5007a7e708c7098c4308af2bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 16:58:51 +0200
Subject: [PATCH 04/67] Fix platform health nav indicator

---
 .../src/components/ExclamationMark.spec.ts    | 23 +++++++++++++++++++
 .../src/components/ExclamationMark.vue        |  5 ++--
 .../src/stores/PlatformHealthStore.spec.ts    |  8 +++----
 .../test/mocks/platform-health-state.ts       |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 src/Frontend/src/components/ExclamationMark.spec.ts

diff --git a/src/Frontend/src/components/ExclamationMark.spec.ts b/src/Frontend/src/components/ExclamationMark.spec.ts
new file mode 100644
index 0000000000..27ec6c7af8
--- /dev/null
+++ b/src/Frontend/src/components/ExclamationMark.spec.ts
@@ -0,0 +1,23 @@
+import { render } from "@component-test-utils";
+import { describe, expect, test } from "vitest";
+import ExclamationMark from "@/components/ExclamationMark.vue";
+import { WarningLevel } from "@/components/WarningLevel";
+
+describe("ExclamationMark", () => {
+  test("updates icon class when the warning level changes", async () => {
+    const { container, rerender } = render(ExclamationMark, {
+      props: {
+        type: WarningLevel.Info,
+      },
+    });
+
+    expect(container.querySelector(".info")).not.toBeNull();
+
+    await rerender({
+      type: WarningLevel.Warning,
+    });
+
+    expect(container.querySelector(".warning")).not.toBeNull();
+    expect(container.querySelector(".info")).toBeNull();
+  });
+});
diff --git a/src/Frontend/src/components/ExclamationMark.vue b/src/Frontend/src/components/ExclamationMark.vue
index 392613b5fc..c33b233cfb 100644
--- a/src/Frontend/src/components/ExclamationMark.vue
+++ b/src/Frontend/src/components/ExclamationMark.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed } from "vue";
 import { WarningLevel } from "@/components/WarningLevel";
 import FAIcon from "@/components/FAIcon.vue";
 import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
@@ -10,7 +11,7 @@ const props = withDefaults(
   { type: WarningLevel.None }
 );
 
-const iconClass = (() => {
+const iconClass = computed(() => {
   switch (props.type) {
     case WarningLevel.Danger:
       return "danger";
@@ -21,7 +22,7 @@ const iconClass = (() => {
     default:
       return "warning";
   }
-})();
+});
 </script>
 
 <template>
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 9d08a99e56..1342f798cc 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -30,14 +30,14 @@ describe("PlatformHealthStore", () => {
     await store.refresh();
 
     expect(store.isMultiRegion).toBe(false);
-    expect(store.severity).toBe("danger");
+    expect(store.severity).toBe("warning");
     expect(store.rows).toHaveLength(4);
     expect(store.outdatedOnly).toBe(false);
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
-    expect(store.issueSummary).toContain("2 issues detected");
+    expect(store.issueSummary).toContain("1 issue detected");
     expect(store.issueSummary).toContain("degraded Audit instance");
-    expect(store.issueSummary).toContain("unavailable Monitoring instance");
+    expect(store.issueSummary).not.toContain("unavailable Monitoring instance");
     expect(store.supportDownloadJson).toContain('"platformHealth"');
   });
 
@@ -129,7 +129,7 @@ const singleRegionWarningModel: PlatformModel = {
     kind: "monitoring",
     role: "monitoring",
     version: "6.19.3",
-    health: "unavailable",
+    health: "healthy",
     configured: true,
   },
   warnings: [],
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 11b9c5141f..33abd9202c 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -163,7 +163,7 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
         warnings: [],
       };
     case "single-region-danger":

From a4d4adacd5d3c921fd40a953835cd36c33fb8c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 17:23:04 +0200
Subject: [PATCH 05/67] Fix platform health mock scenarios

---
 src/Frontend/src/stores/PlatformHealthStore.spec.ts | 4 ++--
 src/Frontend/src/stores/PlatformModelStore.ts       | 2 +-
 src/Frontend/test/mocks/platform-health-state.ts    | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 1342f798cc..d410c80f54 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -55,7 +55,7 @@ describe("PlatformHealthStore", () => {
     expect(store.severity).toBe("danger");
     expect(store.rows).toHaveLength(3);
     expect(store.rows.every((row) => row.type === "Error instance" || row.type === "Monitoring instance")).toBe(true);
-    expect(store.issueSummary).toContain("degraded Error instance");
+    expect(store.issueSummary).toContain("unavailable Error instance");
   });
 
   test("uses dev mock state as a latest-version fallback for upgrade cues", async () => {
@@ -164,7 +164,7 @@ const multiRegionDangerModel: PlatformModel = {
       kind: "error",
       role: "remote-error",
       version: "6.19.3",
-      health: "degraded",
+      health: "unavailable",
       configured: true,
       ingestErrorMessages: true,
     },
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 8c60444c18..5017943fc9 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -145,7 +145,7 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstanceModel[] {
 }
 
 function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstanceModel | null {
-  if (!monitoringClient.isMonitoringEnabled) {
+  if (!monitoringClient.isMonitoringEnabled || monitoringRoot === null) {
     return null;
   }
 
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 33abd9202c..629b81000f 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -116,6 +116,10 @@ export function getPlatformHealthRemoteInstances(): RemoteInstance[] {
 }
 
 export function getPlatformHealthMonitoringRoot() {
+  if (state.monitoring === null) {
+    return null;
+  }
+
   return {
     Metrics: state.monitoring?.status === "unavailable" ? null : {},
     platform_health_status: state.monitoring?.status ?? "healthy",
@@ -216,7 +220,7 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "degraded", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
         ],
         monitoring: null,
         warnings: [],

From 80fbbadf2cb96817b12bb305bd16c5303873233a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 17:29:16 +0200
Subject: [PATCH 06/67] Simplify monitoring root model

---
 src/Frontend/src/stores/PlatformModelStore.spec.ts | 2 +-
 src/Frontend/src/stores/PlatformModelStore.ts      | 2 --
 src/Frontend/test/mocks/platform-health-state.ts   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 2aded5e0fe..e1238286ec 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -56,7 +56,7 @@ describe("PlatformModelStore", () => {
       ]);
     authFetch.mockResolvedValue({
       ok: true,
-      json: () => Promise.resolve({ platform_health_status: "healthy", platform_health_version: "6.19.3", Metrics: {} }),
+      json: () => Promise.resolve({ platform_health_status: "healthy", platform_health_version: "6.19.3" }),
     } as Response);
 
     const store = usePlatformModelStore();
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 5017943fc9..fdd38fa77d 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -18,7 +18,6 @@ interface ServiceControlRoot {
 type ServiceControlRootDocument = RootUrls & ServiceControlRoot;
 
 interface MonitoringRoot {
-  Metrics?: object | null;
   platform_health_status?: PlatformInstanceHealth;
   platform_health_version?: string;
 }
@@ -91,7 +90,6 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
     return (await response.json()) as MonitoringRoot;
   } catch {
     return {
-      Metrics: null,
       platform_health_status: "unavailable",
       platform_health_version: "Unknown",
     };
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 629b81000f..729a45614a 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -121,7 +121,6 @@ export function getPlatformHealthMonitoringRoot() {
   }
 
   return {
-    Metrics: state.monitoring?.status === "unavailable" ? null : {},
     platform_health_status: state.monitoring?.status ?? "healthy",
     platform_health_version: state.monitoring?.version ?? latestPlatformVersion,
   };

From 5938b293862611fd7b107e86052f5b2a0702539f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 17:44:34 +0200
Subject: [PATCH 07/67] Rename platform model types

---
 src/Frontend/src/resources/PlatformModel.ts   | 12 ++++++------
 src/Frontend/src/stores/PlatformModelStore.ts | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 5c49ddb444..575618f107 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -1,9 +1,9 @@
-export type PlatformModelMode = "single-region" | "multi-region";
+export type PlatformTopologyMode = "single-region" | "multi-region";
 export type PlatformInstanceKind = "error" | "audit" | "monitoring";
 export type PlatformInstanceRole = "primary-error" | "cross-region-primary" | "remote-error" | "remote-audit" | "monitoring";
 export type PlatformInstanceHealth = "healthy" | "degraded" | "unavailable";
 
-export interface PlatformInstanceModel {
+export interface PlatformInstance {
   id: string;
   name: string;
   kind: PlatformInstanceKind;
@@ -16,9 +16,9 @@ export interface PlatformInstanceModel {
 }
 
 export interface PlatformModel {
-  mode: PlatformModelMode;
-  primary: PlatformInstanceModel | null;
-  remotes: PlatformInstanceModel[];
-  monitoring: PlatformInstanceModel | null;
+  mode: PlatformTopologyMode;
+  primary: PlatformInstance | null;
+  remotes: PlatformInstance[];
+  monitoring: PlatformInstance | null;
   warnings: string[];
 }
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index fdd38fa77d..ad6b00f85d 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -5,12 +5,12 @@ import monitoringClient from "@/components/monitoring/monitoringClient";
 import { authFetch } from "@/composables/useAuthenticatedFetch";
 import type RootUrls from "@/resources/RootUrls";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
-import type { PlatformInstanceHealth, PlatformInstanceModel, PlatformModel, PlatformModelMode } from "@/resources/PlatformModel";
+import type { PlatformInstance, PlatformInstanceHealth, PlatformModel, PlatformTopologyMode } from "@/resources/PlatformModel";
 
 interface ServiceControlRoot {
   name?: string;
   platform_health_status?: PlatformInstanceHealth;
-  platform_health_mode?: PlatformModelMode;
+  platform_health_mode?: PlatformTopologyMode;
   platform_health_warnings?: string[];
   platform_health_version?: string;
 }
@@ -96,7 +96,7 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 }
 
-function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformModelMode): PlatformInstanceModel | null {
+function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformTopologyMode): PlatformInstance | null {
   if (!primaryRoot) {
     return {
       id: "primary",
@@ -123,7 +123,7 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
   };
 }
 
-function mapRemotes(remotes: RemoteInstance[]): PlatformInstanceModel[] {
+function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
   return remotes.map((remote, index) => {
     const isError = remote.configuration?.data_retention?.error_retention_period !== undefined;
     const kind = isError ? "error" : "audit";
@@ -142,7 +142,7 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstanceModel[] {
   });
 }
 
-function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstanceModel | null {
+function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance | null {
   if (!monitoringClient.isMonitoringEnabled || monitoringRoot === null) {
     return null;
   }
@@ -159,7 +159,7 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstanceM
   };
 }
 
-function detectMode(primaryRoot: ServiceControlRootDocument | null, remotes: RemoteInstance[]): PlatformModelMode {
+function detectMode(primaryRoot: ServiceControlRootDocument | null, remotes: RemoteInstance[]): PlatformTopologyMode {
   if (primaryRoot?.platform_health_mode) {
     return primaryRoot.platform_health_mode;
   }

From 9c83a68cb7929c58a4c6a67385cf02fab512fac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 17:58:48 +0200
Subject: [PATCH 08/67] Use shared platform instances in health page

---
 src/Frontend/src/resources/PlatformHealth.ts  |  31 +-----
 src/Frontend/src/resources/PlatformModel.ts   |   1 -
 .../src/stores/PlatformHealthStore.spec.ts    |   4 -
 .../src/stores/PlatformHealthStore.ts         | 102 ++++++------------
 src/Frontend/src/stores/PlatformModelStore.ts |   3 -
 .../src/views/PlatformHealthView.spec.ts      |  49 +++++----
 src/Frontend/src/views/PlatformHealthView.vue |   2 +-
 7 files changed, 67 insertions(+), 125 deletions(-)

diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
index 766e5d8e3b..e350f43a79 100644
--- a/src/Frontend/src/resources/PlatformHealth.ts
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -1,37 +1,14 @@
-export type PlatformHealthMode = "single-region" | "multi-region";
-export type PlatformHealthStatus = "healthy" | "degraded" | "unavailable";
-export type PlatformHealthSeverity = "danger" | "warning" | "none";
-
-export interface PlatformHealthInstance {
-  name: string;
-  instanceType: "error" | "audit";
-  role: "primary-error" | "cross-region-primary" | "remote-audit" | "remote-error";
-  version: string;
-  status: PlatformHealthStatus;
-  ingestErrorMessages?: boolean;
-}
+import type { PlatformInstanceHealth, PlatformModel } from "@/resources/PlatformModel";
 
-export interface PlatformHealthMonitoring {
-  configured: boolean;
-  name: string;
-  instanceType: "monitoring";
-  version: string;
-  status: PlatformHealthStatus;
-}
+export type PlatformHealthSeverity = "danger" | "warning" | "none";
 
-export interface PlatformHealthResponse {
-  mode: PlatformHealthMode;
-  primary: PlatformHealthInstance;
-  remotes: PlatformHealthInstance[];
-  monitoring: PlatformHealthMonitoring | null;
-  warnings: string[];
-}
+export type PlatformHealthResponse = PlatformModel;
 
 export interface PlatformHealthRow {
   type: string;
   instanceName: string;
   version: string;
-  health: PlatformHealthStatus;
+  health: PlatformInstanceHealth;
   note: string;
   upgradeAvailable: boolean;
   latestVersion: string;
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 575618f107..6b404c2a44 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -12,7 +12,6 @@ export interface PlatformInstance {
   health: PlatformInstanceHealth;
   configured: boolean;
   sourceUrl?: string;
-  ingestErrorMessages?: boolean;
 }
 
 export interface PlatformModel {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index d410c80f54..a488da2853 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -101,7 +101,6 @@ const singleRegionWarningModel: PlatformModel = {
     version: "6.19.3",
     health: "healthy",
     configured: true,
-    ingestErrorMessages: true,
   },
   remotes: [
     {
@@ -145,7 +144,6 @@ const multiRegionDangerModel: PlatformModel = {
     version: "6.19.3",
     health: "healthy",
     configured: true,
-    ingestErrorMessages: false,
   },
   remotes: [
     {
@@ -156,7 +154,6 @@ const multiRegionDangerModel: PlatformModel = {
       version: "6.19.3",
       health: "healthy",
       configured: true,
-      ingestErrorMessages: true,
     },
     {
       id: "remote-1",
@@ -166,7 +163,6 @@ const multiRegionDangerModel: PlatformModel = {
       version: "6.19.3",
       health: "unavailable",
       configured: true,
-      ingestErrorMessages: true,
     },
   ],
   monitoring: null,
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 866929cf71..39a7bed2f5 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -2,7 +2,7 @@ import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed, ref } from "vue";
 import { isUpgradeAvailable } from "@/composables/serviceSemVer";
 import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
-import type { PlatformInstanceRole } from "@/resources/PlatformModel";
+import type { PlatformInstance } from "@/resources/PlatformModel";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
@@ -22,19 +22,19 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "none";
     }
 
-    if (current.primary.status === "unavailable") {
+    if (current.primary?.health === "unavailable") {
       return "danger";
     }
 
-    if (current.mode === "multi-region" && current.remotes.some((remote) => remote.instanceType === "error" && remote.status !== "healthy")) {
+    if (current.mode === "multi-region" && current.remotes.some((remote) => remote.kind === "error" && remote.health !== "healthy")) {
       return "danger";
     }
 
-    if (current.monitoring?.configured && current.monitoring.status === "unavailable") {
+    if (current.monitoring?.configured && current.monitoring.health === "unavailable") {
       return "danger";
     }
 
-    if (current.remotes.some((remote) => remote.instanceType === "audit" && remote.status === "degraded")) {
+    if (current.remotes.some((remote) => remote.kind === "audit" && remote.health === "degraded")) {
       return "warning";
     }
 
@@ -49,7 +49,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 
   const rows = computed<PlatformHealthRow[]>(() => {
     const current = payload.value;
-    if (!current) {
+    if (!current || current.primary === null) {
       return [];
     }
 
@@ -61,16 +61,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     const nextRows: PlatformHealthRow[] = [toRow(current.primary, latestServiceControlVersion, latestServiceControlLink), ...current.remotes.map((remote) => toRow(remote, latestServiceControlVersion, latestServiceControlLink))];
 
     if (current.monitoring?.configured) {
-      nextRows.push({
-        type: "Monitoring instance",
-        instanceName: current.monitoring.name,
-        version: current.monitoring.version,
-        health: current.monitoring.status,
-        note: "Monitoring instance",
-        upgradeAvailable: hasMonitoringUpgrade(current.monitoring.version, latestMonitoringVersion),
-        latestVersion: latestMonitoringVersion,
-        upgradeLink: latestMonitoringLink,
-      });
+      nextRows.push(toRow(current.monitoring, latestMonitoringVersion, latestMonitoringLink));
     }
 
     return nextRows;
@@ -84,14 +75,14 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 
     const issues: string[] = [];
 
-    if (current.primary.status === "unavailable") {
+    if (current.primary?.health === "unavailable") {
       issues.push("primary Error instance unavailable");
     }
 
-    issues.push(...current.remotes.filter((remote) => remote.status === "degraded").map((remote) => `degraded ${formatInstanceType(remote.instanceType)}`));
-    issues.push(...current.remotes.filter((remote) => remote.status === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.instanceType)}`));
+    issues.push(...current.remotes.filter((remote) => remote.health === "degraded").map((remote) => `degraded ${formatInstanceType(remote.kind)}`));
+    issues.push(...current.remotes.filter((remote) => remote.health === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.kind)}`));
 
-    if (current.mode === "single-region" && current.monitoring?.configured && current.monitoring.status === "unavailable") {
+    if (current.mode === "single-region" && current.monitoring?.configured && current.monitoring.health === "unavailable") {
       issues.push("unavailable Monitoring instance");
     }
 
@@ -124,35 +115,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   async function refresh() {
     await platformModelStore.refresh();
 
-    payload.value = {
-      mode: platformModelStore.model?.mode ?? "single-region",
-      primary: {
-        name: platformModelStore.primary?.name ?? "Particular.ServiceControl",
-        instanceType: "error",
-        role: toPlatformHealthRole(platformModelStore.primary?.role),
-        version: platformModelStore.primary?.version ?? "Unknown",
-        status: platformModelStore.primary?.health ?? "unavailable",
-        ingestErrorMessages: platformModelStore.primary?.ingestErrorMessages,
-      },
-      remotes: platformModelStore.remotes.map((instance) => ({
-        name: instance.name,
-        instanceType: instance.kind === "error" ? "error" : "audit",
-        role: instance.role === "remote-error" ? "remote-error" : "remote-audit",
-        version: instance.version,
-        status: instance.health,
-        ingestErrorMessages: instance.ingestErrorMessages,
-      })),
-      monitoring: platformModelStore.monitoring
-        ? {
-            configured: platformModelStore.monitoring.configured,
-            name: platformModelStore.monitoring.name,
-            instanceType: "monitoring",
-            version: platformModelStore.monitoring.version,
-            status: platformModelStore.monitoring.health,
-          }
-        : null,
-      warnings: platformModelStore.warnings,
-    };
+    payload.value = platformModelStore.model;
   }
 
   return {
@@ -165,7 +128,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     rows,
     latestServiceControlVersion: computed(() => {
       const current = payload.value;
-      if (!current) {
+      if (!current || current.primary === null) {
         return "";
       }
 
@@ -176,12 +139,12 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   };
 });
 
-function toRow(instance: PlatformHealthResponse["primary"], latestVersion: string, upgradeLink: string): PlatformHealthRow {
+function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string): PlatformHealthRow {
   return {
     type: formatRowType(instance),
     instanceName: instance.name,
     version: instance.version,
-    health: instance.status,
+    health: instance.health,
     note: formatRole(instance.role),
     upgradeAvailable: hasUpgrade(instance.version, latestVersion),
     latestVersion,
@@ -189,11 +152,15 @@ function toRow(instance: PlatformHealthResponse["primary"], latestVersion: strin
   };
 }
 
-function formatRowType(instance: PlatformHealthResponse["primary"]) {
-  if (instance.instanceType === "audit") {
+function formatRowType(instance: PlatformInstance) {
+  if (instance.kind === "audit") {
     return "Audit instance";
   }
 
+  if (instance.kind === "monitoring") {
+    return "Monitoring instance";
+  }
+
   if (instance.role === "cross-region-primary") {
     return "Error instance";
   }
@@ -201,7 +168,7 @@ function formatRowType(instance: PlatformHealthResponse["primary"]) {
   return "Error instance";
 }
 
-function formatRole(role: PlatformHealthResponse["primary"]["role"]) {
+function formatRole(role: PlatformInstance["role"]) {
   switch (role) {
     case "primary-error":
       return "Primary error processing instance";
@@ -211,21 +178,26 @@ function formatRole(role: PlatformHealthResponse["primary"]["role"]) {
       return "Audit instance";
     case "remote-error":
       return "Regional error instance";
+    case "monitoring":
+      return "Monitoring instance";
   }
 }
 
-function formatInstanceType(instanceType: PlatformHealthResponse["primary"]["instanceType"]) {
-  return instanceType === "audit" ? "Audit instance" : "Error instance";
+function formatInstanceType(instanceType: PlatformInstance["kind"]) {
+  switch (instanceType) {
+    case "audit":
+      return "Audit instance";
+    case "monitoring":
+      return "Monitoring instance";
+    default:
+      return "Error instance";
+  }
 }
 
 function hasUpgrade(currentVersion: string, latestVersion: string) {
   return !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
 }
 
-function hasMonitoringUpgrade(currentVersion: string, latestVersion: string) {
-  return !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
-}
-
 function buildReleaseLink(version: string) {
   return version ? `${serviceControlReleaseBaseUrl}${version}` : "";
 }
@@ -234,14 +206,6 @@ function firstKnownVersion(...versions: Array<string | null | undefined>) {
   return versions.find((version) => version && version !== "Unknown") ?? "";
 }
 
-function toPlatformHealthRole(role: PlatformInstanceRole | undefined): PlatformHealthResponse["primary"]["role"] {
-  if (role === "cross-region-primary") {
-    return role;
-  }
-
-  return "primary-error";
-}
-
 if (import.meta.hot) {
   import.meta.hot.accept(acceptHMRUpdate(usePlatformHealthStore, import.meta.hot));
 }
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index ad6b00f85d..e919e0c5cc 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -106,7 +106,6 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
       version: "Unknown",
       health: "unavailable",
       configured: true,
-      ingestErrorMessages: mode !== "multi-region",
     };
   }
 
@@ -119,7 +118,6 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
     health: primaryRoot.platform_health_status ?? "healthy",
     configured: true,
     sourceUrl: serviceControlClient.url,
-    ingestErrorMessages: mode !== "multi-region",
   };
 }
 
@@ -137,7 +135,6 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
       health: remote.platform_health_status ?? (remote.status === "online" ? "healthy" : "unavailable"),
       configured: true,
       sourceUrl: remote.api_uri,
-      ingestErrorMessages: isError ? true : undefined,
     };
   });
 }
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 14c6539885..251ba9b6c1 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -5,6 +5,7 @@ import { beforeEach, vi } from "vitest";
 import PlatformHealthView from "@/views/PlatformHealthView.vue";
 import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
+import type { PlatformHealthResponse } from "@/resources/PlatformHealth";
 
 const downloadFileFromString = vi.fn();
 
@@ -34,17 +35,18 @@ describe("PlatformHealthView", () => {
     store.payload = {
       mode: "single-region",
       primary: {
+        id: "primary",
         name: "Particular.ServiceControl",
-        instanceType: "error",
+        kind: "error",
         role: "primary-error",
         version: "6.19.3",
-        status: "healthy",
-        ingestErrorMessages: true,
+        health: "healthy",
+        configured: true,
       },
       remotes: [],
       monitoring: null,
       warnings: [],
-    };
+    } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
       global: {
@@ -71,25 +73,28 @@ describe("PlatformHealthView", () => {
     store.payload = {
       mode: "single-region",
       primary: {
+        id: "primary",
         name: "Particular.ServiceControl",
-        instanceType: "error",
+        kind: "error",
         role: "primary-error",
         version: "6.19.3",
-        status: "healthy",
-        ingestErrorMessages: true,
+        health: "healthy",
+        configured: true,
       },
       remotes: [
         {
+          id: "remote-0",
           name: "Particular.ServiceControl.Audit",
-          instanceType: "audit",
+          kind: "audit",
           role: "remote-audit",
           version: "6.18.0",
-          status: "healthy",
+          health: "healthy",
+          configured: true,
         },
       ],
       monitoring: null,
       warnings: [],
-    };
+    } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
       global: {
@@ -106,32 +111,36 @@ describe("PlatformHealthView", () => {
     store.payload = {
       mode: "multi-region",
       primary: {
+        id: "primary",
         name: "Particular.ServiceControl.CrossRegion",
-        instanceType: "error",
+        kind: "error",
         role: "cross-region-primary",
         version: "6.19.3",
-        status: "healthy",
-        ingestErrorMessages: false,
+        health: "healthy",
+        configured: true,
       },
       remotes: [
         {
+          id: "remote-0",
           name: "Particular.ServiceControl.RegionA",
-          instanceType: "error",
+          kind: "error",
           role: "remote-error",
           version: "6.19.3",
-          status: "healthy",
-          ingestErrorMessages: true,
+          health: "healthy",
+          configured: true,
         },
       ],
       monitoring: {
-        configured: true,
+        id: "monitoring",
         name: "Particular.ServiceControl.Monitoring",
-        instanceType: "monitoring",
+        kind: "monitoring",
+        role: "monitoring",
         version: "6.19.3",
-        status: "healthy",
+        health: "healthy",
+        configured: true,
       },
       warnings: [],
-    };
+    } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
       global: {
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 0a0041e7d6..bcaed6f610 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -23,7 +23,7 @@ function openSupportModal() {
 }
 
 function getUpgradeTargetVersion(row: (typeof store.rows)[number]) {
-  return row.latestVersion || store.payload?.primary.version || "";
+  return row.latestVersion || store.payload?.primary?.version || "";
 }
 
 function getUpgradeTargetLink(row: (typeof store.rows)[number]) {

From ad0672a32b318accf5dbbbbe09a4499600c1baac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 18:25:42 +0200
Subject: [PATCH 09/67] Simplify platform model usage

---
 .../capabilities/MonitoringCapability.ts          | 15 ++++++---------
 src/Frontend/src/resources/PlatformModel.ts       |  3 +--
 .../src/stores/PlatformHealthStore.spec.ts        |  7 -------
 src/Frontend/src/stores/PlatformHealthStore.ts    | 14 +++++++-------
 src/Frontend/src/stores/PlatformModelStore.ts     |  6 +-----
 src/Frontend/src/views/PlatformHealthView.spec.ts |  6 ------
 src/Frontend/src/views/PlatformHealthView.vue     |  2 +-
 7 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index e67b3a7e1f..96b6a8dbfa 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -40,22 +40,19 @@ enum MonitoringIndicatorTooltip {
 export function useMonitoringCapability(): CapabilityComposable {
   const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
 
-  // this tells us if monitoring is configured in ServicePulse
-  const isMonitoringEnabled = monitoringClient.isMonitoringEnabled;
-
   // this tells us if there are any endpoints sending data
   // Uses auto-refresh to periodically check for monitored endpoints (every 5 seconds)
   const { store: platformCapabilitiesStore } = usePlatformCapabilitiesRefresh();
   const { hasMonitoredEndpoints } = storeToRefs(platformCapabilitiesStore);
   const platformModelStore = usePlatformModelStore();
+  const hasMonitoringInstance = computed(() => platformModelStore.monitoring !== null);
 
   // Determine overall monitoring status
   const monitoringStatus = computed(() => {
-    const isConfiguredInServicePulse = isMonitoringEnabled;
     const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
 
-    // 1. Check if monitoring is configured in ServicePulse
-    if (!isConfiguredInServicePulse) {
+    // 1. Check if a monitoring instance exists in the shared platform model
+    if (!hasMonitoringInstance.value) {
       return CapabilityStatus.InstanceNotConfigured;
     }
 
@@ -88,11 +85,11 @@ export function useMonitoringCapability(): CapabilityComposable {
 
     // Instance specific states
     const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
-    const instanceAvailable = isMonitoringEnabled && connectionSuccessful;
+    const instanceAvailable = hasMonitoringInstance.value && connectionSuccessful;
 
-    const instanceTooltip = instanceAvailable ? MonitoringIndicatorTooltip.InstanceAvailable : !isMonitoringEnabled ? MonitoringIndicatorTooltip.InstanceNotConfigured : MonitoringIndicatorTooltip.InstanceUnavailable;
+    const instanceTooltip = instanceAvailable ? MonitoringIndicatorTooltip.InstanceAvailable : !hasMonitoringInstance.value ? MonitoringIndicatorTooltip.InstanceNotConfigured : MonitoringIndicatorTooltip.InstanceUnavailable;
 
-    if (isMonitoringEnabled) {
+    if (hasMonitoringInstance.value) {
       indicators.push(
         createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, platformModelStore.monitoring?.sourceUrl ?? monitoringClient.url, platformModelStore.monitoring?.version)
       );
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 6b404c2a44..3847d82cdf 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -10,13 +10,12 @@ export interface PlatformInstance {
   role: PlatformInstanceRole;
   version: string;
   health: PlatformInstanceHealth;
-  configured: boolean;
   sourceUrl?: string;
 }
 
 export interface PlatformModel {
   mode: PlatformTopologyMode;
-  primary: PlatformInstance | null;
+  primary: PlatformInstance;
   remotes: PlatformInstance[];
   monitoring: PlatformInstance | null;
   warnings: string[];
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index a488da2853..2932951845 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -100,7 +100,6 @@ const singleRegionWarningModel: PlatformModel = {
     role: "primary-error",
     version: "6.19.3",
     health: "healthy",
-    configured: true,
   },
   remotes: [
     {
@@ -110,7 +109,6 @@ const singleRegionWarningModel: PlatformModel = {
       role: "remote-audit",
       version: "6.18.0",
       health: "healthy",
-      configured: true,
     },
     {
       id: "remote-1",
@@ -119,7 +117,6 @@ const singleRegionWarningModel: PlatformModel = {
       role: "remote-audit",
       version: "6.17.0",
       health: "degraded",
-      configured: true,
     },
   ],
   monitoring: {
@@ -129,7 +126,6 @@ const singleRegionWarningModel: PlatformModel = {
     role: "monitoring",
     version: "6.19.3",
     health: "healthy",
-    configured: true,
   },
   warnings: [],
 };
@@ -143,7 +139,6 @@ const multiRegionDangerModel: PlatformModel = {
     role: "cross-region-primary",
     version: "6.19.3",
     health: "healthy",
-    configured: true,
   },
   remotes: [
     {
@@ -153,7 +148,6 @@ const multiRegionDangerModel: PlatformModel = {
       role: "remote-error",
       version: "6.19.3",
       health: "healthy",
-      configured: true,
     },
     {
       id: "remote-1",
@@ -162,7 +156,6 @@ const multiRegionDangerModel: PlatformModel = {
       role: "remote-error",
       version: "6.19.3",
       health: "unavailable",
-      configured: true,
     },
   ],
   monitoring: null,
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 39a7bed2f5..6bae27df83 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -22,7 +22,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "none";
     }
 
-    if (current.primary?.health === "unavailable") {
+    if (current.primary.health === "unavailable") {
       return "danger";
     }
 
@@ -30,7 +30,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "danger";
     }
 
-    if (current.monitoring?.configured && current.monitoring.health === "unavailable") {
+    if (current.monitoring?.health === "unavailable") {
       return "danger";
     }
 
@@ -49,7 +49,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 
   const rows = computed<PlatformHealthRow[]>(() => {
     const current = payload.value;
-    if (!current || current.primary === null) {
+    if (!current) {
       return [];
     }
 
@@ -60,7 +60,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 
     const nextRows: PlatformHealthRow[] = [toRow(current.primary, latestServiceControlVersion, latestServiceControlLink), ...current.remotes.map((remote) => toRow(remote, latestServiceControlVersion, latestServiceControlLink))];
 
-    if (current.monitoring?.configured) {
+    if (current.monitoring) {
       nextRows.push(toRow(current.monitoring, latestMonitoringVersion, latestMonitoringLink));
     }
 
@@ -75,14 +75,14 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 
     const issues: string[] = [];
 
-    if (current.primary?.health === "unavailable") {
+    if (current.primary.health === "unavailable") {
       issues.push("primary Error instance unavailable");
     }
 
     issues.push(...current.remotes.filter((remote) => remote.health === "degraded").map((remote) => `degraded ${formatInstanceType(remote.kind)}`));
     issues.push(...current.remotes.filter((remote) => remote.health === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.kind)}`));
 
-    if (current.mode === "single-region" && current.monitoring?.configured && current.monitoring.health === "unavailable") {
+    if (current.mode === "single-region" && current.monitoring?.health === "unavailable") {
       issues.push("unavailable Monitoring instance");
     }
 
@@ -128,7 +128,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     rows,
     latestServiceControlVersion: computed(() => {
       const current = payload.value;
-      if (!current || current.primary === null) {
+      if (!current) {
         return "";
       }
 
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index e919e0c5cc..da6a3317a1 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -96,7 +96,7 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 }
 
-function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformTopologyMode): PlatformInstance | null {
+function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformTopologyMode): PlatformInstance {
   if (!primaryRoot) {
     return {
       id: "primary",
@@ -105,7 +105,6 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
       role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
       version: "Unknown",
       health: "unavailable",
-      configured: true,
     };
   }
 
@@ -116,7 +115,6 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
     role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
     version: primaryRoot.platform_health_version ?? "Unknown",
     health: primaryRoot.platform_health_status ?? "healthy",
-    configured: true,
     sourceUrl: serviceControlClient.url,
   };
 }
@@ -133,7 +131,6 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
       role: isError ? "remote-error" : "remote-audit",
       version: remote.version,
       health: remote.platform_health_status ?? (remote.status === "online" ? "healthy" : "unavailable"),
-      configured: true,
       sourceUrl: remote.api_uri,
     };
   });
@@ -151,7 +148,6 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance
     role: "monitoring",
     version: monitoringRoot?.platform_health_version ?? "Unknown",
     health: monitoringRoot?.platform_health_status ?? "healthy",
-    configured: true,
     sourceUrl: monitoringClient.url,
   };
 }
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 251ba9b6c1..bcaf3e8498 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -41,7 +41,6 @@ describe("PlatformHealthView", () => {
         role: "primary-error",
         version: "6.19.3",
         health: "healthy",
-        configured: true,
       },
       remotes: [],
       monitoring: null,
@@ -79,7 +78,6 @@ describe("PlatformHealthView", () => {
         role: "primary-error",
         version: "6.19.3",
         health: "healthy",
-        configured: true,
       },
       remotes: [
         {
@@ -89,7 +87,6 @@ describe("PlatformHealthView", () => {
           role: "remote-audit",
           version: "6.18.0",
           health: "healthy",
-          configured: true,
         },
       ],
       monitoring: null,
@@ -117,7 +114,6 @@ describe("PlatformHealthView", () => {
         role: "cross-region-primary",
         version: "6.19.3",
         health: "healthy",
-        configured: true,
       },
       remotes: [
         {
@@ -127,7 +123,6 @@ describe("PlatformHealthView", () => {
           role: "remote-error",
           version: "6.19.3",
           health: "healthy",
-          configured: true,
         },
       ],
       monitoring: {
@@ -137,7 +132,6 @@ describe("PlatformHealthView", () => {
         role: "monitoring",
         version: "6.19.3",
         health: "healthy",
-        configured: true,
       },
       warnings: [],
     } satisfies PlatformHealthResponse;
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index bcaed6f610..0a0041e7d6 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -23,7 +23,7 @@ function openSupportModal() {
 }
 
 function getUpgradeTargetVersion(row: (typeof store.rows)[number]) {
-  return row.latestVersion || store.payload?.primary?.version || "";
+  return row.latestVersion || store.payload?.primary.version || "";
 }
 
 function getUpgradeTargetLink(row: (typeof store.rows)[number]) {

From 6d9768b1fd090c42c9cf22dd44b9d7655ef09cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 18:40:34 +0200
Subject: [PATCH 10/67] Remove explicit topology mode

---
 src/Frontend/src/resources/PlatformModel.ts   |  4 +--
 src/Frontend/src/resources/RootUrls.ts        |  1 -
 .../src/stores/PlatformHealthStore.spec.ts    |  4 +--
 .../src/stores/PlatformHealthStore.ts         | 12 +++------
 .../src/stores/PlatformModelStore.spec.ts     |  2 +-
 src/Frontend/src/stores/PlatformModelStore.ts | 27 +++++--------------
 .../src/views/PlatformHealthView.spec.ts      |  5 +---
 .../test/mocks/platform-health-state.ts       |  1 -
 8 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 3847d82cdf..323782d215 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -1,6 +1,5 @@
-export type PlatformTopologyMode = "single-region" | "multi-region";
 export type PlatformInstanceKind = "error" | "audit" | "monitoring";
-export type PlatformInstanceRole = "primary-error" | "cross-region-primary" | "remote-error" | "remote-audit" | "monitoring";
+export type PlatformInstanceRole = "primary-error" | "remote-error" | "remote-audit" | "monitoring";
 export type PlatformInstanceHealth = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformInstance {
@@ -14,7 +13,6 @@ export interface PlatformInstance {
 }
 
 export interface PlatformModel {
-  mode: PlatformTopologyMode;
   primary: PlatformInstance;
   remotes: PlatformInstance[];
   monitoring: PlatformInstance | null;
diff --git a/src/Frontend/src/resources/RootUrls.ts b/src/Frontend/src/resources/RootUrls.ts
index 822d7d83fb..2a7329af72 100644
--- a/src/Frontend/src/resources/RootUrls.ts
+++ b/src/Frontend/src/resources/RootUrls.ts
@@ -21,7 +21,6 @@ export default interface RootUrls {
   mypermissions_summary?: string;
   my_routes_url?: string;
   platform_health_status?: "healthy" | "degraded" | "unavailable";
-  platform_health_mode?: "single-region" | "multi-region";
   platform_health_warnings?: string[];
   platform_health_version?: string;
 }
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 2932951845..58aacf8728 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -92,7 +92,6 @@ describe("PlatformHealthStore", () => {
 });
 
 const singleRegionWarningModel: PlatformModel = {
-  mode: "single-region",
   primary: {
     id: "primary",
     name: "Particular.ServiceControl",
@@ -131,12 +130,11 @@ const singleRegionWarningModel: PlatformModel = {
 };
 
 const multiRegionDangerModel: PlatformModel = {
-  mode: "multi-region",
   primary: {
     id: "primary",
     name: "Particular.ServiceControl.CrossRegion",
     kind: "error",
-    role: "cross-region-primary",
+    role: "primary-error",
     version: "6.19.3",
     health: "healthy",
   },
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 6bae27df83..7a0b630df5 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -14,7 +14,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
   const platformModelStore = usePlatformModelStore();
 
-  const isMultiRegion = computed(() => payload.value?.mode === "multi-region");
+  const isMultiRegion = computed(() => payload.value?.remotes.some((remote) => remote.role === "remote-error") ?? false);
 
   const severity = computed<PlatformHealthSeverity>(() => {
     const current = payload.value;
@@ -26,7 +26,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "danger";
     }
 
-    if (current.mode === "multi-region" && current.remotes.some((remote) => remote.kind === "error" && remote.health !== "healthy")) {
+    if (current.remotes.some((remote) => remote.role === "remote-error" && remote.health !== "healthy")) {
       return "danger";
     }
 
@@ -82,7 +82,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     issues.push(...current.remotes.filter((remote) => remote.health === "degraded").map((remote) => `degraded ${formatInstanceType(remote.kind)}`));
     issues.push(...current.remotes.filter((remote) => remote.health === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.kind)}`));
 
-    if (current.mode === "single-region" && current.monitoring?.health === "unavailable") {
+    if (!isMultiRegion.value && current.monitoring?.health === "unavailable") {
       issues.push("unavailable Monitoring instance");
     }
 
@@ -161,10 +161,6 @@ function formatRowType(instance: PlatformInstance) {
     return "Monitoring instance";
   }
 
-  if (instance.role === "cross-region-primary") {
-    return "Error instance";
-  }
-
   return "Error instance";
 }
 
@@ -172,8 +168,6 @@ function formatRole(role: PlatformInstance["role"]) {
   switch (role) {
     case "primary-error":
       return "Primary error processing instance";
-    case "cross-region-primary":
-      return "Connected cross-region primary";
     case "remote-audit":
       return "Audit instance";
     case "remote-error":
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index e1238286ec..e8075f3113 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -37,7 +37,6 @@ describe("PlatformModelStore", () => {
         { headers: new Headers() },
         {
           name: "Particular.ServiceControl.CrossRegion",
-          platform_health_mode: "multi-region",
           platform_health_status: "healthy",
           platform_health_version: "6.19.3",
           platform_health_warnings: [],
@@ -65,6 +64,7 @@ describe("PlatformModelStore", () => {
     expect(store.isMultiRegion).toBe(true);
     expect(store.monitoring).not.toBeNull();
     expect(store.monitoring?.role).toBe("monitoring");
+    expect(store.primary?.role).toBe("primary-error");
     expect(store.errorInstances).toHaveLength(1);
   });
 });
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index da6a3317a1..83c4a00dc5 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -5,12 +5,11 @@ import monitoringClient from "@/components/monitoring/monitoringClient";
 import { authFetch } from "@/composables/useAuthenticatedFetch";
 import type RootUrls from "@/resources/RootUrls";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
-import type { PlatformInstance, PlatformInstanceHealth, PlatformModel, PlatformTopologyMode } from "@/resources/PlatformModel";
+import type { PlatformInstance, PlatformInstanceHealth, PlatformModel } from "@/resources/PlatformModel";
 
 interface ServiceControlRoot {
   name?: string;
   platform_health_status?: PlatformInstanceHealth;
-  platform_health_mode?: PlatformTopologyMode;
   platform_health_warnings?: string[];
   platform_health_version?: string;
 }
@@ -30,16 +29,14 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const monitoring = computed(() => model.value?.monitoring ?? null);
   const auditInstances = computed(() => remotes.value.filter((instance) => instance.kind === "audit"));
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
-  const isMultiRegion = computed(() => model.value?.mode === "multi-region");
+  const isMultiRegion = computed(() => model.value?.remotes.some((instance) => instance.role === "remote-error") ?? false);
   const warnings = computed(() => model.value?.warnings ?? []);
 
   async function refresh() {
     const [primaryRoot, remotesResponse, monitoringResponse] = await Promise.all([getPrimaryRoot(), getRemotes(), getMonitoringRoot()]);
-    const mode = detectMode(primaryRoot, remotesResponse);
 
     model.value = {
-      mode,
-      primary: mapPrimary(primaryRoot, mode),
+      primary: mapPrimary(primaryRoot),
       remotes: mapRemotes(remotesResponse),
       monitoring: mapMonitoring(monitoringResponse),
       warnings: primaryRoot?.platform_health_warnings ?? readDevWarnings(),
@@ -96,13 +93,13 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 }
 
-function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: PlatformTopologyMode): PlatformInstance {
+function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformInstance {
   if (!primaryRoot) {
     return {
       id: "primary",
       name: "Particular.ServiceControl",
       kind: "error",
-      role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
+      role: "primary-error",
       version: "Unknown",
       health: "unavailable",
     };
@@ -112,7 +109,7 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null, mode: Platfo
     id: "primary",
     name: primaryRoot.name || "Particular.ServiceControl",
     kind: "error",
-    role: mode === "multi-region" ? "cross-region-primary" : "primary-error",
+    role: "primary-error",
     version: primaryRoot.platform_health_version ?? "Unknown",
     health: primaryRoot.platform_health_status ?? "healthy",
     sourceUrl: serviceControlClient.url,
@@ -152,18 +149,6 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance
   };
 }
 
-function detectMode(primaryRoot: ServiceControlRootDocument | null, remotes: RemoteInstance[]): PlatformTopologyMode {
-  if (primaryRoot?.platform_health_mode) {
-    return primaryRoot.platform_health_mode;
-  }
-
-  const primaryName = primaryRoot?.name?.toLowerCase() ?? "";
-  const hasCrossRegionName = primaryName.includes("crossregion") || primaryName.includes("cross-region");
-  const hasRemoteErrors = remotes.some((remote) => remote.configuration?.data_retention?.error_retention_period !== undefined);
-
-  return hasCrossRegionName || hasRemoteErrors ? "multi-region" : "single-region";
-}
-
 function extractInstanceName(apiUri: string) {
   try {
     const uri = new URL(apiUri);
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index bcaf3e8498..f6a12b2208 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -33,7 +33,6 @@ describe("PlatformHealthView", () => {
   test("requires the configuration download before enabling the support link", async () => {
     const store = usePlatformHealthStore();
     store.payload = {
-      mode: "single-region",
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -70,7 +69,6 @@ describe("PlatformHealthView", () => {
   test("shows an inline upgrade cue for an outdated instance version", () => {
     const store = usePlatformHealthStore();
     store.payload = {
-      mode: "single-region",
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -106,12 +104,11 @@ describe("PlatformHealthView", () => {
   test("renders monitoring when present even in multi-region", () => {
     const store = usePlatformHealthStore();
     store.payload = {
-      mode: "multi-region",
       primary: {
         id: "primary",
         name: "Particular.ServiceControl.CrossRegion",
         kind: "error",
-        role: "cross-region-primary",
+        role: "primary-error",
         version: "6.19.3",
         health: "healthy",
       },
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 729a45614a..174097d994 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -93,7 +93,6 @@ export function getPlatformHealthPrimaryRoot(): RootUrls {
     archived_groups_url: "http://localhost:33333/api/errors/groups/{classifier?}",
     get_archive_group: "http://localhost:33333/api/archive/groups/id/{groupId}",
     platform_health_status: current.primary.status,
-    platform_health_mode: current.scenario.startsWith("multi-region") ? "multi-region" : "single-region",
     platform_health_warnings: current.warnings,
     platform_health_version: current.primary.version,
   } as RootUrls;

From 223cba69080050bc3074ab64d9f0cb24ad244647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 18:44:20 +0200
Subject: [PATCH 11/67] Wording

---
 src/Frontend/src/stores/PlatformHealthStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 7a0b630df5..c0a7991e35 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -167,7 +167,7 @@ function formatRowType(instance: PlatformInstance) {
 function formatRole(role: PlatformInstance["role"]) {
   switch (role) {
     case "primary-error":
-      return "Primary error processing instance";
+      return "Primary error instance";
     case "remote-audit":
       return "Audit instance";
     case "remote-error":

From c860af0f4b316c938c9cd5d31ba975b328d9dd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 18:52:40 +0200
Subject: [PATCH 12/67] Rename platform instance url field

---
 .../capabilities/AuditingCapability.ts                     | 2 +-
 .../platformcapabilities/capabilities/ErrorCapability.ts   | 2 +-
 .../capabilities/MonitoringCapability.ts                   | 4 +---
 src/Frontend/src/resources/PlatformModel.ts                | 2 +-
 src/Frontend/src/stores/PlatformHealthStore.spec.ts        | 7 +++++++
 src/Frontend/src/stores/PlatformModelStore.ts              | 7 ++++---
 src/Frontend/src/views/PlatformHealthView.spec.ts          | 6 ++++++
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
index cf6a4a9e9a..3729a85415 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
@@ -102,7 +102,7 @@ export function useAuditingCapability(): CapabilityComposable {
   const platformModelStore = usePlatformModelStore();
   const auditInstances = computed(() =>
     platformModelStore.auditInstances.map((instance) => ({
-      api_uri: instance.sourceUrl ?? instance.name,
+      api_uri: instance.apiUrl,
       version: instance.version,
       status: instance.health === "healthy" ? RemoteInstanceStatus.Online : RemoteInstanceStatus.Unavailable,
       cachedInstanceType: RemoteInstanceType.Audit,
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index 724f8e0639..7890a2ca40 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -53,7 +53,7 @@ export function useErrorCapability(): CapabilityComposable {
     const indicators: StatusIndicator[] = [];
 
     const tooltip = isConnected.value ? ErrorIndicatorTooltip.InstanceAvailable : ErrorIndicatorTooltip.InstanceUnavailable;
-    indicators.push(createIndicator("Instance", isConnected.value ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, platformModelStore.primary?.sourceUrl, platformModelStore.primary?.version));
+    indicators.push(createIndicator("Instance", isConnected.value ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, platformModelStore.primary?.apiUrl, platformModelStore.primary?.version));
 
     return indicators;
   });
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index 96b6a8dbfa..7d729683d2 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -90,9 +90,7 @@ export function useMonitoringCapability(): CapabilityComposable {
     const instanceTooltip = instanceAvailable ? MonitoringIndicatorTooltip.InstanceAvailable : !hasMonitoringInstance.value ? MonitoringIndicatorTooltip.InstanceNotConfigured : MonitoringIndicatorTooltip.InstanceUnavailable;
 
     if (hasMonitoringInstance.value) {
-      indicators.push(
-        createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, platformModelStore.monitoring?.sourceUrl ?? monitoringClient.url, platformModelStore.monitoring?.version)
-      );
+      indicators.push(createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, platformModelStore.monitoring?.apiUrl ?? monitoringClient.url, platformModelStore.monitoring?.version));
     }
 
     // data available indicator - only show if instance is connected
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 323782d215..b17cbe12a8 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -9,7 +9,7 @@ export interface PlatformInstance {
   role: PlatformInstanceRole;
   version: string;
   health: PlatformInstanceHealth;
-  sourceUrl?: string;
+  apiUrl: string;
 }
 
 export interface PlatformModel {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 58aacf8728..177ad2613f 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -99,6 +99,7 @@ const singleRegionWarningModel: PlatformModel = {
     role: "primary-error",
     version: "6.19.3",
     health: "healthy",
+    apiUrl: "http://localhost:33333/api/",
   },
   remotes: [
     {
@@ -108,6 +109,7 @@ const singleRegionWarningModel: PlatformModel = {
       role: "remote-audit",
       version: "6.18.0",
       health: "healthy",
+      apiUrl: "http://Particular.ServiceControl.Audit/api/",
     },
     {
       id: "remote-1",
@@ -116,6 +118,7 @@ const singleRegionWarningModel: PlatformModel = {
       role: "remote-audit",
       version: "6.17.0",
       health: "degraded",
+      apiUrl: "http://Particular.ServiceControl.Audit-Blue/api/",
     },
   ],
   monitoring: {
@@ -125,6 +128,7 @@ const singleRegionWarningModel: PlatformModel = {
     role: "monitoring",
     version: "6.19.3",
     health: "healthy",
+    apiUrl: "http://localhost:33633/",
   },
   warnings: [],
 };
@@ -137,6 +141,7 @@ const multiRegionDangerModel: PlatformModel = {
     role: "primary-error",
     version: "6.19.3",
     health: "healthy",
+    apiUrl: "http://localhost:33333/api/",
   },
   remotes: [
     {
@@ -146,6 +151,7 @@ const multiRegionDangerModel: PlatformModel = {
       role: "remote-error",
       version: "6.19.3",
       health: "healthy",
+      apiUrl: "http://Particular.ServiceControl.RegionA/api/",
     },
     {
       id: "remote-1",
@@ -154,6 +160,7 @@ const multiRegionDangerModel: PlatformModel = {
       role: "remote-error",
       version: "6.19.3",
       health: "unavailable",
+      apiUrl: "http://Particular.ServiceControl.RegionB/api/",
     },
   ],
   monitoring: null,
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 83c4a00dc5..e224ff4b63 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -102,6 +102,7 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformIns
       role: "primary-error",
       version: "Unknown",
       health: "unavailable",
+      apiUrl: serviceControlClient.url ?? "",
     };
   }
 
@@ -112,7 +113,7 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformIns
     role: "primary-error",
     version: primaryRoot.platform_health_version ?? "Unknown",
     health: primaryRoot.platform_health_status ?? "healthy",
-    sourceUrl: serviceControlClient.url,
+    apiUrl: serviceControlClient.url ?? "",
   };
 }
 
@@ -128,7 +129,7 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
       role: isError ? "remote-error" : "remote-audit",
       version: remote.version,
       health: remote.platform_health_status ?? (remote.status === "online" ? "healthy" : "unavailable"),
-      sourceUrl: remote.api_uri,
+      apiUrl: remote.api_uri,
     };
   });
 }
@@ -145,7 +146,7 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance
     role: "monitoring",
     version: monitoringRoot?.platform_health_version ?? "Unknown",
     health: monitoringRoot?.platform_health_status ?? "healthy",
-    sourceUrl: monitoringClient.url,
+    apiUrl: monitoringClient.url ?? "",
   };
 }
 
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index f6a12b2208..f5a22409d2 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -40,6 +40,7 @@ describe("PlatformHealthView", () => {
         role: "primary-error",
         version: "6.19.3",
         health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
       },
       remotes: [],
       monitoring: null,
@@ -76,6 +77,7 @@ describe("PlatformHealthView", () => {
         role: "primary-error",
         version: "6.19.3",
         health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
       },
       remotes: [
         {
@@ -85,6 +87,7 @@ describe("PlatformHealthView", () => {
           role: "remote-audit",
           version: "6.18.0",
           health: "healthy",
+          apiUrl: "http://Particular.ServiceControl.Audit/api/",
         },
       ],
       monitoring: null,
@@ -111,6 +114,7 @@ describe("PlatformHealthView", () => {
         role: "primary-error",
         version: "6.19.3",
         health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
       },
       remotes: [
         {
@@ -120,6 +124,7 @@ describe("PlatformHealthView", () => {
           role: "remote-error",
           version: "6.19.3",
           health: "healthy",
+          apiUrl: "http://Particular.ServiceControl.RegionA/api/",
         },
       ],
       monitoring: {
@@ -129,6 +134,7 @@ describe("PlatformHealthView", () => {
         role: "monitoring",
         version: "6.19.3",
         health: "healthy",
+        apiUrl: "http://localhost:33633/",
       },
       warnings: [],
     } satisfies PlatformHealthResponse;

From edfe8fafeef2fda36de6aaa7668c847658dbbcb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 19:00:58 +0200
Subject: [PATCH 13/67] Show not configured capability badges

---
 .../platformcapabilities/CapabilityCard.vue     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue b/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
index 62c78ea718..bd0aecbb0a 100644
--- a/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
+++ b/src/Frontend/src/components/platformcapabilities/CapabilityCard.vue
@@ -75,18 +75,20 @@ function handleButtonClick() {
           </div>
         </div>
         <div class="title-row-actions">
-          <RouterLink
-            v-if="props.status !== CapabilityStatus.EndpointsNotConfigured && props.status !== CapabilityStatus.InstanceNotConfigured"
-            :to="routeLinks.platformHealth"
+          <component
+            :is="props.status === CapabilityStatus.EndpointsNotConfigured || props.status === CapabilityStatus.InstanceNotConfigured ? 'span' : RouterLink"
+            v-if="!props.isLoading"
+            :to="props.status === CapabilityStatus.EndpointsNotConfigured || props.status === CapabilityStatus.InstanceNotConfigured ? undefined : routeLinks.platformHealth"
             class="status-badge"
             :class="{
               'status-available': props.status === CapabilityStatus.Available,
               'status-unavailable': props.status === CapabilityStatus.Unavailable,
               'status-partially-unavailable': props.status === CapabilityStatus.PartiallyUnavailable,
+              'status-not-configured': props.status === CapabilityStatus.EndpointsNotConfigured || props.status === CapabilityStatus.InstanceNotConfigured,
             }"
           >
-            {{ props.status }}
-          </RouterLink>
+            {{ props.status === CapabilityStatus.EndpointsNotConfigured || props.status === CapabilityStatus.InstanceNotConfigured ? "Not configured" : props.status }}
+          </component>
           <button v-if="allowDismiss" class="hide-card-btn" @click="emit('hide')" v-tippy="'Hide this card'">
             <FAIcon :icon="faTimes" />
           </button>
@@ -264,6 +266,11 @@ function handleButtonClick() {
   color: #856404;
 }
 
+.status-not-configured {
+  background-color: #e9ecef;
+  color: #495057;
+}
+
 .capability-footer {
   display: flex;
   justify-content: space-between;

From ce5a39c6957722329185a5eed982718a596ce89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 19:04:50 +0200
Subject: [PATCH 14/67] Cleanup

---
 .../src/stores/PlatformHealthStore.spec.ts    | 28 +++++++++++++++++--
 .../src/stores/PlatformHealthStore.ts         |  5 +---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 177ad2613f..f6f415ea32 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -29,7 +29,6 @@ describe("PlatformHealthStore", () => {
 
     await store.refresh();
 
-    expect(store.isMultiRegion).toBe(false);
     expect(store.severity).toBe("warning");
     expect(store.rows).toHaveLength(4);
     expect(store.outdatedOnly).toBe(false);
@@ -51,13 +50,38 @@ describe("PlatformHealthStore", () => {
 
     await store.refresh();
 
-    expect(store.isMultiRegion).toBe(true);
     expect(store.severity).toBe("danger");
     expect(store.rows).toHaveLength(3);
     expect(store.rows.every((row) => row.type === "Error instance" || row.type === "Monitoring instance")).toBe(true);
     expect(store.issueSummary).toContain("unavailable Error instance");
   });
 
+  test("includes monitoring unavailability in the issue summary whenever monitoring is configured", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...multiRegionDangerModel,
+        monitoring: {
+          id: "monitoring",
+          name: "Particular.ServiceControl.Monitoring",
+          kind: "monitoring",
+          role: "monitoring",
+          version: "6.19.3",
+          health: "unavailable",
+          apiUrl: "http://localhost:33633/",
+        },
+      };
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.severity).toBe("danger");
+    expect(store.issueSummary).toContain("unavailable Error instance");
+    expect(store.issueSummary).toContain("unavailable Monitoring instance");
+  });
+
   test("uses dev mock state as a latest-version fallback for upgrade cues", async () => {
     const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
     environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber = "";
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index c0a7991e35..a913a61a85 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -14,8 +14,6 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
   const platformModelStore = usePlatformModelStore();
 
-  const isMultiRegion = computed(() => payload.value?.remotes.some((remote) => remote.role === "remote-error") ?? false);
-
   const severity = computed<PlatformHealthSeverity>(() => {
     const current = payload.value;
     if (!current) {
@@ -82,7 +80,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     issues.push(...current.remotes.filter((remote) => remote.health === "degraded").map((remote) => `degraded ${formatInstanceType(remote.kind)}`));
     issues.push(...current.remotes.filter((remote) => remote.health === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.kind)}`));
 
-    if (!isMultiRegion.value && current.monitoring?.health === "unavailable") {
+    if (current.monitoring?.health === "unavailable") {
       issues.push("unavailable Monitoring instance");
     }
 
@@ -123,7 +121,6 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     refresh,
     severity,
     outdatedOnly,
-    isMultiRegion,
     issueSummary,
     rows,
     latestServiceControlVersion: computed(() => {

From f5abe5a106b8268896a721102af7622725f6b0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 19:10:55 +0200
Subject: [PATCH 15/67] Remove instance capability widgets

---
 .../PlatformCapabilitiesDashboardItem.spec.ts | 93 +++++++++++++++++++
 .../capabilities/AuditingCapability.ts        | 13 ---
 .../capabilities/ErrorCapability.ts           | 20 +---
 .../capabilities/MonitoringCapability.ts      | 11 ---
 4 files changed, 95 insertions(+), 42 deletions(-)
 create mode 100644 src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.spec.ts

diff --git a/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.spec.ts b/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.spec.ts
new file mode 100644
index 0000000000..9ef84f18fe
--- /dev/null
+++ b/src/Frontend/src/components/platformcapabilities/PlatformCapabilitiesDashboardItem.spec.ts
@@ -0,0 +1,93 @@
+import { describe, expect, render, screen, test } from "@component-test-utils";
+import { createTestingPinia } from "@pinia/testing";
+import { setActivePinia } from "pinia";
+import { createRouter, createMemoryHistory } from "vue-router";
+import { vi } from "vitest";
+import PlatformCapabilitiesDashboardItem from "@/components/platformcapabilities/PlatformCapabilitiesDashboardItem.vue";
+
+vi.mock("@/composables/usePlatformModelAutoRefresh", () => ({
+  default: () => ({
+    store: {
+      refresh: vi.fn(),
+    },
+  }),
+}));
+
+vi.mock("@/composables/useConnectionsAndStatsAutoRefresh", () => ({
+  default: () => ({
+    store: {
+      monitoringConnectionState: {
+        unableToConnect: false,
+      },
+    },
+  }),
+}));
+
+vi.mock("@/composables/usePlatformCapabilitiesRefresh", () => ({
+  default: () => ({
+    store: {
+      hasSuccessfulMessages: true,
+      hasMonitoredEndpoints: true,
+    },
+  }),
+}));
+
+vi.mock("@/components/platformcapabilities/capabilities/AuditingCapability", () => ({
+  useAuditingCapability: () => ({
+    status: { value: "Available" },
+    description: { value: "All ServiceControl Audit instances are available." },
+    indicators: { value: [{ label: "Messages", status: "Available", tooltip: "Endpoints have been configured to send audit messages" }] },
+    isLoading: { value: false },
+    helpButtonText: { value: "View Messages" },
+    helpButtonUrl: { value: "/messages" },
+  }),
+}));
+
+vi.mock("@/components/platformcapabilities/capabilities/MonitoringCapability", () => ({
+  useMonitoringCapability: () => ({
+    status: { value: "Available" },
+    description: { value: "The ServiceControl Monitoring instance is available and endpoints have been configured to send throughput data." },
+    indicators: { value: [{ label: "Metrics", status: "Available", tooltip: "Endpoints have been configured to send throughput data" }] },
+    isLoading: { value: false },
+    helpButtonText: { value: "View Metrics" },
+    helpButtonUrl: { value: "/monitoring" },
+  }),
+}));
+
+vi.mock("@/components/platformcapabilities/capabilities/ErrorCapability", () => ({
+  useErrorCapability: () => ({
+    status: { value: "Available" },
+    description: { value: "The ServiceControl instance is available." },
+    indicators: { value: [] },
+    isLoading: { value: false },
+    helpButtonText: { value: "View Failed Messages" },
+    helpButtonUrl: { value: "/failed-messages" },
+  }),
+}));
+
+describe("PlatformCapabilitiesDashboardItem", () => {
+  test("does not render per-instance widgets on capability cards", () => {
+    setActivePinia(createTestingPinia({ stubActions: false }));
+    const router = createRouter({
+      history: createMemoryHistory(),
+      routes: [
+        { path: "/", component: { template: "<div />" } },
+        { path: "/platform-health", component: { template: "<div />" } },
+        { path: "/messages", component: { template: "<div />" } },
+        { path: "/monitoring", component: { template: "<div />" } },
+        { path: "/failed-messages", component: { template: "<div />" } },
+      ],
+    });
+
+    render(PlatformCapabilitiesDashboardItem, {
+      global: {
+        plugins: [router],
+      },
+    });
+
+    expect(screen.getByText("Messages")).toBeInTheDocument();
+    expect(screen.getByText("Metrics")).toBeInTheDocument();
+    expect(screen.queryByText("Instance")).not.toBeInTheDocument();
+    expect(screen.queryByText("Instance 1")).not.toBeInTheDocument();
+  });
+});
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
index 3729a85415..066353dc26 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
@@ -50,8 +50,6 @@ const AuditingHelpButtonUrl: CapabilityStatusToStringMap = {
 };
 
 enum AuditingIndicatorTooltip {
-  InstanceAvailable = "The Audit instance is configured and available",
-  InstanceUnavailable = "The Audit instance is configured but not responding",
   MessagesAvailable = "Endpoints have been configured to send audit messages",
   MessagesUnavailable = "No successful messages have been processed yet or auditing is not enabled for any endpoints",
   AllMessagesNotSupported = `The 'All Messages' feature requires ServiceControl ${minimumSCVersionForAllMessages} or higher`,
@@ -151,17 +149,6 @@ export function useAuditingCapability(): CapabilityComposable {
   const auditIndicators = computed(() => {
     const indicators: StatusIndicator[] = [];
 
-    // Add an indicator for each remote audit instance
-    if (auditInstances.value.length > 0) {
-      auditInstances.value.forEach((instance, index) => {
-        const isAvailable = instance.status === RemoteInstanceStatus.Online;
-        const label = auditInstances.value.length > 1 ? `Instance ${index + 1}` : "Instance";
-        const tooltip = isAvailable ? AuditingIndicatorTooltip.InstanceAvailable : AuditingIndicatorTooltip.InstanceUnavailable;
-
-        indicators.push(createIndicator(label, isAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, instance.api_uri, instance.version));
-      });
-    }
-
     // Messages available indicator - show if at least one instance is available
     if (hasAvailableAuditInstances(auditInstances.value)) {
       const messagesAvailable = isAllMessagesSupported.value && hasSuccessfulMessages.value;
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index 7890a2ca40..aae283aa52 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -1,5 +1,4 @@
 import { computed } from "vue";
-import type { StatusIndicator } from "@/components/platformcapabilities/types";
 import { CapabilityStatus } from "@/components/platformcapabilities/constants";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
 import routeLinks from "@/router/routeLinks";
@@ -19,13 +18,8 @@ const ErrorHelpButtonUrl: CapabilityStatusToStringMap = {
   [CapabilityStatus.Available]: routeLinks.failedMessage.root,
 };
 
-enum ErrorIndicatorTooltip {
-  InstanceAvailable = "The ServiceControl instance is configured and available",
-  InstanceUnavailable = "The ServiceControl instance is not responding",
-}
-
 export function useErrorCapability(): CapabilityComposable {
-  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
+  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus } = useCapabilityBase();
   const platformModelStore = usePlatformModelStore();
 
   // Check if instance is connected
@@ -48,23 +42,13 @@ export function useErrorCapability(): CapabilityComposable {
   // Determine help button URL based on status
   const errorHelpButtonUrl = computed(() => getHelpButtonUrlForStatus(errorStatus.value, ErrorHelpButtonUrl));
 
-  // Determine indicators
-  const errorIndicators = computed(() => {
-    const indicators: StatusIndicator[] = [];
-
-    const tooltip = isConnected.value ? ErrorIndicatorTooltip.InstanceAvailable : ErrorIndicatorTooltip.InstanceUnavailable;
-    indicators.push(createIndicator("Instance", isConnected.value ? CapabilityStatus.Available : CapabilityStatus.Unavailable, tooltip, platformModelStore.primary?.apiUrl, platformModelStore.primary?.version));
-
-    return indicators;
-  });
-
   // Loading state - error is loading if we haven't attempted connection yet
   const isLoading = computed(() => platformModelStore.model === null);
 
   return {
     status: errorStatus,
     description: errorDescription,
-    indicators: errorIndicators,
+    indicators: computed(() => []),
     isLoading,
     helpButtonText: errorHelpButtonText,
     helpButtonUrl: errorHelpButtonUrl,
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index 7d729683d2..d86ec38ef0 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -3,7 +3,6 @@ import type { StatusIndicator } from "@/components/platformcapabilities/types";
 import { CapabilityStatus } from "@/components/platformcapabilities/constants";
 import { storeToRefs } from "pinia";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
-import monitoringClient from "@/components/monitoring/monitoringClient";
 import usePlatformCapabilitiesRefresh from "@/composables/usePlatformCapabilitiesRefresh";
 import routeLinks from "@/router/routeLinks";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
@@ -30,9 +29,6 @@ const MonitoringHelpButtonUrl: CapabilityStatusToStringMap = {
 };
 
 enum MonitoringIndicatorTooltip {
-  InstanceAvailable = "The Monitoring instance is configured and available",
-  InstanceUnavailable = "The Monitoring instance is configured but not responding",
-  InstanceNotConfigured = "Monitoring is not configured in ServicePulse",
   DataAvailable = "Endpoints have been configured to send throughput data",
   DataUnavailable = "No endpoints are sending throughput data. Endpoints may not be running or may not have the monitoring plugin enabled.",
 }
@@ -83,16 +79,9 @@ export function useMonitoringCapability(): CapabilityComposable {
   const monitoringIndicators = computed(() => {
     const indicators: StatusIndicator[] = [];
 
-    // Instance specific states
     const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
     const instanceAvailable = hasMonitoringInstance.value && connectionSuccessful;
 
-    const instanceTooltip = instanceAvailable ? MonitoringIndicatorTooltip.InstanceAvailable : !hasMonitoringInstance.value ? MonitoringIndicatorTooltip.InstanceNotConfigured : MonitoringIndicatorTooltip.InstanceUnavailable;
-
-    if (hasMonitoringInstance.value) {
-      indicators.push(createIndicator("Instance", instanceAvailable ? CapabilityStatus.Available : CapabilityStatus.Unavailable, instanceTooltip, platformModelStore.monitoring?.apiUrl ?? monitoringClient.url, platformModelStore.monitoring?.version));
-    }
-
     // data available indicator - only show if instance is connected
     if (instanceAvailable) {
       indicators.push(

From f329b31750459a9b732596f552ca212275f87cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 19:28:39 +0200
Subject: [PATCH 16/67] Fix platform health tooltip

---
 src/Frontend/src/components/FAIcon.vue        |  3 +-
 .../PlatformHealthMenuItem.spec.ts            | 85 ++++++++++++++++---
 .../platformhealth/PlatformHealthMenuItem.vue | 26 +++++-
 3 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/src/Frontend/src/components/FAIcon.vue b/src/Frontend/src/components/FAIcon.vue
index 9660ecbe41..7caac12d24 100644
--- a/src/Frontend/src/components/FAIcon.vue
+++ b/src/Frontend/src/components/FAIcon.vue
@@ -13,5 +13,6 @@ withDefaults(
 </script>
 
 <template>
-  <FontAwesomeIcon :icon="icon" :size="size" v-tippy="title" />
+  <FontAwesomeIcon v-if="title" :icon="icon" :size="size" v-tippy="title" />
+  <FontAwesomeIcon v-else :icon="icon" :size="size" />
 </template>
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
index 5e32c87786..9545960ad7 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
@@ -3,26 +3,87 @@ import { render, screen } from "@component-test-utils";
 import { RouterLinkStub } from "@vue/test-utils";
 import PlatformHealthMenuItem from "@/components/platformhealth/PlatformHealthMenuItem.vue";
 
+const store = vi.hoisted(() => ({
+  severity: "none" as "danger" | "warning" | "none",
+  outdatedOnly: false,
+}));
+
 vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
   default: () => ({
-    store: {
-      severity: "none",
-      outdatedOnly: true,
-    },
+    store,
   }),
 }));
 
 describe("PlatformHealthMenuItem", () => {
-  test("shows a white info exclamation when instances are only outdated", () => {
-    const { container } = render(PlatformHealthMenuItem, {
-      global: {
-        stubs: {
-          RouterLink: RouterLinkStub,
-        },
-      },
-    });
+  test("shows a no-issues tooltip when there are no warnings", () => {
+    store.severity = "none";
+    store.outdatedOnly = false;
+
+    renderMenuItem();
+
+    const tooltipTarget = document.querySelector(".tooltip-target");
+
+    expect(tooltipTarget).toHaveAttribute("title", "");
+    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: No issues detected.");
+  });
+
+  test("shows a white info exclamation and outdated tooltip when instances are only outdated", () => {
+    store.severity = "none";
+    store.outdatedOnly = true;
+
+    const { container } = renderMenuItem();
 
     expect(screen.getByText(/Platform health/i)).toBeInTheDocument();
+    const tooltipTarget = document.querySelector(".tooltip-target");
+
+    expect(tooltipTarget).toHaveAttribute("title", "");
+    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: Update available. One or more platform instances are out of date.");
     expect(container.querySelector(".info")).not.toBeNull();
   });
+
+  test("shows a warning tooltip when platform warnings are present", () => {
+    store.severity = "warning";
+    store.outdatedOnly = false;
+
+    const { container } = renderMenuItem();
+
+    const tooltipTarget = document.querySelector(".tooltip-target");
+
+    expect(tooltipTarget).toHaveAttribute("title", "");
+    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: Attention needed. One or more platform instances are degraded or platform warnings are present.");
+    expect(container.querySelector(".warning")).not.toBeNull();
+  });
+
+  test("shows a danger tooltip when platform instances are unavailable", () => {
+    store.severity = "danger";
+    store.outdatedOnly = true;
+
+    const { container } = renderMenuItem();
+
+    const tooltipTarget = document.querySelector(".tooltip-target");
+
+    expect(tooltipTarget).toHaveAttribute("title", "");
+    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: Action required. One or more platform instances are unavailable.");
+    expect(container.querySelector(".danger")).not.toBeNull();
+  });
 });
+
+function renderMenuItem() {
+  return render(PlatformHealthMenuItem, {
+    global: {
+      directives: {
+        tippy: {
+          mounted(el, binding) {
+            el.setAttribute("data-tooltip", String(binding.value));
+          },
+          updated(el, binding) {
+            el.setAttribute("data-tooltip", String(binding.value));
+          },
+        },
+      },
+      stubs: {
+        RouterLink: RouterLinkStub,
+      },
+    },
+  });
+}
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
index 3d69468d4d..9587e73a44 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
@@ -25,17 +25,39 @@ const warningLevel = computed(() => {
 
   return WarningLevel.None;
 });
+
+const tooltip = computed(() => {
+  if (store.severity === "danger") {
+    return "Platform health: Action required. One or more platform instances are unavailable.";
+  }
+
+  if (store.severity === "warning") {
+    return "Platform health: Attention needed. One or more platform instances are degraded or platform warnings are present.";
+  }
+
+  if (store.outdatedOnly) {
+    return "Platform health: Update available. One or more platform instances are out of date.";
+  }
+
+  return "Platform health: No issues detected.";
+});
 </script>
 
 <template>
   <RouterLink :to="routeLinks.platformHealth">
-    <FAIcon :icon="faServer" title="Platform health" />
+    <FAIcon :icon="faServer" />
     <span class="navbar-label">Platform health</span>
-    <ExclamationMark :type="warningLevel" v-if="warningLevel !== WarningLevel.None" />
+    <span title="" class="tooltip-target" v-tippy="tooltip">
+      <ExclamationMark :type="warningLevel" v-if="warningLevel !== WarningLevel.None" />
+    </span>
   </RouterLink>
 </template>
 
 <style scoped>
 @import "@/assets/navbar.css";
 @import "@/assets/header-menu-item.css";
+
+.tooltip-target {
+  display: inline-flex;
+}
 </style>

From 5941d9f444f6b705d2a97d62b1c4d20db4889bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Fri, 28 Aug 2026 19:31:53 +0200
Subject: [PATCH 17/67] Link platform health instances

---
 src/Frontend/src/resources/PlatformHealth.ts  |  1 +
 .../src/stores/PlatformHealthStore.ts         |  1 +
 .../src/views/PlatformHealthView.spec.ts      | 37 +++++++++++++++++++
 src/Frontend/src/views/PlatformHealthView.vue | 12 +++++-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
index e350f43a79..2a539c733c 100644
--- a/src/Frontend/src/resources/PlatformHealth.ts
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -7,6 +7,7 @@ export type PlatformHealthResponse = PlatformModel;
 export interface PlatformHealthRow {
   type: string;
   instanceName: string;
+  apiUrl: string;
   version: string;
   health: PlatformInstanceHealth;
   note: string;
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index a913a61a85..9d55180b0f 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -140,6 +140,7 @@ function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: s
   return {
     type: formatRowType(instance),
     instanceName: instance.name,
+    apiUrl: instance.apiUrl,
     version: instance.version,
     health: instance.health,
     note: formatRole(instance.role),
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index f5a22409d2..c55735dcad 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -104,6 +104,43 @@ describe("PlatformHealthView", () => {
     expect(screen.getByText(/v6.19.3 available/i)).toBeInTheDocument();
   });
 
+  test("links each instance name to the instance api url", () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [
+        {
+          id: "remote-0",
+          name: "Particular.ServiceControl.Audit",
+          kind: "audit",
+          role: "remote-audit",
+          version: "6.19.3",
+          health: "healthy",
+          apiUrl: "http://localhost:33334/api/",
+        },
+      ],
+      monitoring: null,
+      warnings: [],
+    } satisfies PlatformHealthResponse;
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.getByRole("link", { name: "Particular.ServiceControl" })).toHaveAttribute("href", "http://localhost:33333/api/");
+    expect(screen.getByRole("link", { name: "Particular.ServiceControl.Audit" })).toHaveAttribute("href", "http://localhost:33334/api/");
+  });
+
   test("renders monitoring when present even in multi-region", () => {
     const store = usePlatformHealthStore();
     store.payload = {
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 0a0041e7d6..b35b807e80 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -74,7 +74,7 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
                 <tr v-for="row in store.rows" :key="`${row.type}-${row.instanceName}`">
                   <td class="type-cell">{{ row.type }}</td>
                   <td>
-                    <div class="instance-name">{{ row.instanceName }}</div>
+                    <a class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.instanceName }}</a>
                     <div class="instance-note">{{ row.note }}</div>
                   </td>
                   <td>
@@ -173,6 +173,16 @@ tbody tr:last-child td {
   font-weight: 700;
 }
 
+.instance-name {
+  color: var(--sp-blue);
+  text-decoration: none;
+}
+
+.instance-name:hover {
+  color: #007f98;
+  text-decoration: underline;
+}
+
 .type-cell {
   width: 180px;
 }

From 7cfb1b3b997c9c0a1f5e1f62fec025878670b952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 07:46:05 +0200
Subject: [PATCH 18/67] Use platform model client methods

---
 .../components/monitoring/monitoringClient.ts | 14 +++++
 .../src/components/serviceControlClient.ts    | 14 +++++
 .../src/stores/PlatformModelStore.spec.ts     | 58 ++++++++-----------
 src/Frontend/src/stores/PlatformModelStore.ts | 34 ++---------
 4 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/src/Frontend/src/components/monitoring/monitoringClient.ts b/src/Frontend/src/components/monitoring/monitoringClient.ts
index 144c00e0f4..5197a564b6 100644
--- a/src/Frontend/src/components/monitoring/monitoringClient.ts
+++ b/src/Frontend/src/components/monitoring/monitoringClient.ts
@@ -8,6 +8,11 @@ export interface MetricsConnectionDetails {
   Interval?: string;
 }
 
+export interface MonitoringRoot {
+  platform_health_status?: "healthy" | "degraded" | "unavailable";
+  platform_health_version?: string;
+}
+
 class MonitoringClient {
   private _url: string | undefined | null = null;
 
@@ -36,6 +41,15 @@ class MonitoringClient {
     }
   }
 
+  public async getMonitoringRoot() {
+    if (this.isMonitoringDisabled) {
+      return null;
+    }
+
+    const [, root] = await this.fetchTypedFromMonitoring<MonitoringRoot>("");
+    return root ?? null;
+  }
+
   public async getMonitoringVersion() {
     try {
       const [response] = await this.fetchTypedFromMonitoring("");
diff --git a/src/Frontend/src/components/serviceControlClient.ts b/src/Frontend/src/components/serviceControlClient.ts
index 323bf08eaf..da0ab6d667 100644
--- a/src/Frontend/src/components/serviceControlClient.ts
+++ b/src/Frontend/src/components/serviceControlClient.ts
@@ -1,4 +1,6 @@
 import { authFetch } from "@/composables/useAuthenticatedFetch";
+import type RootUrls from "@/resources/RootUrls";
+import type { RemoteInstance } from "@/resources/RemoteInstance";
 import { HttpError } from "@/utils/HttpError";
 
 export interface ServiceControlInstanceConnection {
@@ -6,6 +8,8 @@ export interface ServiceControlInstanceConnection {
   errors: string[];
 }
 
+export type ServiceControlRootDocument = RootUrls;
+
 class ServiceControlClient {
   private _url: string | undefined = undefined;
 
@@ -29,6 +33,16 @@ class ServiceControlClient {
     }
   }
 
+  public async getRoot() {
+    const [, data] = await this.fetchTypedFromServiceControl<ServiceControlRootDocument>("");
+    return data;
+  }
+
+  public async getRemoteInstances() {
+    const [, data] = await this.fetchTypedFromServiceControl<RemoteInstance[]>("configuration/remotes");
+    return data;
+  }
+
   public fetchTypedFromServiceControl<T>(suffix: string, signal?: AbortSignal): Promise<[Response, T]> {
     return this.fetchTypedFromUrl<T>(`${this.url}${suffix}`, signal);
   }
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index e8075f3113..591e86069a 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -2,13 +2,15 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { createPinia, setActivePinia } from "pinia";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
-const fetchTypedFromServiceControl = vi.fn();
-const authFetch = vi.fn();
+const getRoot = vi.fn();
+const getRemoteInstances = vi.fn();
+const getMonitoringRoot = vi.fn();
 
 vi.mock("@/components/serviceControlClient", () => ({
   default: {
     url: "http://localhost:33333/api/",
-    fetchTypedFromServiceControl: (...args: unknown[]) => fetchTypedFromServiceControl(...args),
+    getRoot: () => getRoot(),
+    getRemoteInstances: (...args: unknown[]) => getRemoteInstances(...args),
   },
 }));
 
@@ -16,47 +18,35 @@ vi.mock("@/components/monitoring/monitoringClient", () => ({
   default: {
     url: "http://localhost:33633/",
     isMonitoringEnabled: true,
+    getMonitoringRoot: (...args: unknown[]) => getMonitoringRoot(...args),
   },
 }));
 
-vi.mock("@/composables/useAuthenticatedFetch", () => ({
-  authFetch: (...args: unknown[]) => authFetch(...args),
-}));
-
 describe("PlatformModelStore", () => {
   beforeEach(() => {
     setActivePinia(createPinia());
-    fetchTypedFromServiceControl.mockReset();
-    authFetch.mockReset();
+    getRoot.mockReset();
+    getRemoteInstances.mockReset();
+    getMonitoringRoot.mockReset();
     window.__platformHealth = undefined;
   });
 
   test("keeps monitoring in the shared model for multi-region", async () => {
-    fetchTypedFromServiceControl
-      .mockResolvedValueOnce([
-        { headers: new Headers() },
-        {
-          name: "Particular.ServiceControl.CrossRegion",
-          platform_health_status: "healthy",
-          platform_health_version: "6.19.3",
-          platform_health_warnings: [],
-        },
-      ])
-      .mockResolvedValueOnce([
-        { headers: new Headers() },
-        [
-          {
-            api_uri: "http://Particular.ServiceControl.RegionA/api/",
-            version: "6.19.3",
-            status: "online",
-            configuration: { data_retention: { error_retention_period: "14.00:00:00" } },
-          },
-        ],
-      ]);
-    authFetch.mockResolvedValue({
-      ok: true,
-      json: () => Promise.resolve({ platform_health_status: "healthy", platform_health_version: "6.19.3" }),
-    } as Response);
+    getRoot.mockResolvedValue({
+      name: "Particular.ServiceControl.CrossRegion",
+      platform_health_status: "healthy",
+      platform_health_version: "6.19.3",
+      platform_health_warnings: [],
+    });
+    getRemoteInstances.mockResolvedValue([
+      {
+        api_uri: "http://Particular.ServiceControl.RegionA/api/",
+        version: "6.19.3",
+        status: "online",
+        configuration: { data_retention: { error_retention_period: "14.00:00:00" } },
+      },
+    ]);
+    getMonitoringRoot.mockResolvedValue({ platform_health_status: "healthy", platform_health_version: "6.19.3" });
 
     const store = usePlatformModelStore();
     await store.refresh();
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index e224ff4b63..18244e607e 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -1,25 +1,9 @@
 import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed, ref } from "vue";
-import serviceControlClient from "@/components/serviceControlClient";
-import monitoringClient from "@/components/monitoring/monitoringClient";
-import { authFetch } from "@/composables/useAuthenticatedFetch";
-import type RootUrls from "@/resources/RootUrls";
+import serviceControlClient, { type ServiceControlRootDocument } from "@/components/serviceControlClient";
+import monitoringClient, { type MonitoringRoot } from "@/components/monitoring/monitoringClient";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
-import type { PlatformInstance, PlatformInstanceHealth, PlatformModel } from "@/resources/PlatformModel";
-
-interface ServiceControlRoot {
-  name?: string;
-  platform_health_status?: PlatformInstanceHealth;
-  platform_health_warnings?: string[];
-  platform_health_version?: string;
-}
-
-type ServiceControlRootDocument = RootUrls & ServiceControlRoot;
-
-interface MonitoringRoot {
-  platform_health_status?: PlatformInstanceHealth;
-  platform_health_version?: string;
-}
+import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
 
 export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const model = ref<PlatformModel | null>(null);
@@ -58,8 +42,7 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
 
 async function getPrimaryRoot(): Promise<ServiceControlRootDocument | null> {
   try {
-    const [, data] = await serviceControlClient.fetchTypedFromServiceControl<ServiceControlRootDocument>("");
-    return data;
+    return await serviceControlClient.getRoot();
   } catch {
     return null;
   }
@@ -67,8 +50,7 @@ async function getPrimaryRoot(): Promise<ServiceControlRootDocument | null> {
 
 async function getRemotes(): Promise<RemoteInstance[]> {
   try {
-    const [, data] = await serviceControlClient.fetchTypedFromServiceControl<RemoteInstance[]>("configuration/remotes");
-    return data;
+    return await serviceControlClient.getRemoteInstances();
   } catch {
     return [];
   }
@@ -80,11 +62,7 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 
   try {
-    const response = await authFetch(`${monitoringClient.url ?? ""}`);
-    if (!response.ok) {
-      throw new Error("Monitoring unavailable");
-    }
-    return (await response.json()) as MonitoringRoot;
+    return await monitoringClient.getMonitoringRoot();
   } catch {
     return {
       platform_health_status: "unavailable",

From 480a5b5f52bfb4b560e45128a7317cf5599e516a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 07:50:14 +0200
Subject: [PATCH 19/67] Fix platform capability tests

---
 .../auth-session-storage.spec.ts              |  2 +-
 .../audit-capability-card.spec.ts             | 20 ++++++++-----------
 .../monitoring-capability-card.spec.ts        |  8 ++++----
 .../recoverability-capability-card.spec.ts    | 12 ++++-------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/Frontend/test/specs/authentication/auth-session-storage.spec.ts b/src/Frontend/test/specs/authentication/auth-session-storage.spec.ts
index 232c66ab23..a2b0b89e16 100644
--- a/src/Frontend/test/specs/authentication/auth-session-storage.spec.ts
+++ b/src/Frontend/test/specs/authentication/auth-session-storage.spec.ts
@@ -26,7 +26,7 @@ describe("FEATURE: Session Storage Behavior", () => {
       expect(sessionToken).toBe(defaultMockUser.access_token);
 
       // Verify token is NOT in localStorage (would be shared across tabs)
-      const localToken = localStorage.getItem("auth_token");
+      const localToken = globalThis.localStorage?.getItem("auth_token") ?? null;
       expect(localToken).toBeNull();
     });
   });
diff --git a/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
index 47f5b7b836..27ae23caed 100644
--- a/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/audit-capability-card.spec.ts
@@ -184,8 +184,8 @@ describe("FEATURE: Audit capability card", () => {
     });
   });
 
-  describe("RULE: Status indicators should show instance and message status", () => {
-    test("EXAMPLE: Available audit instance shows instance indicator as green", async ({ driver }) => {
+  describe("RULE: Status indicators should show capability-specific status", () => {
+    test("EXAMPLE: Available audit instance with successful messages shows messages indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasAvailableAuditInstance());
@@ -206,8 +206,8 @@ describe("FEATURE: Audit capability card", () => {
         expect(indicators!.length).toBeGreaterThanOrEqual(1);
       });
 
-      const instanceIndicator = await auditingIndicatorByLabel("Instance");
-      expect(instanceIndicator).toBeInTheDocument();
+      const messagesIndicator = await auditingIndicatorByLabel("Messages");
+      expect(messagesIndicator).toBeInTheDocument();
     });
 
     test("EXAMPLE: Available audit instance with successful messages shows messages indicator", async ({ driver }) => {
@@ -231,7 +231,7 @@ describe("FEATURE: Audit capability card", () => {
       });
     });
 
-    test("EXAMPLE: Multiple audit instances show numbered instance indicators", async ({ driver }) => {
+    test("EXAMPLE: Multiple audit instances still show only the shared messages indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasMultipleAvailableAuditInstances);
@@ -249,15 +249,11 @@ describe("FEATURE: Audit capability card", () => {
       await waitFor(async () => {
         const indicators = await auditingStatusIndicators();
         expect(indicators).not.toBeNull();
-        // Should have Instance 1, Instance 2, and Messages indicators
-        expect(indicators!.length).toBeGreaterThanOrEqual(3);
+        expect(indicators!.length).toBe(1);
       });
 
-      const instance1Indicator = await auditingIndicatorByLabel("Instance 1");
-      expect(instance1Indicator).toBeInTheDocument();
-
-      const instance2Indicator = await auditingIndicatorByLabel("Instance 2");
-      expect(instance2Indicator).toBeInTheDocument();
+      const messagesIndicator = await auditingIndicatorByLabel("Messages");
+      expect(messagesIndicator).toBeInTheDocument();
     });
   });
 
diff --git a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
index 344db61a89..a746a07a61 100644
--- a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
@@ -154,8 +154,8 @@ describe("FEATURE: Monitoring capability card", () => {
     });
   });
 
-  describe("RULE: Status indicators should show instance and metrics status", () => {
-    test("EXAMPLE: Available monitoring instance shows instance indicator", async ({ driver }) => {
+  describe("RULE: Status indicators should show capability-specific status", () => {
+    test("EXAMPLE: Available monitoring instance with endpoints shows metrics indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasMonitoringWithEndpoints());
@@ -175,8 +175,8 @@ describe("FEATURE: Monitoring capability card", () => {
         expect(indicators!.length).toBeGreaterThanOrEqual(1);
       });
 
-      const instanceIndicator = await monitoringIndicatorByLabel("Instance");
-      expect(instanceIndicator).toBeInTheDocument();
+      const metricsIndicator = await monitoringIndicatorByLabel("Metrics");
+      expect(metricsIndicator).toBeInTheDocument();
     });
 
     test("EXAMPLE: Available monitoring instance with endpoints shows metrics indicator", async ({ driver }) => {
diff --git a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
index 45fac5270a..ddd504f183 100644
--- a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
@@ -2,7 +2,7 @@ import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
 import { waitFor } from "@testing-library/vue";
-import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, recoverabilityStatusIndicators, isRecoverabilityCardAvailable, recoverabilityIndicatorByLabel } from "./questions/recoverabilityCapabilityCard";
+import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, recoverabilityStatusIndicators, isRecoverabilityCardAvailable } from "./questions/recoverabilityCapabilityCard";
 
 // NOTE: The Recoverability card has two states: Available and Unavailable.
 // However, the Unavailable state cannot be tested because when ServiceControl
@@ -38,8 +38,8 @@ describe("FEATURE: Recoverability capability card", () => {
     });
   });
 
-  describe("RULE: Status indicators should show instance status", () => {
-    test("EXAMPLE: Shows 'Instance' indicator", async ({ driver }) => {
+  describe("RULE: Recoverability card no longer duplicates instance-level widgets", () => {
+    test("EXAMPLE: Shows no status indicators", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
 
@@ -54,12 +54,8 @@ describe("FEATURE: Recoverability capability card", () => {
 
       await waitFor(async () => {
         const indicators = await recoverabilityStatusIndicators();
-        expect(indicators).not.toBeNull();
-        expect(indicators!.length).toBeGreaterThanOrEqual(1);
+        expect(indicators).toHaveLength(0);
       });
-
-      const instanceIndicator = await recoverabilityIndicatorByLabel("Instance");
-      expect(instanceIndicator).toBeInTheDocument();
     });
   });
 });

From 9ee59ee6e59b6ec60407e6169620476c01f3901d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 07:58:09 +0200
Subject: [PATCH 20/67] Simplify platform health model

---
 .../PlatformHealthMenuItem.spec.ts            |  6 ++--
 .../platformhealth/PlatformHealthMenuItem.vue |  2 +-
 .../src/components/serviceControlClient.ts    |  5 ++-
 src/Frontend/src/resources/PlatformModel.ts   |  1 -
 src/Frontend/src/resources/RootUrls.ts        |  1 -
 .../src/stores/PlatformHealthStore.spec.ts    |  5 ---
 .../src/stores/PlatformHealthStore.ts         |  6 ----
 .../src/stores/PlatformModelStore.spec.ts     | 18 +++++++++-
 src/Frontend/src/stores/PlatformModelStore.ts | 13 ++-----
 .../src/views/PlatformHealthView.spec.ts      |  4 ---
 src/Frontend/src/views/PlatformHealthView.vue |  7 ----
 .../test/mocks/platform-health-state.ts       | 36 +------------------
 12 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
index 9545960ad7..6360604c39 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.spec.ts
@@ -15,7 +15,7 @@ vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
 }));
 
 describe("PlatformHealthMenuItem", () => {
-  test("shows a no-issues tooltip when there are no warnings", () => {
+  test("shows a no-issues tooltip when there are no issues", () => {
     store.severity = "none";
     store.outdatedOnly = false;
 
@@ -41,7 +41,7 @@ describe("PlatformHealthMenuItem", () => {
     expect(container.querySelector(".info")).not.toBeNull();
   });
 
-  test("shows a warning tooltip when platform warnings are present", () => {
+  test("shows a warning tooltip when instances are degraded", () => {
     store.severity = "warning";
     store.outdatedOnly = false;
 
@@ -50,7 +50,7 @@ describe("PlatformHealthMenuItem", () => {
     const tooltipTarget = document.querySelector(".tooltip-target");
 
     expect(tooltipTarget).toHaveAttribute("title", "");
-    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: Attention needed. One or more platform instances are degraded or platform warnings are present.");
+    expect(tooltipTarget).toHaveAttribute("data-tooltip", "Platform health: Attention needed. One or more platform instances are degraded.");
     expect(container.querySelector(".warning")).not.toBeNull();
   });
 
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
index 9587e73a44..b86337a3dc 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue
@@ -32,7 +32,7 @@ const tooltip = computed(() => {
   }
 
   if (store.severity === "warning") {
-    return "Platform health: Attention needed. One or more platform instances are degraded or platform warnings are present.";
+    return "Platform health: Attention needed. One or more platform instances are degraded.";
   }
 
   if (store.outdatedOnly) {
diff --git a/src/Frontend/src/components/serviceControlClient.ts b/src/Frontend/src/components/serviceControlClient.ts
index da0ab6d667..2f7c3dc972 100644
--- a/src/Frontend/src/components/serviceControlClient.ts
+++ b/src/Frontend/src/components/serviceControlClient.ts
@@ -8,7 +8,10 @@ export interface ServiceControlInstanceConnection {
   errors: string[];
 }
 
-export type ServiceControlRootDocument = RootUrls;
+export type ServiceControlRootDocument = RootUrls & {
+  platform_health_status: "healthy" | "degraded" | "unavailable";
+  platform_health_version: string;
+};
 
 class ServiceControlClient {
   private _url: string | undefined = undefined;
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index b17cbe12a8..be49bfe291 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -16,5 +16,4 @@ export interface PlatformModel {
   primary: PlatformInstance;
   remotes: PlatformInstance[];
   monitoring: PlatformInstance | null;
-  warnings: string[];
 }
diff --git a/src/Frontend/src/resources/RootUrls.ts b/src/Frontend/src/resources/RootUrls.ts
index 2a7329af72..3a179f8542 100644
--- a/src/Frontend/src/resources/RootUrls.ts
+++ b/src/Frontend/src/resources/RootUrls.ts
@@ -21,6 +21,5 @@ export default interface RootUrls {
   mypermissions_summary?: string;
   my_routes_url?: string;
   platform_health_status?: "healthy" | "degraded" | "unavailable";
-  platform_health_warnings?: string[];
   platform_health_version?: string;
 }
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index f6f415ea32..2685c4a2d0 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -92,13 +92,10 @@ describe("PlatformHealthStore", () => {
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
         remotes: [],
         monitoring: { configured: true, version: "6.19.3", status: "healthy" },
-        warnings: [],
       }),
       reset: vi.fn(),
       setScenario: vi.fn(),
       setStatus: vi.fn(),
-      setWarnings: vi.fn(),
-      clearWarnings: vi.fn(),
     };
     const platformModelStore = usePlatformModelStore();
     platformModelStore.refresh = vi.fn(() => {
@@ -154,7 +151,6 @@ const singleRegionWarningModel: PlatformModel = {
     health: "healthy",
     apiUrl: "http://localhost:33633/",
   },
-  warnings: [],
 };
 
 const multiRegionDangerModel: PlatformModel = {
@@ -188,5 +184,4 @@ const multiRegionDangerModel: PlatformModel = {
     },
   ],
   monitoring: null,
-  warnings: [],
 };
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 9d55180b0f..3657ad5ac6 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -36,10 +36,6 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "warning";
     }
 
-    if (current.warnings.length > 0) {
-      return "warning";
-    }
-
     return "none";
   });
 
@@ -84,8 +80,6 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       issues.push("unavailable Monitoring instance");
     }
 
-    issues.push(...current.warnings.map((warning) => `topology warning: ${warning}`));
-
     if (issues.length === 0) {
       return "No issues detected.";
     }
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 591e86069a..475c6211b2 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -36,7 +36,6 @@ describe("PlatformModelStore", () => {
       name: "Particular.ServiceControl.CrossRegion",
       platform_health_status: "healthy",
       platform_health_version: "6.19.3",
-      platform_health_warnings: [],
     });
     getRemoteInstances.mockResolvedValue([
       {
@@ -57,4 +56,21 @@ describe("PlatformModelStore", () => {
     expect(store.primary?.role).toBe("primary-error");
     expect(store.errorInstances).toHaveLength(1);
   });
+
+  test("uses primary root values directly when the request succeeds", async () => {
+    getRoot.mockResolvedValue({
+      name: "Particular.ServiceControl.Primary",
+      platform_health_status: "degraded",
+      platform_health_version: "6.18.1",
+    });
+    getRemoteInstances.mockResolvedValue([]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.primary?.name).toBe("Particular.ServiceControl.Primary");
+    expect(store.primary?.health).toBe("degraded");
+    expect(store.primary?.version).toBe("6.18.1");
+  });
 });
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 18244e607e..0353527c2c 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -14,7 +14,6 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const auditInstances = computed(() => remotes.value.filter((instance) => instance.kind === "audit"));
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
   const isMultiRegion = computed(() => model.value?.remotes.some((instance) => instance.role === "remote-error") ?? false);
-  const warnings = computed(() => model.value?.warnings ?? []);
 
   async function refresh() {
     const [primaryRoot, remotesResponse, monitoringResponse] = await Promise.all([getPrimaryRoot(), getRemotes(), getMonitoringRoot()]);
@@ -23,7 +22,6 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
       primary: mapPrimary(primaryRoot),
       remotes: mapRemotes(remotesResponse),
       monitoring: mapMonitoring(monitoringResponse),
-      warnings: primaryRoot?.platform_health_warnings ?? readDevWarnings(),
     };
   }
 
@@ -35,7 +33,6 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
     auditInstances,
     errorInstances,
     isMultiRegion,
-    warnings,
     refresh,
   };
 });
@@ -86,11 +83,11 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformIns
 
   return {
     id: "primary",
-    name: primaryRoot.name || "Particular.ServiceControl",
+    name: primaryRoot.name,
     kind: "error",
     role: "primary-error",
-    version: primaryRoot.platform_health_version ?? "Unknown",
-    health: primaryRoot.platform_health_status ?? "healthy",
+    version: primaryRoot.platform_health_version,
+    health: primaryRoot.platform_health_status,
     apiUrl: serviceControlClient.url ?? "",
   };
 }
@@ -137,10 +134,6 @@ function extractInstanceName(apiUri: string) {
   }
 }
 
-function readDevWarnings() {
-  return window.__platformHealth?.getState().warnings ?? [];
-}
-
 if (import.meta.hot) {
   import.meta.hot.accept(acceptHMRUpdate(usePlatformModelStore, import.meta.hot));
 }
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index c55735dcad..723ff2432f 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -44,7 +44,6 @@ describe("PlatformHealthView", () => {
       },
       remotes: [],
       monitoring: null,
-      warnings: [],
     } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
@@ -91,7 +90,6 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
-      warnings: [],
     } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
@@ -128,7 +126,6 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
-      warnings: [],
     } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
@@ -173,7 +170,6 @@ describe("PlatformHealthView", () => {
         health: "healthy",
         apiUrl: "http://localhost:33633/",
       },
-      warnings: [],
     } satisfies PlatformHealthResponse;
 
     render(PlatformHealthView, {
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index b35b807e80..d8ff4ee253 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -52,9 +52,6 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
       <div class="row">
         <div class="col-sm-12">
           <p v-if="store.issueSummary !== 'No issues detected.'" :class="issueSummaryClass">{{ store.issueSummary }}</p>
-          <div v-if="store.payload?.warnings.length" class="platform-warning-list alert alert-warning" role="note">
-            <div v-for="warning in store.payload.warnings" :key="warning">{{ warning }}</div>
-          </div>
         </div>
       </div>
 
@@ -218,10 +215,6 @@ tbody tr:last-child td {
   color: #b53a31;
 }
 
-.platform-warning-list {
-  margin-bottom: 1rem;
-}
-
 .footer-icon {
   color: var(--sp-blue);
   margin-right: 4px;
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 174097d994..f0159f0e2b 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -3,7 +3,7 @@ import type RootUrls from "@/resources/RootUrls";
 
 const latestPlatformVersion = "6.19.3";
 
-export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "single-region-outdated" | "multi-region-healthy" | "multi-region-warning" | "multi-region-danger";
+export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "single-region-outdated" | "multi-region-healthy" | "multi-region-danger";
 
 export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
 
@@ -26,7 +26,6 @@ export interface PlatformHealthMockState {
     version: string;
     status: PlatformHealthMockStatus;
   } | null;
-  warnings: string[];
 }
 
 declare global {
@@ -36,8 +35,6 @@ declare global {
       reset: () => PlatformHealthMockState;
       setScenario: (name: PlatformHealthMockScenarioName) => PlatformHealthMockState;
       setStatus: (id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) => PlatformHealthMockState;
-      setWarnings: (warnings: string[]) => PlatformHealthMockState;
-      clearWarnings: () => PlatformHealthMockState;
     };
   }
 }
@@ -59,14 +56,6 @@ export function installPlatformHealthDevControls() {
       state = updateStatus(state, id, status);
       return cloneState(state);
     },
-    setWarnings: (warnings) => {
-      state = { ...state, warnings: [...warnings] };
-      return cloneState(state);
-    },
-    clearWarnings: () => {
-      state = { ...state, warnings: [] };
-      return cloneState(state);
-    },
   };
 }
 
@@ -93,7 +82,6 @@ export function getPlatformHealthPrimaryRoot(): RootUrls {
     archived_groups_url: "http://localhost:33333/api/errors/groups/{classifier?}",
     get_archive_group: "http://localhost:33333/api/archive/groups/id/{groupId}",
     platform_health_status: current.primary.status,
-    platform_health_warnings: current.warnings,
     platform_health_version: current.primary.version,
   } as RootUrls;
 }
@@ -125,10 +113,6 @@ export function getPlatformHealthMonitoringRoot() {
   };
 }
 
-export function getPlatformHealthWarnings() {
-  return [...state.warnings];
-}
-
 function updateStatus(current: PlatformHealthMockState, id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) {
   if (id === "primary") {
     return { ...current, primary: { ...current.primary, status } };
@@ -155,7 +139,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        warnings: [],
       };
     case "single-region-warning":
       return {
@@ -166,7 +149,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        warnings: [],
       };
     case "single-region-danger":
       return {
@@ -177,7 +159,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
-        warnings: [],
       };
     case "single-region-outdated":
       return {
@@ -188,7 +169,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        warnings: [],
       };
     case "multi-region-healthy":
       return {
@@ -199,18 +179,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
         ],
         monitoring: null,
-        warnings: [],
-      };
-    case "multi-region-warning":
-      return {
-        scenario: name,
-        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-        ],
-        monitoring: null,
-        warnings: ["Cross-region topology metadata is inferred in this prototype."],
       };
     case "multi-region-danger":
       return {
@@ -221,7 +189,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
         ],
         monitoring: null,
-        warnings: [],
       };
   }
 }
@@ -232,6 +199,5 @@ function cloneState(current: PlatformHealthMockState): PlatformHealthMockState {
     primary: { ...current.primary },
     remotes: current.remotes.map((remote) => ({ ...remote })),
     monitoring: current.monitoring ? { ...current.monitoring } : null,
-    warnings: [...current.warnings],
   };
 }

From fef0c37ac03ffe1c17424293706239ed2c355f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 13:51:28 +0200
Subject: [PATCH 21/67] Hide platform custom checks

---
 .../customchecks/builtInPlatformChecks.ts     | 49 +++++++++++++++
 .../src/stores/CustomChecksStore.spec.ts      | 47 ++++++++++++++
 src/Frontend/src/stores/CustomChecksStore.ts  | 29 ++++++---
 .../src/stores/PlatformHealthStore.spec.ts    | 47 ++++++++++++++
 .../src/stores/PlatformHealthStore.ts         | 61 +++++++++++++++++--
 src/Frontend/src/views/CustomChecksView.vue   | 33 +++++++++-
 .../service-control-instance-template.ts      |  4 ++
 .../test/preconditions/customChecks.ts        | 27 ++++++--
 src/Frontend/test/preconditions/index.ts      |  2 +-
 .../questions/customChecksDashboardItem.ts    |  6 ++
 .../questions/failedCustomChecks.ts           |  4 ++
 .../viewing-failing-custom-checks.spec.ts     | 51 +++++++++++++++-
 .../customchecks/viewing-no-data.spec.ts      | 30 ++++++++-
 13 files changed, 367 insertions(+), 23 deletions(-)
 create mode 100644 src/Frontend/src/components/customchecks/builtInPlatformChecks.ts
 create mode 100644 src/Frontend/src/stores/CustomChecksStore.spec.ts
 create mode 100644 src/Frontend/test/specs/customchecks/questions/customChecksDashboardItem.ts

diff --git a/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts b/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts
new file mode 100644
index 0000000000..b1d00bcd78
--- /dev/null
+++ b/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts
@@ -0,0 +1,49 @@
+import type CustomCheck from "@/resources/CustomCheck";
+
+export type PlatformCheckTarget = "primary" | "audit" | "remote-error" | "transport" | "none";
+export type PlatformCheckSeverity = "degraded" | "unavailable" | "ignore";
+
+export interface BuiltInPlatformCheck {
+  category: string;
+  customCheckId: string;
+  target: PlatformCheckTarget;
+  severity: PlatformCheckSeverity;
+}
+
+const builtInPlatformChecks: BuiltInPlatformCheck[] = [
+  { category: "Configuration", customCheckId: "Saga Audit Configuration", target: "none", severity: "ignore" },
+  { category: "Health", customCheckId: "ServiceControl Primary Instance", target: "primary", severity: "unavailable" },
+  { category: "Health", customCheckId: "ServiceControl Remotes", target: "remote-error", severity: "unavailable" },
+  { category: "ServiceControl Health", customCheckId: "Error Message Ingestion Process", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "Error Message Ingestion", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "Error Database Index Errors", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "Error Database Index Lag", target: "primary", severity: "degraded" },
+  { category: "Storage space", customCheckId: "ServiceControl database", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "Message Ingestion Process", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "RavenDB dirty memory", target: "primary", severity: "degraded" },
+  { category: "ServiceControl Health", customCheckId: "Audit Message Ingestion Process", target: "audit", severity: "degraded" },
+  { category: "ServiceControl.Audit Health", customCheckId: "Audit Message Ingestion", target: "audit", severity: "degraded" },
+  { category: "ServiceControl.Audit Health", customCheckId: "Audit Database Index Lag", target: "audit", severity: "degraded" },
+  { category: "Storage space", customCheckId: "ServiceControl.Audit database", target: "audit", severity: "degraded" },
+  { category: "ServiceControl.Audit Health", customCheckId: "Audit Message Ingestion Process", target: "audit", severity: "degraded" },
+  { category: "ServiceControl.Audit Health", customCheckId: "RavenDB dirty memory", target: "audit", severity: "degraded" },
+  { category: "Transport", customCheckId: "Dead Letter Queue", target: "transport", severity: "degraded" },
+];
+
+const builtInPlatformCheckMap = new Map(builtInPlatformChecks.map((check) => [toCheckKey(check.category, check.customCheckId), check]));
+
+export function isBuiltInPlatformCheck(check: CustomCheck) {
+  return builtInPlatformCheckMap.has(getBuiltInPlatformCheckKey(check));
+}
+
+export function getBuiltInPlatformCheck(check: CustomCheck) {
+  return builtInPlatformCheckMap.get(getBuiltInPlatformCheckKey(check)) ?? null;
+}
+
+export function getBuiltInPlatformCheckKey(check: Pick<CustomCheck, "category" | "custom_check_id">) {
+  return toCheckKey(check.category, check.custom_check_id);
+}
+
+function toCheckKey(category: string, customCheckId: string) {
+  return `${category}::${customCheckId}`;
+}
diff --git a/src/Frontend/src/stores/CustomChecksStore.spec.ts b/src/Frontend/src/stores/CustomChecksStore.spec.ts
new file mode 100644
index 0000000000..d8fb66322b
--- /dev/null
+++ b/src/Frontend/src/stores/CustomChecksStore.spec.ts
@@ -0,0 +1,47 @@
+import { beforeEach, describe, expect, test } from "vitest";
+import { createPinia, setActivePinia } from "pinia";
+import { Status } from "@/resources/CustomCheck";
+import { useCustomChecksStore } from "@/stores/CustomChecksStore";
+
+describe("CustomChecksStore", () => {
+  beforeEach(() => {
+    setActivePinia(createPinia());
+  });
+
+  test("hides built-in platform custom checks by default", () => {
+    const store = useCustomChecksStore();
+
+    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health"), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
+
+    expect(store.rawFailingCount).toBe(2);
+    expect(store.failedChecks).toHaveLength(1);
+    expect(store.failingCount).toBe(1);
+    expect(store.failedChecks[0].custom_check_id).toBe("SampleCustomeCheck 1");
+  });
+
+  test("shows built-in platform custom checks when toggled on", () => {
+    const store = useCustomChecksStore();
+
+    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health"), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
+    store.showPlatformCustomChecks = true;
+
+    expect(store.failedChecks).toHaveLength(2);
+    expect(store.failingCount).toBe(2);
+  });
+});
+
+function createCheck(custom_check_id: string, category: string) {
+  return {
+    id: `customchecks/${custom_check_id}`,
+    custom_check_id,
+    category,
+    status: Status.Fail,
+    reported_at: "2025-01-10T05:06:30.4074087Z",
+    failure_reason: "Failure",
+    originating_endpoint: {
+      name: "EndpointX",
+      host_id: "host-id",
+      host: "HostX",
+    },
+  };
+}
diff --git a/src/Frontend/src/stores/CustomChecksStore.ts b/src/Frontend/src/stores/CustomChecksStore.ts
index 1e5e8742d9..1c6b3ad931 100644
--- a/src/Frontend/src/stores/CustomChecksStore.ts
+++ b/src/Frontend/src/stores/CustomChecksStore.ts
@@ -3,16 +3,20 @@ import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed, ref, watch } from "vue";
 import { useCounter } from "@vueuse/core";
 import serviceControlClient from "@/components/serviceControlClient";
+import { isBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 
 export const useCustomChecksStore = defineStore("CustomChecksStore", () => {
   const prefix = "customchecks/";
 
   const pageNumber = ref(1);
-  const failingCount = ref(0);
-  const failedChecks = ref<CustomCheck[]>([]);
+  const rawFailingCount = ref(0);
+  const rawFailedChecks = ref<CustomCheck[]>([]);
+  const showPlatformCustomChecks = ref(false);
 
   const { count, inc, dec } = useCounter(0);
   const skipRefresh = computed(() => count.value > 0);
+  const failedChecks = computed(() => (showPlatformCustomChecks.value ? rawFailedChecks.value : rawFailedChecks.value.filter((check) => !isBuiltInPlatformCheck(check))));
+  const failingCount = computed(() => failedChecks.value.length);
 
   const refresh = async () => {
     if (skipRefresh.value) {
@@ -20,23 +24,28 @@ export const useCustomChecksStore = defineStore("CustomChecksStore", () => {
     }
     try {
       const [response, data] = await serviceControlClient.fetchTypedFromServiceControl<CustomCheck[]>(`customchecks?status=fail&page=${pageNumber.value}`);
-      failedChecks.value = data;
-      failingCount.value = parseInt(response.headers.get("Total-Count") ?? "0");
+      rawFailedChecks.value = data;
+      rawFailingCount.value = parseInt(response.headers.get("Total-Count") ?? "0");
     } catch (e) {
-      failedChecks.value = [];
-      failingCount.value = 0;
+      rawFailedChecks.value = [];
+      rawFailingCount.value = 0;
       throw e;
     }
   };
 
   watch(pageNumber, () => refresh());
 
+  function replaceFailedChecks(checks: CustomCheck[]) {
+    rawFailedChecks.value = checks;
+    rawFailingCount.value = checks.length;
+  }
+
   async function dismissCustomCheck(id: string) {
     try {
       inc();
       // NOTE: If it takes more than the refresh interval for ServiceControl to delete the check it will reappear
-      failedChecks.value = failedChecks.value.filter((x) => x.id !== id);
-      failingCount.value--;
+      rawFailedChecks.value = rawFailedChecks.value.filter((x) => x.id !== id);
+      rawFailingCount.value--;
 
       // HINT: This is required to handle the difference between ServiceControl 4 and 5
       const guid = id.toLocaleLowerCase().startsWith(prefix) ? id.substring(prefix.length) : id;
@@ -48,10 +57,14 @@ export const useCustomChecksStore = defineStore("CustomChecksStore", () => {
 
   return {
     refresh,
+    replaceFailedChecks,
     dismissCustomCheck,
     pageNumber,
     failingCount,
     failedChecks,
+    rawFailingCount,
+    rawFailedChecks,
+    showPlatformCustomChecks,
   };
 });
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 2685c4a2d0..60ca6bc313 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -1,6 +1,8 @@
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { createPinia, setActivePinia } from "pinia";
+import { Status } from "@/resources/CustomCheck";
 import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
+import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 import type { PlatformModel } from "@/resources/PlatformModel";
@@ -110,6 +112,51 @@ describe("PlatformHealthStore", () => {
     expect(store.rows[2].latestVersion).toBe("6.19.3");
     expect(store.outdatedOnly).toBe(false);
   });
+
+  test("applies hidden built-in platform custom checks to platform health only", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/primary",
+        custom_check_id: "ServiceControl Primary Instance",
+        category: "Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Critical error detected",
+        originating_endpoint: {
+          name: "Particular.ServiceControl",
+          host_id: "host-1",
+          host: "Host A",
+        },
+      },
+      {
+        id: "customchecks/audit",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = singleRegionWarningModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.payload?.primary.health).toBe("unavailable");
+    expect(store.payload?.remotes[0].health).toBe("degraded");
+    expect(store.severity).toBe("danger");
+  });
 });
 
 const singleRegionWarningModel: PlatformModel = {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 3657ad5ac6..38e1c9ce65 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -1,9 +1,12 @@
-import { acceptHMRUpdate, defineStore } from "pinia";
+import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
 import { computed, ref } from "vue";
 import { isUpgradeAvailable } from "@/composables/serviceSemVer";
+import { getBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
-import type { PlatformInstance } from "@/resources/PlatformModel";
+import type CustomCheck from "@/resources/CustomCheck";
+import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
+import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 const supportCaseUrl = "https://customers.particular.net/request-support";
@@ -13,6 +16,8 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   const payload = ref<PlatformHealthResponse | null>(null);
   const environmentAndVersionsStore = useEnvironmentAndVersionsStore();
   const platformModelStore = usePlatformModelStore();
+  const customChecksStore = useCustomChecksStore();
+  const { rawFailedChecks } = storeToRefs(customChecksStore);
 
   const severity = computed<PlatformHealthSeverity>(() => {
     const current = payload.value;
@@ -107,7 +112,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   async function refresh() {
     await platformModelStore.refresh();
 
-    payload.value = platformModelStore.model;
+    payload.value = platformModelStore.model ? applyPlatformHealthChecks(platformModelStore.model, rawFailedChecks.value) : null;
   }
 
   return {
@@ -180,8 +185,8 @@ function formatInstanceType(instanceType: PlatformInstance["kind"]) {
   }
 }
 
-function hasUpgrade(currentVersion: string, latestVersion: string) {
-  return !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
+function hasUpgrade(currentVersion: string | null | undefined, latestVersion: string) {
+  return !!currentVersion && !!latestVersion && isUpgradeAvailable(currentVersion, latestVersion);
 }
 
 function buildReleaseLink(version: string) {
@@ -197,3 +202,49 @@ if (import.meta.hot) {
 }
 
 export type PlatformHealthStore = ReturnType<typeof usePlatformHealthStore>;
+
+function applyPlatformHealthChecks(model: PlatformModel, checks: CustomCheck[]) {
+  const platformChecks = normalizeChecks(checks).map(getBuiltInPlatformCheck);
+  const primary = applyPlatformCheckHealthToPrimary(model.primary, platformChecks);
+  const remotes = applyPlatformCheckHealthToRemotes(model.remotes, platformChecks);
+
+  return {
+    ...model,
+    primary,
+    remotes,
+  } satisfies PlatformModel;
+}
+
+function applyPlatformCheckHealthToPrimary(primary: PlatformInstance, platformChecks: Array<ReturnType<typeof getBuiltInPlatformCheck>>) {
+  if (platformChecks.some((check) => check?.target === "primary" && check.severity === "unavailable")) {
+    return { ...primary, health: "unavailable" as const };
+  }
+
+  if (platformChecks.some((check) => check?.target === "primary" && check.severity === "degraded") && primary.health === "healthy") {
+    return { ...primary, health: "degraded" as const };
+  }
+
+  return primary;
+}
+
+function applyPlatformCheckHealthToRemotes(remotes: PlatformInstance[], platformChecks: Array<ReturnType<typeof getBuiltInPlatformCheck>>) {
+  const hasRemoteUnavailableCheck = platformChecks.some((check) => check?.target === "remote-error" && check.severity === "unavailable");
+  const hasAuditDegradedCheck = platformChecks.some((check) => check?.target === "audit" && check.severity === "degraded");
+  const hasTransportDegradedCheck = platformChecks.some((check) => check?.target === "transport" && check.severity === "degraded");
+
+  return remotes.map((remote) => {
+    if (remote.role === "remote-error" && hasRemoteUnavailableCheck) {
+      return { ...remote, health: "unavailable" as const };
+    }
+
+    if (remote.role === "remote-audit" && (hasAuditDegradedCheck || hasTransportDegradedCheck) && remote.health === "healthy") {
+      return { ...remote, health: "degraded" as const };
+    }
+
+    return remote;
+  });
+}
+
+function normalizeChecks(checks: CustomCheck[] | unknown) {
+  return Array.isArray(checks) ? checks : [];
+}
diff --git a/src/Frontend/src/views/CustomChecksView.vue b/src/Frontend/src/views/CustomChecksView.vue
index 300e4c381f..53b2a86a1b 100644
--- a/src/Frontend/src/views/CustomChecksView.vue
+++ b/src/Frontend/src/views/CustomChecksView.vue
@@ -7,14 +7,18 @@ import useCustomChecksStoreAutoRefresh from "@/composables/useCustomChecksStoreA
 
 const { store } = useCustomChecksStoreAutoRefresh();
 
-const { pageNumber, failingCount, failedChecks } = storeToRefs(store);
+const { pageNumber, failingCount, failedChecks, showPlatformCustomChecks } = storeToRefs(store);
 </script>
 
 <template>
   <div class="container">
     <div class="row">
-      <div class="col-sm-12 padded">
+      <div class="col-sm-12 padded page-header-row">
         <h1>Custom checks</h1>
+        <label class="show-platform-toggle">
+          <input v-model="showPlatformCustomChecks" type="checkbox" aria-label="Show platform custom checks" />
+          <span>Show platform custom checks</span>
+        </label>
       </div>
     </div>
 
@@ -31,3 +35,28 @@ const { pageNumber, failingCount, failedChecks } = storeToRefs(store);
     </section>
   </div>
 </template>
+
+<style scoped>
+.page-header-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1rem;
+}
+
+.show-platform-toggle {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+  font-weight: 400;
+  font-size: 14px;
+  margin: 0;
+}
+
+@media (max-width: 600px) {
+  .page-header-row {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+}
+</style>
diff --git a/src/Frontend/test/mocks/service-control-instance-template.ts b/src/Frontend/test/mocks/service-control-instance-template.ts
index c6906133fc..dfb1afd101 100644
--- a/src/Frontend/test/mocks/service-control-instance-template.ts
+++ b/src/Frontend/test/mocks/service-control-instance-template.ts
@@ -17,6 +17,8 @@ export const serviceControlMainInstance = <RootUrls>{
   license_status: LicenseStatus.Valid,
   license_details: "http://localhost:33333/api/license",
   name: "ServiceControl",
+  platform_health_status: "healthy",
+  platform_health_version: "5.0.0-alpha.2",
   sagas_url: "http://localhost:33333/api/sagas",
   event_log_items: "http://localhost:33333/api/eventlogitems",
   archived_groups_url: "http://localhost:33333/api/errors/groups/{classifier?}",
@@ -26,4 +28,6 @@ export const serviceControlMainInstance = <RootUrls>{
 export const monitoredInstanceTemplate = <ServiceControlMonitoringInstance>{
   instanceType: "monitoring",
   version: "5.0.0-alpha.2",
+  platform_health_status: "healthy",
+  platform_health_version: "5.0.0-alpha.2",
 };
diff --git a/src/Frontend/test/preconditions/customChecks.ts b/src/Frontend/test/preconditions/customChecks.ts
index 8e5a047392..f7ad6195b0 100644
--- a/src/Frontend/test/preconditions/customChecks.ts
+++ b/src/Frontend/test/preconditions/customChecks.ts
@@ -1,12 +1,30 @@
 import { type default as CustomCheck, Status } from "@/resources/CustomCheck";
 import type { SetupFactoryOptions } from "../driver";
 import { createDateWithDayOffset } from "@/composables/formatter";
-const emptyContent = JSON.stringify([]);
+
+export function createCustomCheck(overrides: Partial<CustomCheck>): CustomCheck {
+  const newGuid = crypto.randomUUID();
+  const { originating_endpoint, ...rest } = overrides;
+  const baseCheck = {
+    ...customCheckTemplate,
+    id: `customchecks/${newGuid}`,
+    ...rest,
+  };
+
+  return {
+    ...baseCheck,
+    originating_endpoint: {
+      ...customCheckTemplate.originating_endpoint,
+      host_id: newGuid,
+      ...originating_endpoint,
+    },
+  };
+}
 
 export const hasCustomChecksEmpty = ({ driver }: SetupFactoryOptions) => {
   const serviceControlInstanceUrl = window.defaultConfig.service_control_url;
   driver.mockEndpoint(`${serviceControlInstanceUrl}customchecks`, {
-    body: emptyContent,
+    body: [],
     headers: {
       "Total-Count": "0", //count of failing custom checks
     },
@@ -60,8 +78,7 @@ export const generateCustomChecksData = (failingCount: number, passingCount: num
     const customCategory = `Some Category ${index}`;
     const customeCheckId = `SampleCustomeCheck ${index}`;
 
-    return {
-      ...customCheckTemplate,
+    return createCustomCheck({
       id: `customchecks/${newGuid}`, // New GUID for ID
       category: customCategory,
       custom_check_id: customeCheckId,
@@ -73,7 +90,7 @@ export const generateCustomChecksData = (failingCount: number, passingCount: num
         host_id: newGuid, // New GUID for host_id
         host: originatingHost, // Host name based on index
       },
-    };
+    });
   });
   return customChecks;
 };
diff --git a/src/Frontend/test/preconditions/index.ts b/src/Frontend/test/preconditions/index.ts
index 219c6bff01..d909e0884a 100644
--- a/src/Frontend/test/preconditions/index.ts
+++ b/src/Frontend/test/preconditions/index.ts
@@ -5,7 +5,7 @@ export { hasServiceControlMonitoringInstanceUrl } from "../preconditions/hasServ
 export { hasUpToDateServiceControl } from "../preconditions/hasUpToDateServiceControl";
 export { hasUpToDateServicePulse } from "../preconditions/hasUpToDateServicePulse";
 export { errorsDefaultHandler } from "../preconditions/hasNoErrors";
-export { hasCustomChecksEmpty, hasCustomChecks, generateCustomChecksData, getCustomChecks, updateCustomCheckItemByStatus, updateCustomCheckItemByItem } from "./customChecks";
+export { createCustomCheck, hasCustomChecksEmpty, hasCustomChecks, generateCustomChecksData, getCustomChecks, updateCustomCheckItemByStatus, updateCustomCheckItemByItem } from "./customChecks";
 export { hasNoDisconnectedEndpoints } from "../preconditions/hasNoDisconnectedEndpoints";
 export { hasNoMonitoredEndpoints, hasMonitoredEndpointsList, monitoredEndpointsNamed } from "../preconditions/hasMonitoredEndpoints";
 export { hasEventLogItems } from "../preconditions/hasEventLogItems";
diff --git a/src/Frontend/test/specs/customchecks/questions/customChecksDashboardItem.ts b/src/Frontend/test/specs/customchecks/questions/customChecksDashboardItem.ts
new file mode 100644
index 0000000000..9558c1a244
--- /dev/null
+++ b/src/Frontend/test/specs/customchecks/questions/customChecksDashboardItem.ts
@@ -0,0 +1,6 @@
+import { getDashboardItems } from "../../heartbeats/questions/getDashboardItems";
+
+export async function queryCustomChecksDashboardItem() {
+  const dashboardItems = await getDashboardItems();
+  return dashboardItems ? dashboardItems.get("Custom Checks") : null;
+}
diff --git a/src/Frontend/test/specs/customchecks/questions/failedCustomChecks.ts b/src/Frontend/test/specs/customchecks/questions/failedCustomChecks.ts
index f000c3c600..06fe1bb791 100644
--- a/src/Frontend/test/specs/customchecks/questions/failedCustomChecks.ts
+++ b/src/Frontend/test/specs/customchecks/questions/failedCustomChecks.ts
@@ -44,3 +44,7 @@ export async function customChecksDismissButtonList() {
   const dismissButtonList = await screen.findAllByRole("button", { name: "custom-check-dismiss" });
   return dismissButtonList;
 }
+
+export function showPlatformCustomChecksToggle() {
+  return screen.getByRole("checkbox", { name: /Show platform custom checks/i });
+}
diff --git a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
index 2cce74f0e7..1f2c74ad81 100644
--- a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
@@ -1,9 +1,20 @@
 import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
-import { customChecksFailedRowsList, customChecksListElement, customChecksMessageElement, customChecksFailedReasonList, customChecksListPaginationElement, customChecksReportedDateList } from "./questions/failedCustomChecks";
+import {
+  customChecksFailedRowsList,
+  customChecksListElement,
+  customChecksMessageElement,
+  customChecksFailedReasonList,
+  customChecksListPaginationElement,
+  customChecksReportedDateList,
+  showPlatformCustomChecksToggle,
+} from "./questions/failedCustomChecks";
 import { waitFor } from "@testing-library/vue";
 import { updateCustomCheckItemByStatus } from "../../preconditions/customChecks";
+import userEvent from "@testing-library/user-event";
+import { queryCustomChecksDashboardItem } from "./questions/customChecksDashboardItem";
+import { Status } from "@/resources/CustomCheck";
 
 describe("FEATURE: Failing custom checks", () => {
   describe("RULE: Failed custom checks should be displayed", () => {
@@ -32,6 +43,44 @@ describe("FEATURE: Failing custom checks", () => {
         });
       });
     });
+
+    test("EXAMPLE: Built-in platform custom checks are hidden from the page by default", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(
+        precondition.getCustomChecks([
+          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable" }),
+          precondition.createCustomCheck({ custom_check_id: "SampleCustomeCheck 1", category: "Some Category 1", status: Status.Fail, failure_reason: "configured to fail on endpoint 1" }),
+        ])
+      );
+
+      await driver.goTo("/custom-checks");
+
+      await waitFor(async () => {
+        expect(await customChecksFailedRowsList()).toHaveLength(1);
+      });
+      await userEvent.click(showPlatformCustomChecksToggle());
+
+      await waitFor(async () => {
+        expect(await customChecksFailedRowsList()).toHaveLength(2);
+      });
+    });
+
+    test("EXAMPLE: Built-in platform custom checks are hidden from the dashboard count by default", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(
+        precondition.getCustomChecks([
+          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable" }),
+          precondition.createCustomCheck({ custom_check_id: "SampleCustomeCheck 1", category: "Some Category 1", status: Status.Fail, failure_reason: "configured to fail on endpoint 1" }),
+        ])
+      );
+
+      await driver.goTo("/dashboard");
+
+      await waitFor(async () => {
+        const dashboardItem = await queryCustomChecksDashboardItem();
+        expect(dashboardItem?.counterValue).toBe(1);
+      });
+    });
   });
 
   describe("RULE: Failed custom checks should have pagination when failed checks count is greater than 10", () => {
diff --git a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
index d6ba4d5a2c..8732216bbb 100644
--- a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
@@ -1,8 +1,10 @@
 import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
-import { customChecksMessage } from "./questions/failedCustomChecks";
+import { customChecksFailedRowsList, customChecksMessage, showPlatformCustomChecksToggle } from "./questions/failedCustomChecks";
 import { waitFor } from "@testing-library/vue";
+import userEvent from "@testing-library/user-event";
+import { Status } from "@/resources/CustomCheck";
 
 describe("FEATURE: No data", () => {
   describe("RULE: When there is no data to show, a message should be displayed ", () => {
@@ -28,5 +30,31 @@ describe("FEATURE: No data", () => {
         expect(customChecksMessage()).toBe("No failed custom checks");
       });
     });
+
+    test("EXAMPLE: Built-in platform custom checks are hidden by default but can be shown", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(
+        precondition.getCustomChecks([
+          precondition.createCustomCheck({
+            custom_check_id: "ServiceControl Primary Instance",
+            category: "Health",
+            status: Status.Fail,
+            failure_reason: "Critical error detected",
+          }),
+        ])
+      );
+
+      await driver.goTo("/custom-checks");
+
+      await waitFor(() => {
+        expect(customChecksMessage()).toBe("No failed custom checks");
+      });
+
+      await userEvent.click(showPlatformCustomChecksToggle());
+
+      await waitFor(async () => {
+        expect(await customChecksFailedRowsList()).toHaveLength(1);
+      });
+    });
   });
 });

From 53f1bfbe8f82fabd6a6c263239106bfaca404d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 15:40:58 +0200
Subject: [PATCH 22/67] Add platform health check presets

---
 .../src/stores/PlatformHealthStore.spec.ts    |  48 ++++++++
 .../src/stores/PlatformHealthStore.ts         |   8 ++
 .../test/mocks/platform-health-state.spec.ts  |  43 ++++++++
 .../test/mocks/platform-health-state.ts       | 103 +++++++++++++++++-
 .../platform-health/platform-health.ts        |  11 +-
 5 files changed, 209 insertions(+), 4 deletions(-)
 create mode 100644 src/Frontend/test/mocks/platform-health-state.spec.ts

diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 60ca6bc313..69bc782b71 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -91,12 +91,18 @@ describe("PlatformHealthStore", () => {
     window.__platformHealth = {
       getState: () => ({
         scenario: "single-region-warning",
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
         remotes: [],
         monitoring: { configured: true, version: "6.19.3", status: "healthy" },
+        customChecks: [],
       }),
+      getCustomChecks: vi.fn(() => []),
       reset: vi.fn(),
       setScenario: vi.fn(),
+      setCustomCheckPreset: vi.fn(),
+      setCustomChecks: vi.fn(),
+      clearCustomChecks: vi.fn(),
       setStatus: vi.fn(),
     };
     const platformModelStore = usePlatformModelStore();
@@ -157,6 +163,48 @@ describe("PlatformHealthStore", () => {
     expect(store.payload?.remotes[0].health).toBe("degraded");
     expect(store.severity).toBe("danger");
   });
+
+  test("maps built-in degraded primary custom checks to primary degraded", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/primary-degraded",
+        custom_check_id: "Error Message Ingestion Process",
+        category: "ServiceControl Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Error ingestion stopped",
+        originating_endpoint: {
+          name: "Particular.ServiceControl",
+          host_id: "host-1",
+          host: "Host A",
+        },
+      },
+    ]);
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        primary: {
+          ...singleRegionWarningModel.primary,
+          health: "healthy",
+        },
+        remotes: singleRegionWarningModel.remotes.map((remote) => ({
+          ...remote,
+          health: "healthy",
+        })),
+      };
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.payload?.primary.health).toBe("degraded");
+    expect(store.severity).toBe("warning");
+    expect(store.issueSummary).toContain("primary Error instance degraded");
+  });
 });
 
 const singleRegionWarningModel: PlatformModel = {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 38e1c9ce65..333a0848ec 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -29,6 +29,10 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "danger";
     }
 
+    if (current.primary.health === "degraded") {
+      return "warning";
+    }
+
     if (current.remotes.some((remote) => remote.role === "remote-error" && remote.health !== "healthy")) {
       return "danger";
     }
@@ -78,6 +82,10 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       issues.push("primary Error instance unavailable");
     }
 
+    if (current.primary.health === "degraded") {
+      issues.push("primary Error instance degraded");
+    }
+
     issues.push(...current.remotes.filter((remote) => remote.health === "degraded").map((remote) => `degraded ${formatInstanceType(remote.kind)}`));
     issues.push(...current.remotes.filter((remote) => remote.health === "unavailable").map((remote) => `unavailable ${formatInstanceType(remote.kind)}`));
 
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
new file mode 100644
index 0000000000..73b07b42c9
--- /dev/null
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -0,0 +1,43 @@
+import { beforeEach, describe, expect, test } from "vitest";
+import { getPlatformHealthCustomChecks, installPlatformHealthDevControls } from "./platform-health-state";
+
+describe("platform-health-state", () => {
+  beforeEach(() => {
+    installPlatformHealthDevControls();
+    window.__platformHealth?.reset();
+  });
+
+  test("applies built-in and user custom check presets independently of topology scenario", () => {
+    window.__platformHealth?.setScenario("single-region-healthy");
+    window.__platformHealth?.setCustomCheckPreset("mixed-primary-and-user");
+
+    const state = window.__platformHealth?.getState();
+    const checks = getPlatformHealthCustomChecks();
+
+    expect(state?.scenario).toBe("single-region-healthy");
+    expect(state?.customCheckPreset).toBe("mixed-primary-and-user");
+    expect(checks).toHaveLength(2);
+    expect(checks.some((check) => check.custom_check_id === "ServiceControl Primary Instance")).toBe(true);
+    expect(checks.some((check) => check.category === "User defined")).toBe(true);
+  });
+
+  test("allows explicit custom checks to replace a preset", () => {
+    window.__platformHealth?.setCustomCheckPreset("platform-only-primary");
+    window.__platformHealth?.setCustomChecks([]);
+
+    expect(window.__platformHealth?.getCustomChecks()).toEqual([]);
+  });
+
+  test("supports a degraded primary platform custom check preset", () => {
+    window.__platformHealth?.setScenario("single-region-healthy");
+    window.__platformHealth?.setCustomCheckPreset("platform-only-primary-degraded");
+
+    const state = window.__platformHealth?.getState();
+    const checks = getPlatformHealthCustomChecks();
+
+    expect(state?.customCheckPreset).toBe("platform-only-primary-degraded");
+    expect(checks).toHaveLength(1);
+    expect(checks[0].custom_check_id).toBe("Error Message Ingestion Process");
+    expect(checks[0].category).toBe("ServiceControl Health");
+  });
+});
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index f0159f0e2b..f8513816d9 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -1,14 +1,18 @@
+import { Status, type default as CustomCheck } from "@/resources/CustomCheck";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
 import type RootUrls from "@/resources/RootUrls";
+import { createCustomCheck } from "../preconditions/customChecks";
 
 const latestPlatformVersion = "6.19.3";
 
 export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "single-region-outdated" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
 
 export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformHealthMockState {
   scenario: PlatformHealthMockScenarioName;
+  customCheckPreset: PlatformHealthCustomCheckPresetName;
   primary: {
     name: string;
     version: string;
@@ -26,30 +30,48 @@ export interface PlatformHealthMockState {
     version: string;
     status: PlatformHealthMockStatus;
   } | null;
+  customChecks: CustomCheck[];
 }
 
 declare global {
   interface Window {
     __platformHealth?: {
       getState: () => PlatformHealthMockState;
+      getCustomChecks: () => CustomCheck[];
       reset: () => PlatformHealthMockState;
       setScenario: (name: PlatformHealthMockScenarioName) => PlatformHealthMockState;
+      setCustomCheckPreset: (name: PlatformHealthCustomCheckPresetName) => PlatformHealthMockState;
+      setCustomChecks: (checks: CustomCheck[]) => PlatformHealthMockState;
+      clearCustomChecks: () => PlatformHealthMockState;
       setStatus: (id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) => PlatformHealthMockState;
     };
   }
 }
 
-let state = createScenario("single-region-warning");
+let state = withCustomChecks(createScenario("single-region-warning"), "none");
 
 export function installPlatformHealthDevControls() {
   window.__platformHealth = {
     getState: () => cloneState(state),
+    getCustomChecks: () => state.customChecks.map((check) => structuredClone(check)),
     reset: () => {
-      state = createScenario("single-region-warning");
+      state = withCustomChecks(createScenario("single-region-warning"), "none");
       return cloneState(state);
     },
     setScenario: (name) => {
-      state = createScenario(name);
+      state = withCustomChecks(createScenario(name), state.customCheckPreset, state.customChecks);
+      return cloneState(state);
+    },
+    setCustomCheckPreset: (name) => {
+      state = withCustomChecks(state, name);
+      return cloneState(state);
+    },
+    setCustomChecks: (checks) => {
+      state = withCustomChecks(state, state.customCheckPreset, checks);
+      return cloneState(state);
+    },
+    clearCustomChecks: () => {
+      state = withCustomChecks(state, state.customCheckPreset, []);
       return cloneState(state);
     },
     setStatus: (id, status) => {
@@ -113,6 +135,10 @@ export function getPlatformHealthMonitoringRoot() {
   };
 }
 
+export function getPlatformHealthCustomChecks() {
+  return state.customChecks.map((check) => structuredClone(check));
+}
+
 function updateStatus(current: PlatformHealthMockState, id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) {
   if (id === "primary") {
     return { ...current, primary: { ...current.primary, status } };
@@ -133,71 +159,142 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
     case "single-region-healthy":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+        customChecks: [],
       };
     case "single-region-warning":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+        customChecks: [],
       };
     case "single-region-danger":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+        customChecks: [],
       };
     case "single-region-outdated":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+        customChecks: [],
       };
     case "multi-region-healthy":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
         ],
         monitoring: null,
+        customChecks: [],
       };
     case "multi-region-danger":
       return {
         scenario: name,
+        customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
           { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
         ],
         monitoring: null,
+        customChecks: [],
       };
   }
 }
 
+function withCustomChecks(baseState: PlatformHealthMockState, preset: PlatformHealthCustomCheckPresetName, customChecks = createCustomCheckPreset(preset)) {
+  return {
+    ...baseState,
+    customCheckPreset: preset,
+    customChecks: customChecks.map((check) => structuredClone(check)),
+  } satisfies PlatformHealthMockState;
+}
+
+function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): CustomCheck[] {
+  switch (name) {
+    case "user-only":
+      return [
+        createCustomCheck({
+          custom_check_id: "Endpoint dependency check",
+          category: "User defined",
+          status: Status.Fail,
+          failure_reason: "Downstream dependency unavailable",
+          originating_endpoint: { name: "Sales.Endpoint", host_id: crypto.randomUUID(), host: "sales-host" },
+        }),
+      ];
+    case "platform-only-primary":
+      return [
+        createCustomCheck({
+          custom_check_id: "ServiceControl Primary Instance",
+          category: "Health",
+          status: Status.Fail,
+          failure_reason: "Critical error detected",
+          originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
+        }),
+      ];
+    case "platform-only-primary-degraded":
+      return [
+        createCustomCheck({
+          custom_check_id: "Error Message Ingestion Process",
+          category: "ServiceControl Health",
+          status: Status.Fail,
+          failure_reason: "Error ingestion stopped",
+          originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
+        }),
+      ];
+    case "platform-only-audit":
+      return [
+        createCustomCheck({
+          custom_check_id: "Audit Message Ingestion",
+          category: "ServiceControl.Audit Health",
+          status: Status.Fail,
+          failure_reason: "Audit ingestion failed",
+          originating_endpoint: { name: "Particular.ServiceControl.Audit", host_id: crypto.randomUUID(), host: "audit-host" },
+        }),
+      ];
+    case "mixed-primary-and-user":
+      return [...createCustomCheckPreset("platform-only-primary"), ...createCustomCheckPreset("user-only")];
+    case "none":
+    default:
+      return [];
+  }
+}
+
 function cloneState(current: PlatformHealthMockState): PlatformHealthMockState {
   return {
     ...current,
     primary: { ...current.primary },
     remotes: current.remotes.map((remote) => ({ ...remote })),
     monitoring: current.monitoring ? { ...current.monitoring } : null,
+    customChecks: current.customChecks.map((check) => structuredClone(check)),
   };
 }
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index 0ecf9ba4f5..e754c6b35a 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -1,6 +1,6 @@
 import * as precondition from "../../../preconditions";
 import { createScenario } from "../scenario-helper";
-import { getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
+import { getPlatformHealthCustomChecks, getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
 
 const { worker, driver, runScenario } = createScenario();
 
@@ -21,6 +21,15 @@ export const setupComplete = (async () => {
       });
     });
     driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}configuration/remotes`, "get", () => Promise.resolve({ body: getPlatformHealthRemoteInstances() }));
+    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}customchecks`, "get", (url) => {
+      const status = url.searchParams.get("status");
+      const body = getPlatformHealthCustomChecks();
+
+      return Promise.resolve({
+        body: status === "fail" ? body.filter((check) => check.status === "Fail") : body,
+        headers: { "Total-Count": body.filter((check) => check.status === "Fail").length.toString() },
+      });
+    });
     driver.mockEndpointDynamic(`${window.defaultConfig.monitoring_urls[0]}`, "get", () => {
       const body = getPlatformHealthMonitoringRoot();
 

From 8e3d3f9ab469fa00efdc24183c7e49d156613b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 17:39:43 +0200
Subject: [PATCH 23/67] Show platform health details

---
 src/Frontend/src/resources/PlatformHealth.ts  |   2 +
 .../src/stores/PlatformHealthStore.spec.ts    |   1 +
 .../src/stores/PlatformHealthStore.ts         |  74 +++++++++++-
 .../src/views/PlatformHealthView.spec.ts      | 113 ++++++++++++++++++
 src/Frontend/src/views/PlatformHealthView.vue |  95 ++++++++++++---
 5 files changed, 265 insertions(+), 20 deletions(-)

diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
index 2a539c733c..7c8b622110 100644
--- a/src/Frontend/src/resources/PlatformHealth.ts
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -14,4 +14,6 @@ export interface PlatformHealthRow {
   upgradeAvailable: boolean;
   latestVersion: string;
   upgradeLink: string;
+  isExpandable: boolean;
+  details: string[];
 }
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 69bc782b71..bc04a16978 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -204,6 +204,7 @@ describe("PlatformHealthStore", () => {
     expect(store.payload?.primary.health).toBe("degraded");
     expect(store.severity).toBe("warning");
     expect(store.issueSummary).toContain("primary Error instance degraded");
+    expect(store.rows[0].details).toContain("Error Message Ingestion Process: Error ingestion stopped");
   });
 });
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 333a0848ec..b7d9ecf544 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -56,15 +56,20 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return [];
     }
 
+    const platformChecks = normalizeChecks(rawFailedChecks.value);
+
     const latestServiceControlVersion = environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber || firstKnownVersion(current.primary.version, window.__platformHealth?.getState().primary.version);
     const latestServiceControlLink = environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink || buildReleaseLink(latestServiceControlVersion);
     const latestMonitoringVersion = environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber || firstKnownVersion(current.monitoring?.version, window.__platformHealth?.getState().monitoring?.version, latestServiceControlVersion);
     const latestMonitoringLink = environmentAndVersionsStore.newVersions.newMVersion.newmversionlink || buildReleaseLink(latestMonitoringVersion);
 
-    const nextRows: PlatformHealthRow[] = [toRow(current.primary, latestServiceControlVersion, latestServiceControlLink), ...current.remotes.map((remote) => toRow(remote, latestServiceControlVersion, latestServiceControlLink))];
+    const nextRows: PlatformHealthRow[] = [
+      toRow(current.primary, latestServiceControlVersion, latestServiceControlLink, detailsForInstance(current.primary, current, platformChecks)),
+      ...current.remotes.map((remote) => toRow(remote, latestServiceControlVersion, latestServiceControlLink, detailsForInstance(remote, current, platformChecks))),
+    ];
 
     if (current.monitoring) {
-      nextRows.push(toRow(current.monitoring, latestMonitoringVersion, latestMonitoringLink));
+      nextRows.push(toRow(current.monitoring, latestMonitoringVersion, latestMonitoringLink, detailsForInstance(current.monitoring, current, platformChecks)));
     }
 
     return nextRows;
@@ -143,7 +148,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   };
 });
 
-function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string): PlatformHealthRow {
+function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string, details: string[]): PlatformHealthRow {
   return {
     type: formatRowType(instance),
     instanceName: instance.name,
@@ -154,6 +159,8 @@ function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: s
     upgradeAvailable: hasUpgrade(instance.version, latestVersion),
     latestVersion,
     upgradeLink,
+    isExpandable: details.length > 0,
+    details,
   };
 }
 
@@ -223,6 +230,67 @@ function applyPlatformHealthChecks(model: PlatformModel, checks: CustomCheck[])
   } satisfies PlatformModel;
 }
 
+function detailsForInstance(instance: PlatformInstance, model: PlatformModel, checks: CustomCheck[]) {
+  const matchingPlatformChecks = checks.filter((check) => matchesInstance(check, instance));
+  const details = matchingPlatformChecks.map((check) => formatCustomCheckDetail(check));
+
+  if (details.length > 0) {
+    return details;
+  }
+
+  return fallbackDetails(instance, model);
+}
+
+function matchesInstance(check: CustomCheck, instance: PlatformInstance) {
+  const platformCheck = getBuiltInPlatformCheck(check);
+  if (!platformCheck) {
+    return false;
+  }
+
+  switch (platformCheck.target) {
+    case "primary":
+      return instance.role === "primary-error";
+    case "remote-error":
+      return instance.role === "remote-error";
+    case "audit":
+      return instance.role === "remote-audit";
+    case "transport":
+      return instance.role === "remote-audit";
+    default:
+      return false;
+  }
+}
+
+function formatCustomCheckDetail(check: CustomCheck) {
+  return check.failure_reason ? `${check.custom_check_id}: ${check.failure_reason}` : check.custom_check_id;
+}
+
+function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
+  if (instance.role === "monitoring" && instance.health === "unavailable") {
+    return ["Monitoring root endpoint is unavailable."];
+  }
+
+  if (instance.role === "remote-error" && instance.health === "unavailable") {
+    return ["Regional error instance is unavailable."];
+  }
+
+  if (instance.role === "remote-audit" && instance.health === "degraded") {
+    return ["Audit instance is degraded."];
+  }
+
+  if (instance.role === "primary-error") {
+    if (instance.health === "unavailable") {
+      return ["Primary error instance is unavailable."];
+    }
+
+    if (instance.health === "degraded" && model.primary.health === "degraded") {
+      return ["Primary error instance is degraded."];
+    }
+  }
+
+  return [];
+}
+
 function applyPlatformCheckHealthToPrimary(primary: PlatformInstance, platformChecks: Array<ReturnType<typeof getBuiltInPlatformCheck>>) {
   if (platformChecks.some((check) => check?.target === "primary" && check.severity === "unavailable")) {
     return { ...primary, health: "unavailable" as const };
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 723ff2432f..45a57cb838 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -180,4 +180,117 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByText(/Particular.ServiceControl.Monitoring/i)).toBeInTheDocument();
   });
+
+  test("shows details when clicking a degraded health badge", async () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [
+        {
+          id: "remote-0",
+          name: "Particular.ServiceControl.Audit",
+          kind: "audit",
+          role: "remote-audit",
+          version: "6.19.3",
+          health: "degraded",
+          apiUrl: "http://localhost:33334/api/",
+        },
+      ],
+      monitoring: null,
+    } satisfies PlatformHealthResponse;
+
+    const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
+      {
+        type: "Error instance",
+        instanceName: "Particular.ServiceControl",
+        apiUrl: "http://localhost:33333/api/",
+        version: "6.19.3",
+        health: "healthy",
+        note: "Primary error instance",
+        upgradeAvailable: false,
+        latestVersion: "6.19.3",
+        upgradeLink: "",
+        isExpandable: false,
+        details: [],
+      },
+      {
+        type: "Audit instance",
+        instanceName: "Particular.ServiceControl.Audit",
+        apiUrl: "http://localhost:33334/api/",
+        version: "6.19.3",
+        health: "degraded",
+        note: "Audit instance",
+        upgradeAvailable: false,
+        latestVersion: "6.19.3",
+        upgradeLink: "",
+        isExpandable: true,
+        details: ["Audit Message Ingestion: Audit ingestion failed"],
+      },
+    ]);
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    const user = userEvent.setup();
+    await user.click(screen.getByRole("button", { name: "Degraded" }));
+
+    expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
+
+    rows.mockRestore();
+  });
+
+  test("does not make healthy rows expandable", () => {
+    const store = usePlatformHealthStore();
+    store.payload = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [],
+      monitoring: null,
+    } satisfies PlatformHealthResponse;
+
+    const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
+      {
+        type: "Error instance",
+        instanceName: "Particular.ServiceControl",
+        apiUrl: "http://localhost:33333/api/",
+        version: "6.19.3",
+        health: "healthy",
+        note: "Primary error instance",
+        upgradeAvailable: false,
+        latestVersion: "6.19.3",
+        upgradeLink: "",
+        isExpandable: false,
+        details: [],
+      },
+    ]);
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.queryByRole("button", { name: "Healthy" })).not.toBeInTheDocument();
+    expect(screen.getByText("Healthy")).toBeInTheDocument();
+
+    rows.mockRestore();
+  });
 });
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index d8ff4ee253..4e31de107d 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -11,6 +11,7 @@ import { faArrowTurnUp } from "@fortawesome/free-solid-svg-icons";
 const { store } = usePlatformHealthStoreAutoRefresh();
 useEnvironmentAndVersionsAutoRefresh();
 const showSupportModal = ref(false);
+const expandedRowKey = ref<string | null>(null);
 
 const issueSummaryClass = computed(() => ({
   "issues-summary": true,
@@ -35,6 +36,26 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
 
   return row.upgradeAvailable || (!!targetVersion && row.version !== "Unknown" && row.version !== targetVersion);
 }
+
+function rowKey(row: (typeof store.rows)[number]) {
+  return `${row.type}-${row.instanceName}`;
+}
+
+function isExpandable(row: (typeof store.rows)[number]) {
+  return row.isExpandable && (row.health === "degraded" || row.health === "unavailable");
+}
+
+function isExpanded(row: (typeof store.rows)[number]) {
+  return expandedRowKey.value === rowKey(row);
+}
+
+function toggleRow(row: (typeof store.rows)[number]) {
+  if (!isExpandable(row)) {
+    return;
+  }
+
+  expandedRowKey.value = isExpanded(row) ? null : rowKey(row);
+}
 </script>
 
 <template>
@@ -68,23 +89,35 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
                 </tr>
               </thead>
               <tbody>
-                <tr v-for="row in store.rows" :key="`${row.type}-${row.instanceName}`">
-                  <td class="type-cell">{{ row.type }}</td>
-                  <td>
-                    <a class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.instanceName }}</a>
-                    <div class="instance-note">{{ row.note }}</div>
-                  </td>
-                  <td>
-                    <span>{{ row.version }}</span>
-                    <a v-if="shouldShowUpgradeCue(row)" class="upgrade-badge" :href="getUpgradeTargetLink(row)" target="_blank">
-                      <FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" />
-                      <span>v{{ getUpgradeTargetVersion(row) }} available</span>
-                    </a>
-                  </td>
-                  <td>
-                    <span class="health-badge" :class="row.health">{{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}</span>
-                  </td>
-                </tr>
+                <template v-for="row in store.rows" :key="rowKey(row)">
+                  <tr>
+                    <td class="type-cell">{{ row.type }}</td>
+                    <td>
+                      <a class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.instanceName }}</a>
+                      <div class="instance-note">{{ row.note }}</div>
+                    </td>
+                    <td>
+                      <span>{{ row.version }}</span>
+                      <a v-if="shouldShowUpgradeCue(row)" class="upgrade-badge" :href="getUpgradeTargetLink(row)" target="_blank">
+                        <FAIcon class="footer-icon fake-link" :icon="faArrowTurnUp" />
+                        <span>v{{ getUpgradeTargetVersion(row) }} available</span>
+                      </a>
+                    </td>
+                    <td>
+                      <button v-if="isExpandable(row)" type="button" class="health-badge health-badge-button" :class="row.health" :aria-expanded="isExpanded(row)" :aria-controls="`${rowKey(row)}-details`" @click="toggleRow(row)">
+                        {{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}
+                      </button>
+                      <span v-else class="health-badge" :class="row.health">{{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}</span>
+                    </td>
+                  </tr>
+                  <tr v-if="isExpanded(row)" :id="`${rowKey(row)}-details`" class="details-row">
+                    <td colspan="4" class="details-cell">
+                      <ul class="details-list">
+                        <li v-for="detail in row.details" :key="detail">{{ detail }}</li>
+                      </ul>
+                    </td>
+                  </tr>
+                </template>
               </tbody>
             </table>
           </section>
@@ -200,6 +233,20 @@ tbody tr:last-child td {
   white-space: nowrap;
 }
 
+.health-badge-button {
+  border: none;
+  cursor: pointer;
+}
+
+.health-badge-button:hover {
+  filter: brightness(0.97);
+}
+
+.health-badge-button:focus-visible {
+  outline: 2px solid var(--sp-blue);
+  outline-offset: 2px;
+}
+
 .health-badge.healthy {
   background: #e3f6ea;
   color: #1f7a3f;
@@ -215,6 +262,20 @@ tbody tr:last-child td {
   color: #b53a31;
 }
 
+.details-row td {
+  padding-top: 0;
+}
+
+.details-cell {
+  background: #f9fbfb;
+}
+
+.details-list {
+  margin: 0;
+  padding-left: 1.25rem;
+  color: #4c5b5c;
+}
+
 .footer-icon {
   color: var(--sp-blue);
   margin-right: 4px;

From 9c111a33228f79427216587178865ac99e7b56e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 17:47:39 +0200
Subject: [PATCH 24/67] Mock platform health allowed routes

---
 .../test/mocks/scenarios/platform-health/platform-health.ts     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index e754c6b35a..c9c63ce003 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -30,6 +30,8 @@ export const setupComplete = (async () => {
         headers: { "Total-Count": body.filter((check) => check.status === "Fail").length.toString() },
       });
     });
+    driver.mockEndpoint(`${window.defaultConfig.service_control_url}my/routes`, { body: { roles: [], routes: [] } });
+    driver.mockEndpoint(`${window.defaultConfig.monitoring_urls[0]}api/my/routes`, { body: { roles: [], routes: [] } });
     driver.mockEndpointDynamic(`${window.defaultConfig.monitoring_urls[0]}`, "get", () => {
       const body = getPlatformHealthMonitoringRoot();
 

From 556447f706a83e52d9f49322033a3fb15e9c1034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sat, 29 Aug 2026 17:52:58 +0200
Subject: [PATCH 25/67] Fix platform health mock permissions

---
 .../scenarios/platform-health/platform-health.ts  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index c9c63ce003..5ef704a9e0 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -1,4 +1,5 @@
 import * as precondition from "../../../preconditions";
+import { ApiRoutes } from "@/composables/apiRoutes";
 import { createScenario } from "../scenario-helper";
 import { getPlatformHealthCustomChecks, getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
 
@@ -30,8 +31,8 @@ export const setupComplete = (async () => {
         headers: { "Total-Count": body.filter((check) => check.status === "Fail").length.toString() },
       });
     });
-    driver.mockEndpoint(`${window.defaultConfig.service_control_url}my/routes`, { body: { roles: [], routes: [] } });
-    driver.mockEndpoint(`${window.defaultConfig.monitoring_urls[0]}api/my/routes`, { body: { roles: [], routes: [] } });
+    driver.mockEndpoint(`${window.defaultConfig.service_control_url}my/routes`, { body: permissiveManifest() });
+    driver.mockEndpoint(`${window.defaultConfig.monitoring_urls[0]}api/my/routes`, { body: permissiveManifest() });
     driver.mockEndpointDynamic(`${window.defaultConfig.monitoring_urls[0]}`, "get", () => {
       const body = getPlatformHealthMonitoringRoot();
 
@@ -49,3 +50,13 @@ export const setupComplete = (async () => {
 function stateVersion() {
   return "6.19.3";
 }
+
+function permissiveManifest() {
+  return {
+    roles: [],
+    routes: Object.values(ApiRoutes).map((route) => ({
+      method: route.method,
+      url_template: route.path,
+    })),
+  };
+}

From 8ad60770a13f34d7b9f72b679c17bc3dde24b8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 08:15:05 +0200
Subject: [PATCH 26/67] Align platform health mocks and capability docs

---
 docs/frontend/audit-capability-card.md        | 70 +++++++++++--------
 docs/frontend/error-capability-card.md        | 24 +++----
 docs/frontend/monitoring-capability-card.md   | 49 ++++++++-----
 .../test/mocks/platform-health-state.ts       | 14 +---
 src/Frontend/test/mocks/scenarios/index.ts    |  1 -
 .../platform-health-outdated.ts               | 46 ------------
 6 files changed, 84 insertions(+), 120 deletions(-)
 delete mode 100644 src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index 67b919b458..258aca3f99 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -7,19 +7,20 @@ This document describes the audit capability card component, its various states,
 The Audit Capability Card displays on the ServicePulse dashboard and shows the status of the auditing feature. The card's status depends on:
 
 1. Whether audit instances are configured
-2. Whether audit instances are available (online)
-3. Whether successful messages exist (endpoints configured for auditing)
+2. Whether all or only some audit instances are available
+3. Capability-specific message readiness shown by the `Messages` indicator
 4. Whether the ServiceControl version supports the "All Messages" feature (>= 6.6.0)
 
 ## Card States
 
-| Status                   | Condition                                        | Badge       | Action Button |
-|--------------------------|--------------------------------------------------|-------------|---------------|
-| Instance Not Configured  | No audit instances configured                    | -           | Get Started   |
-| Unavailable              | All audit instances offline                      | Unavailable | Learn More    |
-| Degraded                 | Some audit instances offline                     | Degraded    | -             |
-| Endpoints Not Configured | Instance available but no messages OR SC < 6.6.0 | -           | Learn More    |
-| Available                | Instance available with messages AND SC >= 6.6.0 | Available   | View Messages |
+| Status                  | Condition                     | Badge          | Action Button |
+|-------------------------|-------------------------------|----------------|---------------|
+| Instance Not Configured | No audit instances configured | Not configured | Get Started   |
+| Unavailable             | All audit instances offline   | Unavailable    | Learn More    |
+| Degraded                | Some audit instances offline  | Degraded       | Learn More    |
+| Available               | All audit instances available | Available      | View Messages |
+
+The `Messages` indicator carries the capability-specific readiness state. If no successful messages exist yet, or if `All Messages` is not supported, the card can still be `Available` while the indicator is yellow.
 
 ## Manual Testing with Mock Scenarios
 
@@ -57,15 +58,15 @@ Open the browser console to see available scenarios.
 
 #### Available Audit Scenarios
 
-| Scenario                   | Status                   | Badge       | Button        | Description                                                                                          | Indicators                                |
-|----------------------------|--------------------------|-------------|---------------|------------------------------------------------------------------------------------------------------|-------------------------------------------|
-| `audit-no-instance`        | Instance Not Configured  | -           | Get Started   | "A ServiceControl Audit instance has not been configured..."                                         | None                                      |
-| `audit-unavailable`        | Unavailable              | Unavailable | Learn More    | "All ServiceControl Audit instances are configured but not responding..."                            | Instance: ❌                               |
-| `audit-degraded`           | Partially Unavailable    | Degraded    | -             | "Some ServiceControl Audit instances are not responding."                                            | Instance 1: ✅, Instance 2: ❌, Messages: ✅ |
-| `audit-available`          | Available                | Available   | View Messages | "All ServiceControl Audit instances are available and endpoints have been configured..."             | Instance: ✅, Messages: ✅                  |
-| `audit-old-sc-version`     | Endpoints Not Configured | -           | Learn More    | "A ServiceControl Audit instance is connected but no successful messages..."                         | Instance: ✅, Messages: ⚠️ (SC < 6.6.0)    |
-| `audit-no-messages`        | Endpoints Not Configured | -           | Learn More    | "A ServiceControl Audit instance is connected but no successful messages have been processed yet..." | Instance: ✅, Messages: ⚠️                 |
-| `audit-multiple-instances` | Available                | Available   | View Messages | "All ServiceControl Audit instances are available..."                                                | Instance 1: ✅, Instance 2: ✅, Messages: ✅ |
+| Scenario                   | Status                  | Badge          | Button        | Description                                                       | Indicators      |
+|----------------------------|-------------------------|----------------|---------------|-------------------------------------------------------------------|-----------------|
+| `audit-no-instance`        | Instance Not Configured | Not configured | Get Started   | "A ServiceControl Audit instance has not been configured..."     | None            |
+| `audit-unavailable`        | Unavailable             | Unavailable    | Learn More    | "All ServiceControl Audit instances are configured but not responding..." | None    |
+| `audit-degraded`           | Degraded                | Degraded       | Learn More    | "Some ServiceControl Audit instances are not responding."        | Messages: ✅     |
+| `audit-available`          | Available               | Available      | View Messages | "All ServiceControl Audit instances are available."              | Messages: ✅     |
+| `audit-old-sc-version`     | Available               | Available      | View Messages | "All ServiceControl Audit instances are available."              | Messages: ⚠️     |
+| `audit-no-messages`        | Available               | Available      | View Messages | "All ServiceControl Audit instances are available."              | Messages: ⚠️     |
+| `audit-multiple-instances` | Available               | Available      | View Messages | "All ServiceControl Audit instances are available."              | Messages: ✅     |
 
 **Indicator Legend:** ✅ = Available/Success, ❌ = Unavailable/Error, ⚠️ = Warning/Not Configured
 
@@ -144,17 +145,15 @@ npx vitest run test/specs/platformcapabilities/
 
 #### Application Tests (`audit-capability-card.spec.ts`)
 
-| Rule                            | Test Case                                                     |
-|---------------------------------|---------------------------------------------------------------|
-| No audit instance configured    | Shows "Get Started" button                                    |
-| Audit instance unavailable      | Shows "Unavailable" status                                    |
-| Partially unavailable instances | Shows "Degraded" status                                       |
-| Available but no messages       | Shows "Endpoints Not Configured" status                       |
-| Available with messages         | Shows "Available" status + "View Messages" button             |
-| ServiceControl < 6.6.0          | Shows "Endpoints Not Configured" (All Messages not supported) |
-| Single instance indicator       | Shows "Instance" label                                        |
-| Messages indicator              | Shows "Messages" label when messages exist                    |
-| Multiple instances              | Shows numbered "Instance 1", "Instance 2" labels              |
+| Rule                            | Test Case                                                         |
+|---------------------------------|-------------------------------------------------------------------|
+| No audit instance configured    | Shows "Get Started" button                                      |
+| Audit instance unavailable      | Shows "Unavailable" status                                      |
+| Partially unavailable instances | Shows "Degraded" status                                         |
+| Available but no messages       | Keeps card available and shows a warning `Messages` indicator     |
+| Available with messages         | Shows "Available" status + "View Messages" button               |
+| ServiceControl < 6.6.0          | Keeps card available and shows warning `Messages` indicator       |
+| Shared card signals             | Shows only the shared `Messages` indicator, not per-instance ones |
 
 #### Unit Tests (`auditing-capability-helpers.spec.ts`)
 
@@ -173,9 +172,22 @@ npx vitest run test/specs/platformcapabilities/
 |---------------------------------------------------------------------------------------|----------------------------------------|
 | `src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts` | Main composable and helper functions   |
 | `src/Frontend/src/components/audit/isAllMessagesSupported.ts`                         | Version check for All Messages feature |
+| `src/Frontend/src/stores/PlatformModelStore.ts`                                       | Shared platform model for audit instances |
 | `src/Frontend/test/preconditions/platformCapabilities.ts`                             | Test preconditions and fixtures        |
 | `src/Frontend/test/mocks/scenarios/`                                                  | Manual testing scenarios               |
 
+## Status Indicators
+
+The auditing card no longer renders per-instance widgets.
+
+It shows a single `Messages` indicator when at least one audit instance is available:
+
+- green when `All Messages` is supported and successful messages exist
+- yellow when no successful messages exist yet
+- yellow when the current ServiceControl version does not support `All Messages`
+
+Instance-level audit visibility now lives on the `Platform health` page.
+
 ## Troubleshooting
 
 ### Scenario not loading
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 574102b58c..475badf645 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -4,7 +4,7 @@ This document describes the error/recoverability capability card component, its
 
 ## Overview
 
-The Recoverability Capability Card displays on the ServicePulse dashboard and shows the status of the error handling (recoverability) feature. The card's status depends on whether the ServiceControl instance is available and responding.
+The Recoverability Capability Card displays on the ServicePulse dashboard and shows the status of the error handling (recoverability) feature. The card's status depends on whether the primary ServiceControl instance is available and responding.
 
 Unlike the Monitoring and Auditing cards, the Recoverability card has a simpler state model because:
 
@@ -55,9 +55,9 @@ Open the browser console to see available scenarios.
 
 #### Available Recoverability Scenarios
 
-| Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators          |
-|----------------------------|-----------|-----------|----------------------|---------------------------------------------|---------------------|
-| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | Instance: Available |
+| Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators |
+|----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------|
+| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | None       |
 
 ### Testing "Unavailable" State
 
@@ -143,7 +143,7 @@ npx vitest run test/specs/platformcapabilities/
 | Rule                              | Test Case                                                |
 |-----------------------------------|----------------------------------------------------------|
 | ServiceControl instance available | Shows "Available" status + "View Failed Messages" button |
-| Instance indicator                | Shows "Instance" indicator with version info             |
+| Card widgets                      | Shows no status indicators                               |
 
 **Note:** The "Unavailable" state is not tested because when ServiceControl is unavailable, the entire dashboard is replaced with a connection error view, making the recoverability card inaccessible.
 
@@ -152,17 +152,17 @@ npx vitest run test/specs/platformcapabilities/
 | File                                                                                     | Purpose                                 |
 |------------------------------------------------------------------------------------------|-----------------------------------------|
 | `src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts`       | Main composable for recoverability card |
-| `src/Frontend/src/stores/ConnectionsAndStatsStore.ts`                                    | Connection state management             |
+| `src/Frontend/src/stores/PlatformModelStore.ts`                                          | Shared platform state for primary health |
 | `src/Frontend/test/specs/platformcapabilities/questions/recoverabilityCapabilityCard.ts` | Test helper functions                   |
 | `src/Frontend/test/mocks/scenarios/`                                                     | Manual testing scenarios                |
 
 ## How Recoverability Status is Determined
 
-The recoverability status is determined by checking the ServiceControl connection state:
+The recoverability status is determined by checking the primary instance in the shared platform model:
 
 ```typescript
 // Simplified status determination logic
-const isConnected = connectionState.connected && !connectionState.unableToConnect;
+const isConnected = platformModelStore.primary?.health === "healthy";
 
 if (!isConnected) {
   return CapabilityStatus.Unavailable;
@@ -172,11 +172,9 @@ return CapabilityStatus.Available;
 
 ## Status Indicators
 
-The recoverability card shows a single "Instance" indicator that displays:
+The recoverability card currently shows no status indicators.
 
-- The ServiceControl instance URL
-- The ServiceControl version number
-- Connection status (Available or Unavailable icon)
+Instance-level visibility for ServiceControl now lives on the `Platform health` page instead of on the capability card.
 
 ## Relationship with Dashboard
 
@@ -187,6 +185,8 @@ The Recoverability capability card is tightly coupled to the main ServiceControl
 
 This is different from the Monitoring and Auditing cards, which can show "Unavailable" states independently while the dashboard remains functional.
 
+When the card is in an available or unavailable state, the status badge links to `Platform health`. There is no separate instance widget on the card.
+
 ## Troubleshooting
 
 ### Scenario not loading
diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index 3fe1c7762a..cad9442f8b 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -12,12 +12,12 @@ The Monitoring Capability Card displays on the ServicePulse dashboard and shows
 
 ## Card States
 
-| Status                   | Condition                                         | Badge       | Action Button |
-|--------------------------|---------------------------------------------------|-------------|---------------|
-| Instance Not Configured  | Monitoring URL not configured in ServicePulse     | -           | Get Started   |
-| Unavailable              | Monitoring instance configured but not responding | Unavailable | Learn More    |
-| Endpoints Not Configured | Instance available but no endpoints sending data  | -           | Learn More    |
-| Available                | Instance available with endpoints sending data    | Available   | View Metrics  |
+| Status                   | Condition                                         | Badge          | Action Button |
+|--------------------------|---------------------------------------------------|----------------|---------------|
+| Instance Not Configured  | Monitoring URL not configured in ServicePulse     | Not configured | Get Started   |
+| Unavailable              | Monitoring instance configured but not responding | Unavailable    | Learn More    |
+| Endpoints Not Configured | Instance available but no endpoints sending data  | Not configured | Learn More    |
+| Available                | Instance available with endpoints sending data    | Available      | View Metrics  |
 
 ## Manual Testing with Mock Scenarios
 
@@ -55,11 +55,11 @@ Open the browser console to see available scenarios.
 
 #### Available Monitoring Scenarios
 
-| Scenario                  | Status                   | Badge       | Button       | Description                                                                                                       | Indicators               |
-|---------------------------|--------------------------|-------------|--------------|-------------------------------------------------------------------------------------------------------------------|--------------------------|
-| `monitoring-available`    | Available                | Available   | View Metrics | "The ServiceControl Monitoring instance is available and endpoints have been configured to send throughput data." | Instance: ✅, Metrics: ✅  |
-| `monitoring-unavailable`  | Unavailable              | Unavailable | Learn More   | "The ServiceControl Monitoring instance is configured but not responding..."                                      | Instance: ❌              |
-| `monitoring-no-endpoints` | Endpoints Not Configured | -           | Learn More   | "The ServiceControl Monitoring instance is connected but no endpoints are sending throughput data..."             | Instance: ✅, Metrics: ⚠️ |
+| Scenario                  | Status                   | Badge          | Button       | Description                                                                                                       | Indicators  |
+|---------------------------|--------------------------|----------------|--------------|-------------------------------------------------------------------------------------------------------------------|-------------|
+| `monitoring-available`    | Available                | Available      | View Metrics | "The ServiceControl Monitoring instance is available and endpoints have been configured to send throughput data." | Metrics: ✅ |
+| `monitoring-unavailable`  | Unavailable              | Unavailable    | Learn More   | "The ServiceControl Monitoring instance is configured but not responding..."                                      | None        |
+| `monitoring-no-endpoints` | Endpoints Not Configured | Not configured | Learn More   | "The ServiceControl Monitoring instance is connected but no endpoints are sending throughput data..."             | Metrics: ⚠️ |
 
 **Indicator Legend:** ✅ = Available/Success, ❌ = Unavailable/Error, ⚠️ = Warning/Not Configured
 
@@ -149,14 +149,13 @@ npx vitest run test/specs/platformcapabilities/
 
 #### Application Tests (`monitoring-capability-card.spec.ts`)
 
-| Rule                                      | Test Case                                            |
-|-------------------------------------------|------------------------------------------------------|
-| Available with endpoints sending data     | Shows "Available" status + "View Metrics" button     |
-| Available but no endpoints sending data   | Shows "Endpoints Not Configured" status              |
-| Instance configured but not responding    | Shows "Unavailable" status                           |
-| Monitoring not configured in ServicePulse | Shows "Get Started" button                           |
-| Instance indicator                        | Shows "Instance" label when monitoring is configured |
-| Metrics indicator                         | Shows "Metrics" label when instance is connected     |
+| Rule                                      | Test Case                                                |
+|-------------------------------------------|----------------------------------------------------------|
+| Available with endpoints sending data     | Shows "Available" status + "View Metrics" button       |
+| Available but no endpoints sending data   | Shows "Endpoints Not Configured" status                |
+| Instance configured but not responding    | Shows "Unavailable" status                             |
+| Monitoring not configured in ServicePulse | Shows "Get Started" button                             |
+| Shared card signals                       | Shows only the `Metrics` indicator when connected        |
 
 ## Key Source Files
 
@@ -164,6 +163,7 @@ npx vitest run test/specs/platformcapabilities/
 |-----------------------------------------------------------------------------------------|-------------------------------------|
 | `src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts` | Main composable for monitoring card |
 | `src/Frontend/src/components/monitoring/monitoringClient.ts`                            | Monitoring API client               |
+| `src/Frontend/src/stores/PlatformModelStore.ts`                                         | Shared platform model for monitoring state |
 | `src/Frontend/test/preconditions/platformCapabilities.ts`                               | Test preconditions and fixtures     |
 | `src/Frontend/test/mocks/scenarios/`                                                    | Manual testing scenarios            |
 
@@ -189,6 +189,17 @@ if (!hasMonitoredEndpoints) {
 return CapabilityStatus.Available;
 ```
 
+## Status Indicators
+
+The monitoring card no longer renders a separate instance widget.
+
+It shows a single `Metrics` indicator only when the monitoring instance is configured and connected:
+
+- green when monitored endpoints exist
+- yellow when no endpoints are sending throughput data yet
+
+Instance-level monitoring visibility now lives on the `Platform health` page.
+
 ## Troubleshooting
 
 ### Scenario not loading
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index f8513816d9..af396a6ea5 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -5,7 +5,7 @@ import { createCustomCheck } from "../preconditions/customChecks";
 
 const latestPlatformVersion = "6.19.3";
 
-export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "single-region-outdated" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
 export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
 
 export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
@@ -192,18 +192,6 @@ function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMoc
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
         customChecks: [],
       };
-    case "single-region-outdated":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: latestPlatformVersion, status: "healthy", instanceType: "audit" },
-        ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        customChecks: [],
-      };
     case "multi-region-healthy":
       return {
         scenario: name,
diff --git a/src/Frontend/test/mocks/scenarios/index.ts b/src/Frontend/test/mocks/scenarios/index.ts
index 94466ccd1a..2e41959897 100644
--- a/src/Frontend/test/mocks/scenarios/index.ts
+++ b/src/Frontend/test/mocks/scenarios/index.ts
@@ -38,7 +38,6 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
   "monitoring-no-endpoints": () => import("./monitoring/monitoring-no-endpoints"),
   // Platform health scenarios
   "platform-health": () => import("./platform-health/platform-health"),
-  "platform-health-outdated": () => import("./platform-health/platform-health-outdated"),
   // Recoverability scenarios
   "recoverability-available": () => import("./recoverability/recoverability-available"),
   "recoverability-unavailable": () => import("./recoverability/recoverability-unavailable"),
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts
deleted file mode 100644
index f25ca67de4..0000000000
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health-outdated.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { worker, setupComplete as baseSetupComplete } from "./platform-health";
-import { installPlatformHealthDevControls } from "../../platform-health-state";
-import { makeMockEndpoint, makeMockEndpointDynamic } from "../../../mock-endpoint";
-
-export { worker };
-
-const mockEndpoint = makeMockEndpoint({ mockServer: worker });
-const mockEndpointDynamic = makeMockEndpointDynamic({ mockServer: worker });
-
-export const setupComplete = Promise.resolve().then(async () => {
-  await baseSetupComplete;
-
-  mockEndpointDynamic(`${window.defaultConfig.service_control_url}messages2/*`, "get", () =>
-    Promise.resolve({
-      body: [
-        {
-          id: "msg-1",
-          message_id: "msg-1",
-          message_type: "TestMessage",
-          sending_endpoint: { name: "Sender", host_id: "host-1", host: "localhost" },
-          receiving_endpoint: { name: "Receiver", host_id: "host-2", host: "localhost" },
-          time_sent: new Date().toISOString(),
-          processed_at: new Date().toISOString(),
-          critical_time: "00:00:00.1234567",
-          processing_time: "00:00:00.0123456",
-          delivery_time: "00:00:00.0012345",
-          is_system_message: false,
-          conversation_id: "conv-1",
-          headers: [],
-          status: "Successful",
-          message_intent: "send",
-          body_url: "",
-          body_size: 100,
-          instance_id: "instance-1",
-        },
-      ],
-    })
-  );
-
-  mockEndpoint(`${window.defaultConfig.monitoring_urls[0]}monitored-endpoints`, {
-    body: [{ name: "TestEndpoint" }],
-  });
-
-  installPlatformHealthDevControls();
-  window.__platformHealth?.setScenario("single-region-outdated");
-});

From c9f929c11df125815c95724e914a751af264ec78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 08:24:22 +0200
Subject: [PATCH 27/67] Fix monitoring capability badge state

---
 docs/frontend/monitoring-capability-card.md   | 45 +++++++++----------
 .../capabilities/MonitoringCapability.ts      | 13 +-----
 .../monitoring-capability-card.spec.ts        | 15 +++++--
 3 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index cad9442f8b..bf68a22ea6 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -8,16 +8,17 @@ The Monitoring Capability Card displays on the ServicePulse dashboard and shows
 
 1. Whether the monitoring instance is configured in ServicePulse
 2. Whether the monitoring instance is available (responding)
-3. Whether endpoints are sending throughput data (monitoring plugin enabled)
+3. Capability-specific metrics readiness shown by the `Metrics` indicator
 
 ## Card States
 
-| Status                   | Condition                                         | Badge          | Action Button |
-|--------------------------|---------------------------------------------------|----------------|---------------|
-| Instance Not Configured  | Monitoring URL not configured in ServicePulse     | Not configured | Get Started   |
-| Unavailable              | Monitoring instance configured but not responding | Unavailable    | Learn More    |
-| Endpoints Not Configured | Instance available but no endpoints sending data  | Not configured | Learn More    |
-| Available                | Instance available with endpoints sending data    | Available      | View Metrics  |
+| Status                  | Condition                                         | Badge          | Action Button |
+|-------------------------|---------------------------------------------------|----------------|---------------|
+| Instance Not Configured | Monitoring URL not configured in ServicePulse     | Not configured | Get Started   |
+| Unavailable             | Monitoring instance configured but not responding | Unavailable    | Learn More    |
+| Available               | Monitoring instance configured and responding     | Available      | View Metrics  |
+
+The `Metrics` indicator carries the capability-specific readiness state. If no endpoints are currently sending throughput data, the card still stays `Available` while the indicator is yellow.
 
 ## Manual Testing with Mock Scenarios
 
@@ -55,11 +56,11 @@ Open the browser console to see available scenarios.
 
 #### Available Monitoring Scenarios
 
-| Scenario                  | Status                   | Badge          | Button       | Description                                                                                                       | Indicators  |
-|---------------------------|--------------------------|----------------|--------------|-------------------------------------------------------------------------------------------------------------------|-------------|
-| `monitoring-available`    | Available                | Available      | View Metrics | "The ServiceControl Monitoring instance is available and endpoints have been configured to send throughput data." | Metrics: ✅ |
-| `monitoring-unavailable`  | Unavailable              | Unavailable    | Learn More   | "The ServiceControl Monitoring instance is configured but not responding..."                                      | None        |
-| `monitoring-no-endpoints` | Endpoints Not Configured | Not configured | Learn More   | "The ServiceControl Monitoring instance is connected but no endpoints are sending throughput data..."             | Metrics: ⚠️ |
+| Scenario                  | Status      | Badge       | Button       | Description                                                                                                       | Indicators  |
+|---------------------------|-------------|-------------|--------------|-------------------------------------------------------------------------------------------------------------------|-------------|
+| `monitoring-available`    | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are currently sending throughput data." | Metrics: ✅ |
+| `monitoring-unavailable`  | Unavailable | Unavailable | Learn More   | "The ServiceControl Monitoring instance is configured but not responding..."                                      | None        |
+| `monitoring-no-endpoints` | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are currently sending throughput data." | Metrics: ⚠️ |
 
 **Indicator Legend:** ✅ = Available/Success, ❌ = Unavailable/Error, ⚠️ = Warning/Not Configured
 
@@ -149,13 +150,13 @@ npx vitest run test/specs/platformcapabilities/
 
 #### Application Tests (`monitoring-capability-card.spec.ts`)
 
-| Rule                                      | Test Case                                                |
-|-------------------------------------------|----------------------------------------------------------|
-| Available with endpoints sending data     | Shows "Available" status + "View Metrics" button       |
-| Available but no endpoints sending data   | Shows "Endpoints Not Configured" status                |
-| Instance configured but not responding    | Shows "Unavailable" status                             |
-| Monitoring not configured in ServicePulse | Shows "Get Started" button                             |
-| Shared card signals                       | Shows only the `Metrics` indicator when connected        |
+| Rule                                      | Test Case                                                      |
+|-------------------------------------------|----------------------------------------------------------------|
+| Available with endpoints sending data     | Shows "Available" status + "View Metrics" button             |
+| Available but no endpoints sending data   | Keeps card available and shows a warning `Metrics` indicator   |
+| Instance configured but not responding    | Shows "Unavailable" status                                   |
+| Monitoring not configured in ServicePulse | Shows "Get Started" button                                   |
+| Shared card signals                       | Shows only the `Metrics` indicator when connected              |
 
 ## Key Source Files
 
@@ -169,11 +170,10 @@ npx vitest run test/specs/platformcapabilities/
 
 ## How Monitoring Status is Determined
 
-The monitoring status is determined by checking three conditions in order:
+The monitoring status is determined by checking two conditions in order:
 
 1. **Is monitoring configured?** - Checks if `monitoring_urls` contains a valid URL (not "!" or empty)
 2. **Is the instance responding?** - Checks if the connection to the monitoring instance succeeds
-3. **Are endpoints sending data?** - Checks if any monitored endpoints exist
 
 ```typescript
 // Simplified status determination logic
@@ -183,9 +183,6 @@ if (!isMonitoringEnabled) {
 if (!connectionSuccessful) {
   return CapabilityStatus.Unavailable;
 }
-if (!hasMonitoredEndpoints) {
-  return CapabilityStatus.EndpointsNotConfigured;
-}
 return CapabilityStatus.Available;
 ```
 
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index d86ec38ef0..34d39839bc 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -8,21 +8,17 @@ import routeLinks from "@/router/routeLinks";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 const MonitoringDescriptions: CapabilityStatusToStringMap = {
-  [CapabilityStatus.EndpointsNotConfigured]:
-    "The ServiceControl Monitoring instance is connected but no endpoints are sending throughput data. This may be because no endpoints are running or no endpoints have the monitoring plugin enabled. Click 'Learn More' to find out how to set up monitoring for your endpoints.",
   [CapabilityStatus.InstanceNotConfigured]: "The ServiceControl Monitoring instance is not configured. Click 'Get Started' to learn more about setting up monitoring.",
   [CapabilityStatus.Unavailable]: "The ServiceControl Monitoring instance is configured but not responding. Click 'Learn More' to troubleshoot connection issues.",
-  [CapabilityStatus.Available]: "The ServiceControl Monitoring instance is available and endpoints have been configured to send throughput data.",
+  [CapabilityStatus.Available]: "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are currently sending throughput data.",
 };
 
 const MonitoringHelpButtonText: CapabilityStatusToStringMap = {
-  [CapabilityStatus.EndpointsNotConfigured]: "Learn More",
   [CapabilityStatus.InstanceNotConfigured]: "Get Started",
   [CapabilityStatus.Available]: "View Metrics",
 };
 
 const MonitoringHelpButtonUrl: CapabilityStatusToStringMap = {
-  [CapabilityStatus.EndpointsNotConfigured]: "https://docs.particular.net/monitoring/metrics/install-plugin",
   [CapabilityStatus.InstanceNotConfigured]: "https://docs.particular.net/servicecontrol/monitoring-instances/",
   [CapabilityStatus.Unavailable]: "https://docs.particular.net/servicecontrol/troubleshooting",
   [CapabilityStatus.Available]: routeLinks.monitoring.root,
@@ -57,12 +53,7 @@ export function useMonitoringCapability(): CapabilityComposable {
       return CapabilityStatus.Unavailable;
     }
 
-    // 3. Check if there are any endpoints sending data
-    if (!hasMonitoredEndpoints.value) {
-      return CapabilityStatus.EndpointsNotConfigured;
-    }
-
-    // 4. If all checks pass, monitoring is available
+    // 3. If the instance is configured and reachable, monitoring is available.
     return CapabilityStatus.Available;
   });
 
diff --git a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
index a746a07a61..ed7b69b9c5 100644
--- a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
@@ -50,8 +50,8 @@ describe("FEATURE: Monitoring capability card", () => {
     });
   });
 
-  describe("RULE: When monitoring instance is available but no endpoints are sending data, show 'Endpoints Not Configured' status", () => {
-    test("EXAMPLE: Monitoring instance available but no monitored endpoints shows not configured status", async ({ driver }) => {
+  describe("RULE: When monitoring instance is available but no endpoints are sending data, keep the card available and show the warning on the metrics indicator", () => {
+    test("EXAMPLE: Monitoring instance available but no monitored endpoints still shows available status", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasMonitoringWithNoEndpoints);
@@ -66,12 +66,19 @@ describe("FEATURE: Monitoring capability card", () => {
       });
 
       await waitFor(async () => {
-        expect(await isMonitoringCardNotConfigured()).toBe(true);
+        expect(await isMonitoringCardAvailable()).toBe(true);
       });
 
+      const statusBadge = await monitoringStatusBadge();
+      expect(statusBadge).toBeInTheDocument();
+      expect(statusBadge?.textContent).toMatch(/Available/i);
+
       const actionButton = await monitoringActionButton();
       expect(actionButton).toBeInTheDocument();
-      expect(actionButton?.textContent).toMatch(/Learn More/i);
+      expect(actionButton?.textContent).toMatch(/View Metrics/i);
+
+      const metricsIndicator = await monitoringIndicatorByLabel("Metrics");
+      expect(metricsIndicator).toBeInTheDocument();
     });
   });
 

From 6ac99b2ee8e6bf2157b4f4a1b79e30ab7494c000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 08:37:37 +0200
Subject: [PATCH 28/67] Add recoverability multi-region indicator

---
 docs/frontend/error-capability-card.md        | 20 +++++++---
 .../capabilities/ErrorCapability.ts           | 15 +++++++-
 .../preconditions/platformCapabilities.ts     | 18 +++++++++
 .../recoverability-capability-card.spec.ts    | 37 +++++++++++++++++--
 4 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 475badf645..69f6ab728a 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -55,9 +55,9 @@ Open the browser console to see available scenarios.
 
 #### Available Recoverability Scenarios
 
-| Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators |
-|----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------|
-| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | None       |
+| Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators                         |
+|----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------------------------------|
+| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | `FailedMessages`: ⚠️ in multi-region, ✅ in single-region |
 
 ### Testing "Unavailable" State
 
@@ -143,7 +143,8 @@ npx vitest run test/specs/platformcapabilities/
 | Rule                              | Test Case                                                |
 |-----------------------------------|----------------------------------------------------------|
 | ServiceControl instance available | Shows "Available" status + "View Failed Messages" button |
-| Card widgets                      | Shows no status indicators                               |
+| Single-region management          | Shows a green `FailedMessages` indicator                 |
+| Multi-region management           | Shows a yellow `FailedMessages` indicator                |
 
 **Note:** The "Unavailable" state is not tested because when ServiceControl is unavailable, the entire dashboard is replaced with a connection error view, making the recoverability card inaccessible.
 
@@ -172,9 +173,16 @@ return CapabilityStatus.Available;
 
 ## Status Indicators
 
-The recoverability card currently shows no status indicators.
+The recoverability card shows a single `FailedMessages` indicator whenever the primary ServiceControl instance is available.
 
-Instance-level visibility for ServiceControl now lives on the `Platform health` page instead of on the capability card.
+- green when failures can be managed from the current ServicePulse instance
+- yellow in multi-region mode, where failure management is read-only from the cross-region view
+
+Tooltip text for multi-region mode:
+
+`Message failures are read only in multi-region mode, use the region specific ServicePulse to manage failures.`
+
+Instance-level visibility for ServiceControl still lives on the `Platform health` page instead of on the capability card.
 
 ## Relationship with Dashboard
 
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index aae283aa52..47b2f9ebdf 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -4,6 +4,9 @@ import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabil
 import routeLinks from "@/router/routeLinks";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
+const singleRegionTooltip = "Message failures can be managed from this ServicePulse instance.";
+const multiRegionTooltip = "Message failures are read only in multi-region mode, use the region specific ServicePulse to manage failures.";
+
 const ErrorDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.Unavailable]: "The ServiceControl instance is not responding.",
   [CapabilityStatus.Available]: "The ServiceControl instance is available.",
@@ -19,7 +22,7 @@ const ErrorHelpButtonUrl: CapabilityStatusToStringMap = {
 };
 
 export function useErrorCapability(): CapabilityComposable {
-  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus } = useCapabilityBase();
+  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
   const platformModelStore = usePlatformModelStore();
 
   // Check if instance is connected
@@ -42,13 +45,21 @@ export function useErrorCapability(): CapabilityComposable {
   // Determine help button URL based on status
   const errorHelpButtonUrl = computed(() => getHelpButtonUrlForStatus(errorStatus.value, ErrorHelpButtonUrl));
 
+  const errorIndicators = computed(() => {
+    if (!isConnected.value) {
+      return [];
+    }
+
+    return [createIndicator("FailedMessages", platformModelStore.isMultiRegion ? CapabilityStatus.PartiallyUnavailable : CapabilityStatus.Available, platformModelStore.isMultiRegion ? multiRegionTooltip : singleRegionTooltip)];
+  });
+
   // Loading state - error is loading if we haven't attempted connection yet
   const isLoading = computed(() => platformModelStore.model === null);
 
   return {
     status: errorStatus,
     description: errorDescription,
-    indicators: computed(() => []),
+    indicators: errorIndicators,
     isLoading,
     helpButtonText: errorHelpButtonText,
     helpButtonUrl: errorHelpButtonUrl,
diff --git a/src/Frontend/test/preconditions/platformCapabilities.ts b/src/Frontend/test/preconditions/platformCapabilities.ts
index 37662b453f..eab1a73ded 100644
--- a/src/Frontend/test/preconditions/platformCapabilities.ts
+++ b/src/Frontend/test/preconditions/platformCapabilities.ts
@@ -193,6 +193,24 @@ export const hasMultipleMonitoredEndpoints =
 // RECOVERABILITY CAPABILITY
 // =============================================================================
 
+/** Precondition: A remote error instance is configured, putting Recoverability into multi-region mode */
+export const hasRemoteErrorInstance = ({ driver }: SetupFactoryOptions) => {
+  driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
+    body: [
+      {
+        api_uri: "http://localhost:33337/api/",
+        version: "6.19.3",
+        status: RemoteInstanceStatus.Online,
+        configuration: {
+          data_retention: {
+            error_retention_period: "30.00:00:00",
+          },
+        },
+      },
+    ],
+  });
+};
+
 /** Precondition: ServiceControl instance is unavailable */
 export const hasServiceControlUnavailable = ({ driver }: SetupFactoryOptions) => {
   const serviceControlInstanceUrl = window.defaultConfig.service_control_url;
diff --git a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
index ddd504f183..d8bf3bb500 100644
--- a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
@@ -2,7 +2,7 @@ import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
 import { waitFor } from "@testing-library/vue";
-import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, recoverabilityStatusIndicators, isRecoverabilityCardAvailable } from "./questions/recoverabilityCapabilityCard";
+import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, recoverabilityStatusIndicators, isRecoverabilityCardAvailable, recoverabilityIndicatorByLabel } from "./questions/recoverabilityCapabilityCard";
 
 // NOTE: The Recoverability card has two states: Available and Unavailable.
 // However, the Unavailable state cannot be tested because when ServiceControl
@@ -38,10 +38,11 @@ describe("FEATURE: Recoverability capability card", () => {
     });
   });
 
-  describe("RULE: Recoverability card no longer duplicates instance-level widgets", () => {
-    test("EXAMPLE: Shows no status indicators", async ({ driver }) => {
+  describe("RULE: Recoverability card shows capability-specific failure management guidance", () => {
+    test("EXAMPLE: Single-region setup shows a green FailedMessages indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(precondition.hasNoAuditInstances);
 
       // Act
       await driver.goTo("/");
@@ -54,8 +55,36 @@ describe("FEATURE: Recoverability capability card", () => {
 
       await waitFor(async () => {
         const indicators = await recoverabilityStatusIndicators();
-        expect(indicators).toHaveLength(0);
+        expect(indicators).toHaveLength(1);
       });
+
+      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
+      expect(failedMessagesIndicator).toBeInTheDocument();
+      expect(failedMessagesIndicator?.textContent).toContain("FailedMessages");
+      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
+    });
+
+    test("EXAMPLE: Multi-region setup shows a yellow FailedMessages indicator", async ({ driver }) => {
+      // Arrange
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(precondition.hasRemoteErrorInstance);
+
+      // Act
+      await driver.goTo("/");
+
+      // Assert
+      await waitFor(async () => {
+        const card = await recoverabilityCapabilityCard();
+        expect(card).toBeInTheDocument();
+      });
+
+      await waitFor(async () => {
+        expect(await isRecoverabilityCardAvailable()).toBe(true);
+      });
+
+      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
+      expect(failedMessagesIndicator).toBeInTheDocument();
+      expect(failedMessagesIndicator?.querySelector(".light-warning")).not.toBeNull();
     });
   });
 });

From 76007c55d0f17baabf6e2205f7d7c4a4af0b34a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 08:50:47 +0200
Subject: [PATCH 29/67] Document platform health page

---
 docs/frontend/platform-health-page.md | 221 ++++++++++++++++++++++++++
 1 file changed, 221 insertions(+)
 create mode 100644 docs/frontend/platform-health-page.md

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
new file mode 100644
index 0000000000..4fb6710de3
--- /dev/null
+++ b/docs/frontend/platform-health-page.md
@@ -0,0 +1,221 @@
+# Platform Health Page Testing Guide
+
+This document describes the Platform health page, how it derives its rows and severity, and how to test it manually and automatically.
+
+## Overview
+
+The Platform health page provides instance-level visibility across the ServiceControl platform.
+
+It is intentionally frontend-first and mock-driven in this branch. The page:
+
+- uses the shared platform model from `PlatformModelStore` as its source of truth for platform instances
+- derives page-specific row and details behavior in `PlatformHealthStore`
+- keeps topology and instance visibility on the page instead of duplicating per-instance widgets on capability cards
+- uses built-in platform custom checks as secondary health signals for page-specific health inference
+
+## Page Behavior
+
+The page renders one row per platform instance:
+
+- primary error instance
+- zero or more remote instances
+- monitoring instance when configured
+
+Each row shows:
+
+- instance type
+- instance name, linked directly to that instance `apiUrl`
+- current version
+- health state
+- upgrade cue when a newer version is known
+
+Rows for degraded or unavailable instances can expand to show details.
+
+Those details come from:
+
+- matching built-in platform custom checks when available
+- fallback page-specific messages when no custom-check detail is available
+
+## Severity Model
+
+The page-level severity shown in navigation follows this precedence:
+
+1. `danger`
+2. `warning`
+3. `info` for outdated-only states
+
+Current severity rules:
+
+- `danger`
+  - primary error instance unavailable
+  - any remote error instance not healthy
+  - monitoring unavailable
+- `warning`
+  - primary error instance degraded
+  - any audit instance degraded
+- `none`
+  - no availability or degradation issues
+
+When severity is `none` but at least one row has an upgrade cue, the nav shows the info/outdated-only state.
+
+## Shared Model Split
+
+The current architecture intentionally separates shared platform state from page-specific health semantics:
+
+- `src/Frontend/src/stores/PlatformModelStore.ts`
+  - shared aggregation and normalization layer
+- `src/Frontend/src/resources/PlatformModel.ts`
+  - shared platform types including `PlatformInstance`
+- `src/Frontend/src/stores/PlatformHealthStore.ts`
+  - page-specific severity, rows, upgrade cues, and details
+
+`PlatformHealthRow` remains page-specific and is not pushed into the shared platform model.
+
+## Built-In Custom Checks
+
+Built-in platform custom checks are hidden by default from the Custom Checks page, dashboard tile, and menu badge.
+
+On Platform health they are still used as secondary signals to:
+
+- degrade or fail platform-health rows
+- populate expanded row details, including `failure_reason`
+
+The lookup is curated by `category + custom_check_id`, not by `custom_check_id` alone.
+
+## Manual Testing with Mock Scenarios
+
+### Prerequisites
+
+```bash
+cd src/Frontend
+npm install
+```
+
+### Running the Dev Server with Mocks
+
+```bash
+VITE_MOCK_SCENARIO=platform-health npm run dev:mocks
+```
+
+This starts the dev server at `http://localhost:5173` with the shared Platform health mock controls enabled.
+
+### Startup Scenario
+
+The Platform health page currently has a single startup scenario:
+
+- `platform-health`
+
+After startup, use the browser console runtime helpers to switch topology, status, and custom-check conditions live.
+
+### Runtime Helpers
+
+```javascript
+window.__platformHealth.getState()
+window.__platformHealth.getCustomChecks()
+window.__platformHealth.reset()
+window.__platformHealth.setScenario("single-region-healthy")
+window.__platformHealth.setStatus("remote-0", "degraded")
+window.__platformHealth.setCustomCheckPreset("platform-only-primary")
+window.__platformHealth.setCustomChecks([])
+window.__platformHealth.clearCustomChecks()
+```
+
+### Topology Scenarios
+
+Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
+
+| Scenario | Purpose |
+|----------|---------|
+| `single-region-healthy` | Primary and monitoring healthy, audit remotes healthy |
+| `single-region-warning` | Monitoring healthy, one degraded audit instance |
+| `single-region-danger` | Primary unavailable, audit degraded, monitoring unavailable |
+| `multi-region-healthy` | Primary healthy with remote error instances and no monitoring |
+| `multi-region-danger` | One remote error instance unavailable |
+
+### Custom Check Presets
+
+Switch custom-check state independently with `window.__platformHealth.setCustomCheckPreset(...)`:
+
+| Preset | Purpose |
+|--------|---------|
+| `none` | No custom checks |
+| `user-only` | Non-platform custom checks only |
+| `platform-only-primary` | Built-in primary critical-error signal |
+| `platform-only-primary-degraded` | Built-in primary degraded signal |
+| `platform-only-audit` | Built-in audit degraded signal |
+| `mixed-primary-and-user` | Combined platform and user checks |
+
+### Manual Checks
+
+Verify these behaviors from the single startup scenario plus runtime switches:
+
+| Behavior | How to exercise it |
+|----------|--------------------|
+| Healthy single-region table | `setScenario("single-region-healthy")` |
+| Warning state from degraded audit instance | `setScenario("single-region-warning")` |
+| Danger state from unavailable instances | `setScenario("single-region-danger")` or `setScenario("multi-region-danger")` |
+| Multi-region topology | `setScenario("multi-region-healthy")` |
+| Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
+| Expanded row details with `failure_reason` | trigger degraded/unavailable row, then click the health badge |
+| Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
+| Support-case modal download flow | click `Open support case`, download the JSON, then verify the support link becomes enabled |
+
+## Automated Tests
+
+### Test Files
+
+| File | Type | Description |
+|------|------|-------------|
+| `src/Frontend/src/stores/PlatformHealthStore.spec.ts` | Component/unit | Platform health severity, row derivation, and built-in check inference |
+| `src/Frontend/src/views/PlatformHealthView.spec.ts` | Component | Page rendering, upgrade cues, row expansion, and support modal behavior |
+| `src/Frontend/test/mocks/platform-health-state.spec.ts` | Unit | Runtime mock helper behavior and custom-check preset switching |
+
+### Running Automated Tests
+
+From the `src/Frontend` directory:
+
+```bash
+npx vitest run src/stores/PlatformHealthStore.spec.ts
+npx vitest run src/views/PlatformHealthView.spec.ts
+npx vitest run test/mocks/platform-health-state.spec.ts
+```
+
+### Test Coverage
+
+| Area | Covered behavior |
+|------|------------------|
+| Platform health store | warning/danger severity, multi-region danger, monitoring presence, version fallback, built-in custom-check health inference |
+| Platform health view | support download gating, upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
+| Mock helpers | independent topology and custom-check switching |
+
+## Key Source Files
+
+| File | Purpose |
+|------|---------|
+| `src/Frontend/src/views/PlatformHealthView.vue` | Platform health page UI |
+| `src/Frontend/src/stores/PlatformHealthStore.ts` | Page-specific rows, severity, and details |
+| `src/Frontend/src/stores/PlatformModelStore.ts` | Shared platform instance aggregation |
+| `src/Frontend/src/resources/PlatformModel.ts` | Shared platform types |
+| `src/Frontend/src/resources/PlatformHealth.ts` | Page-specific response/row types |
+| `src/Frontend/test/mocks/platform-health-state.ts` | Runtime mock topology and custom-check controls |
+| `src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue` | Navigation severity and tooltip behavior |
+
+## Troubleshooting
+
+### Scenario not loading
+
+1. Check the browser console for errors.
+2. Verify `VITE_MOCK_SCENARIO=platform-health` is set when running `npm run dev:mocks`.
+3. Ensure MSW is enabled.
+
+### Unexpected topology or custom-check state
+
+1. Run `window.__platformHealth.reset()`.
+2. Reapply `setScenario(...)` and `setCustomCheckPreset(...)` separately.
+3. Use `window.__platformHealth.getState()` and `getCustomChecks()` to confirm the active mock state.
+
+### Tests failing
+
+1. Run `npm run type-check`.
+2. Run the focused Platform health specs listed above.
+3. Use `npx vitest run <path> --reporter=verbose` for more detail.

From 3d0df0c44114533566f15666e178e80c8142bd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 10:25:48 +0200
Subject: [PATCH 30/67] Fix platform health mock reloads

---
 src/Frontend/public/mockServiceWorker.js      | 38 +++++++++++++++++--
 .../platform-health/platform-health.ts        |  4 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/Frontend/public/mockServiceWorker.js b/src/Frontend/public/mockServiceWorker.js
index 33dde9e770..036285ff06 100644
--- a/src/Frontend/public/mockServiceWorker.js
+++ b/src/Frontend/public/mockServiceWorker.js
@@ -12,6 +12,26 @@ const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
+function sleep(duration) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, duration)
+  })
+}
+
+async function waitForClientActivation(clientId, timeout = 500) {
+  const startedAt = Date.now()
+
+  while (Date.now() - startedAt < timeout) {
+    if (activeClientIds.has(clientId)) {
+      return true
+    }
+
+    await sleep(10)
+  }
+
+  return activeClientIds.has(clientId)
+}
+
 addEventListener('install', function () {
   self.skipWaiting()
 })
@@ -122,6 +142,10 @@ addEventListener('fetch', function (event) {
  * @param {number} requestInterceptedAt
  */
 async function handleRequest(event, requestId, requestInterceptedAt) {
+  if (event.request.mode === 'navigate' || event.request.destination === 'document') {
+    return fetch(event.request)
+  }
+
   const client = await resolveMainClient(event)
   const requestCloneForEvents = event.request.clone()
   const response = await getResponse(
@@ -244,11 +268,17 @@ async function getResponse(event, client, requestId, requestInterceptedAt) {
   }
 
   // Bypass initial page load requests (i.e. static assets).
-  // The absence of the immediate/parent client in the map of the active clients
-  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
-  // and is not ready to handle requests.
+  // For XHR/fetch requests, wait briefly for the reloaded page to re-activate mocking
+  // so startup API calls do not leak to the real network during reload races.
   if (!activeClientIds.has(client.id)) {
-    return passthrough()
+    if (event.request.destination) {
+      return passthrough()
+    }
+
+    const activated = await waitForClientActivation(client.id)
+    if (!activated) {
+      return passthrough()
+    }
   }
 
   // Notify the client that a request has been intercepted.
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index 5ef704a9e0..5d1ed35436 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -8,9 +8,7 @@ const { worker, driver, runScenario } = createScenario();
 export { worker };
 
 export const setupComplete = (async () => {
-  await runScenario(precondition.scenarioAuthenticatedUser);
-  await runScenario(precondition.hasNoDisconnectedEndpoints);
-  await runScenario(precondition.hasActiveLicense);
+  await runScenario(precondition.serviceControlWithMonitoring);
   await runScenario(() => {
     driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}`, "get", () => {
       const body = getPlatformHealthPrimaryRoot();

From c6000f86910576142937b6ef464d61eb1737d19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 10:34:13 +0200
Subject: [PATCH 31/67] Refine frontend testing docs

---
 docs/frontend/audit-capability-card.md      | 106 ++-----------------
 docs/frontend/error-capability-card.md      | 104 ++----------------
 docs/frontend/monitoring-capability-card.md | 105 ++----------------
 docs/frontend/platform-health-page.md       |  30 ++----
 docs/frontend/testing-basics.md             | 111 ++++++++++++++++++++
 5 files changed, 144 insertions(+), 312 deletions(-)
 create mode 100644 docs/frontend/testing-basics.md

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index 258aca3f99..dc11760610 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -2,6 +2,8 @@
 
 This document describes the audit capability card component, its various states, and how to test them both manually and automatically.
 
+For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
+
 ## Overview
 
 The Audit Capability Card displays on the ServicePulse dashboard and shows the status of the auditing feature. The card's status depends on:
@@ -24,37 +26,7 @@ The `Messages` indicator carries the capability-specific readiness state. If no
 
 ## Manual Testing with Mock Scenarios
 
-### Prerequisites
-
-```bash
-cd src/Frontend
-npm install
-```
-
-### Running the Dev Server with Mocks
-
-```bash
-npm run dev:mocks
-```
-
-This starts the dev server at `http://localhost:5173` with MSW (Mock Service Worker) intercepting API calls.
-
-### Switching Between Scenarios
-
-Set the `VITE_MOCK_SCENARIO` environment variable before running the dev server:
-
-```bash
-# Linux/macOS
-VITE_MOCK_SCENARIO=audit-available npm run dev:mocks
-
-# Windows CMD
-set VITE_MOCK_SCENARIO=audit-available && npm run dev:mocks
-
-# Windows PowerShell
-$env:VITE_MOCK_SCENARIO="audit-available"; npm run dev:mocks
-```
-
-Open the browser console to see available scenarios.
+Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the audit scenarios below.
 
 #### Available Audit Scenarios
 
@@ -70,53 +42,6 @@ Open the browser console to see available scenarios.
 
 **Indicator Legend:** ✅ = Available/Success, ❌ = Unavailable/Error, ⚠️ = Warning/Not Configured
 
-### Adding New Scenarios
-
-1. Add a scenario precondition to `src/Frontend/test/preconditions/platformCapabilities.ts`:
-
-```typescript
-export const scenarioMyScenario = async ({ driver }: SetupFactoryOptions) => {
-  await driver.setUp(precondition.serviceControlWithMonitoring);
-  // Add scenario-specific preconditions here
-};
-```
-
-2. Create a new file in `src/Frontend/test/mocks/scenarios/` (e.g., `my-scenario.ts`):
-
-```typescript
-import { setupWorker } from "msw/browser";
-import { Driver } from "../../driver";
-import { makeMockEndpoint, makeMockEndpointDynamic } from "../../mock-endpoint";
-import * as precondition from "../../preconditions";
-
-export const worker = setupWorker();
-const mockEndpoint = makeMockEndpoint({ mockServer: worker });
-const mockEndpointDynamic = makeMockEndpointDynamic({ mockServer: worker });
-
-const makeDriver = (): Driver => ({
-  goTo() { throw new Error("Not implemented"); },
-  mockEndpoint,
-  mockEndpointDynamic,
-  setUp(factory) { return factory({ driver: this }); },
-  disposeApp() { throw new Error("Not implemented"); },
-});
-
-const driver = makeDriver();
-
-export const setupComplete = (async () => {
-  await driver.setUp(precondition.scenarioMyScenario);
-})();
-```
-
-1. Register it in `src/Frontend/test/mocks/scenarios/index.ts`:
-
-```typescript
-const scenarios: Record<string, () => Promise<ScenarioModule>> = {
-  // ... existing scenarios
-  "my-scenario": () => import("./my-scenario"),
-};
-```
-
 ## Automated Tests
 
 ### Test Files
@@ -128,17 +53,11 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
 
 ### Running Automated Tests
 
-From the `src/Frontend` directory:
+Use the shared commands in `docs/frontend/testing-basics.md`, then run these audit-specific specs:
 
 ```bash
-# Run all audit capability tests
 npx vitest run test/specs/platformcapabilities/audit-capability-card.spec.ts
-
-# Run helper function unit tests
 npx vitest run test/specs/platformcapabilities/auditing-capability-helpers.spec.ts
-
-# Run all platform capability tests
-npx vitest run test/specs/platformcapabilities/
 ```
 
 ### Test Coverage
@@ -190,18 +109,9 @@ Instance-level audit visibility now lives on the `Platform health` page.
 
 ## Troubleshooting
 
-### Scenario not loading
-
-1. Check the browser console for errors
-2. Verify the scenario name matches exactly (case-sensitive)
-3. Ensure MSW is enabled (look for "[MSW] Mocking enabled" in console)
-
-### Tests failing
+Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 
-1. Run `npm run type-check` to verify TypeScript compilation
-2. Check if preconditions are properly set up
-3. Use `--reporter=verbose` for detailed test output:
+Audit-specific checks:
 
-   ```bash
-   npx vitest run test/specs/platformcapabilities/ --reporter=verbose
-   ```
+1. If the card badge is wrong, inspect whether the scenario is changing instance availability or only message readiness.
+2. If the `Messages` indicator is wrong, check both successful-message mocks and the ServiceControl version used by the scenario.
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 69f6ab728a..2057396f33 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -2,6 +2,8 @@
 
 This document describes the error/recoverability capability card component, its various states, and how to test them both manually and automatically.
 
+For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
+
 ## Overview
 
 The Recoverability Capability Card displays on the ServicePulse dashboard and shows the status of the error handling (recoverability) feature. The card's status depends on whether the primary ServiceControl instance is available and responding.
@@ -21,37 +23,7 @@ Unlike the Monitoring and Auditing cards, the Recoverability card has a simpler
 
 ## Manual Testing with Mock Scenarios
 
-### Prerequisites
-
-```bash
-cd src/Frontend
-npm install
-```
-
-### Running the Dev Server with Mocks
-
-```bash
-npm run dev:mocks
-```
-
-This starts the dev server at `http://localhost:5173` with MSW (Mock Service Worker) intercepting API calls.
-
-### Switching Between Scenarios
-
-Set the `VITE_MOCK_SCENARIO` environment variable before running the dev server:
-
-```bash
-# Linux/macOS
-VITE_MOCK_SCENARIO=recoverability-available npm run dev:mocks
-
-# Windows CMD
-set VITE_MOCK_SCENARIO=recoverability-available && npm run dev:mocks
-
-# Windows PowerShell
-$env:VITE_MOCK_SCENARIO="recoverability-available"; npm run dev:mocks
-```
-
-Open the browser console to see available scenarios.
+Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select the recoverability scenario below.
 
 #### Available Recoverability Scenarios
 
@@ -69,53 +41,6 @@ To observe the connection error behavior:
 2. Set `service_control_url` to an invalid/unreachable URL
 3. Run `npm run dev` (without mocks)
 
-### Adding New Scenarios
-
-1. Add a scenario precondition to `src/Frontend/test/preconditions/platformCapabilities.ts`:
-
-```typescript
-export const scenarioMyScenario = async ({ driver }: SetupFactoryOptions) => {
-  await driver.setUp(precondition.serviceControlWithMonitoring);
-  // Add scenario-specific preconditions here
-};
-```
-
-1. Create a new file in `src/Frontend/test/mocks/scenarios/` (e.g., `my-scenario.ts`):
-
-```typescript
-import { setupWorker } from "msw/browser";
-import { Driver } from "../../driver";
-import { makeMockEndpoint, makeMockEndpointDynamic } from "../../mock-endpoint";
-import * as precondition from "../../preconditions";
-
-export const worker = setupWorker();
-const mockEndpoint = makeMockEndpoint({ mockServer: worker });
-const mockEndpointDynamic = makeMockEndpointDynamic({ mockServer: worker });
-
-const makeDriver = (): Driver => ({
-  goTo() { throw new Error("Not implemented"); },
-  mockEndpoint,
-  mockEndpointDynamic,
-  setUp(factory) { return factory({ driver: this }); },
-  disposeApp() { throw new Error("Not implemented"); },
-});
-
-const driver = makeDriver();
-
-export const setupComplete = (async () => {
-  await driver.setUp(precondition.scenarioMyScenario);
-})();
-```
-
-1. Register it in `src/Frontend/test/mocks/scenarios/index.ts`:
-
-```typescript
-const scenarios: Record<string, () => Promise<ScenarioModule>> = {
-  // ... existing scenarios
-  "my-scenario": () => import("./my-scenario"),
-};
-```
-
 ## Automated Tests
 
 ### Test Files
@@ -126,14 +51,10 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
 
 ### Running Automated Tests
 
-From the `src/Frontend` directory:
+Use the shared commands in `docs/frontend/testing-basics.md`, then run this recoverability-specific spec:
 
 ```bash
-# Run all recoverability capability tests
 npx vitest run test/specs/platformcapabilities/recoverability-capability-card.spec.ts
-
-# Run all platform capability tests
-npx vitest run test/specs/platformcapabilities/
 ```
 
 ### Test Coverage
@@ -197,18 +118,9 @@ When the card is in an available or unavailable state, the status badge links to
 
 ## Troubleshooting
 
-### Scenario not loading
-
-1. Check the browser console for errors
-2. Verify the scenario name matches exactly (case-sensitive)
-3. Ensure MSW is enabled (look for "[MSW] Mocking enabled" in console)
-
-### Tests failing
+Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 
-1. Run `npm run type-check` to verify TypeScript compilation
-2. Check if preconditions are properly set up
-3. Use `--reporter=verbose` for detailed test output:
+Recoverability-specific checks:
 
-   ```bash
-   npx vitest run test/specs/platformcapabilities/ --reporter=verbose
-   ```
+1. If the card disappears instead of showing `Unavailable`, confirm the scenario has crossed into full ServiceControl connection failure, which replaces the dashboard.
+2. If the `FailedMessages` indicator is wrong, inspect whether the active topology is single-region or has `remote-error` instances.
diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index bf68a22ea6..c8c42e7d59 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -2,6 +2,8 @@
 
 This document describes the monitoring capability card component, its various states, and how to test them both manually and automatically.
 
+For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
+
 ## Overview
 
 The Monitoring Capability Card displays on the ServicePulse dashboard and shows the status of the monitoring feature. The card's status depends on:
@@ -22,37 +24,7 @@ The `Metrics` indicator carries the capability-specific readiness state. If no e
 
 ## Manual Testing with Mock Scenarios
 
-### Prerequisites
-
-```bash
-cd src/Frontend
-npm install
-```
-
-### Running the Dev Server with Mocks
-
-```bash
-npm run dev:mocks
-```
-
-This starts the dev server at `http://localhost:5173` with MSW (Mock Service Worker) intercepting API calls.
-
-### Switching Between Scenarios
-
-Set the `VITE_MOCK_SCENARIO` environment variable before running the dev server:
-
-```bash
-# Linux/macOS
-VITE_MOCK_SCENARIO=monitoring-available npm run dev:mocks
-
-# Windows CMD
-set VITE_MOCK_SCENARIO=monitoring-available && npm run dev:mocks
-
-# Windows PowerShell
-$env:VITE_MOCK_SCENARIO="monitoring-available"; npm run dev:mocks
-```
-
-Open the browser console to see available scenarios.
+Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the monitoring scenarios below.
 
 #### Available Monitoring Scenarios
 
@@ -79,53 +51,6 @@ window.defaultConfig = {
 };
 ```
 
-### Adding New Scenarios
-
-1. Add a scenario precondition to `src/Frontend/test/preconditions/platformCapabilities.ts`:
-
-```typescript
-export const scenarioMyScenario = async ({ driver }: SetupFactoryOptions) => {
-  await driver.setUp(precondition.serviceControlWithMonitoring);
-  // Add scenario-specific preconditions here
-};
-```
-
-1. Create a new file in `src/Frontend/test/mocks/scenarios/` (e.g., `my-scenario.ts`):
-
-```typescript
-import { setupWorker } from "msw/browser";
-import { Driver } from "../../driver";
-import { makeMockEndpoint, makeMockEndpointDynamic } from "../../mock-endpoint";
-import * as precondition from "../../preconditions";
-
-export const worker = setupWorker();
-const mockEndpoint = makeMockEndpoint({ mockServer: worker });
-const mockEndpointDynamic = makeMockEndpointDynamic({ mockServer: worker });
-
-const makeDriver = (): Driver => ({
-  goTo() { throw new Error("Not implemented"); },
-  mockEndpoint,
-  mockEndpointDynamic,
-  setUp(factory) { return factory({ driver: this }); },
-  disposeApp() { throw new Error("Not implemented"); },
-});
-
-const driver = makeDriver();
-
-export const setupComplete = (async () => {
-  await driver.setUp(precondition.scenarioMyScenario);
-})();
-```
-
-1. Register it in `src/Frontend/test/mocks/scenarios/index.ts`:
-
-```typescript
-const scenarios: Record<string, () => Promise<ScenarioModule>> = {
-  // ... existing scenarios
-  "my-scenario": () => import("./my-scenario"),
-};
-```
-
 ## Automated Tests
 
 ### Test Files
@@ -136,14 +61,10 @@ const scenarios: Record<string, () => Promise<ScenarioModule>> = {
 
 ### Running Automated Tests
 
-From the `src/Frontend` directory:
+Use the shared commands in `docs/frontend/testing-basics.md`, then run this monitoring-specific spec:
 
 ```bash
-# Run all monitoring capability tests
 npx vitest run test/specs/platformcapabilities/monitoring-capability-card.spec.ts
-
-# Run all platform capability tests
-npx vitest run test/specs/platformcapabilities/
 ```
 
 ### Test Coverage
@@ -199,18 +120,10 @@ Instance-level monitoring visibility now lives on the `Platform health` page.
 
 ## Troubleshooting
 
-### Scenario not loading
-
-1. Check the browser console for errors
-2. Verify the scenario name matches exactly (case-sensitive)
-3. Ensure MSW is enabled (look for "[MSW] Mocking enabled" in console)
-
-### Tests failing
+Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 
-1. Run `npm run type-check` to verify TypeScript compilation
-2. Check if preconditions are properly set up
-3. Use `--reporter=verbose` for detailed test output:
+Monitoring-specific checks:
 
-   ```bash
-   npx vitest run test/specs/platformcapabilities/ --reporter=verbose
-   ```
+1. If the badge is wrong, verify whether the scenario is changing instance connectivity or only endpoint throughput presence.
+2. If the `Metrics` indicator is wrong, inspect the `monitored-endpoints` response for the active scenario.
+3. The `Instance Not Configured` case is still a config-driven manual case, not a standard mock scenario.
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 4fb6710de3..a78c72ef99 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -2,6 +2,8 @@
 
 This document describes the Platform health page, how it derives its rows and severity, and how to test it manually and automatically.
 
+For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
+
 ## Overview
 
 The Platform health page provides instance-level visibility across the ServiceControl platform.
@@ -84,20 +86,7 @@ The lookup is curated by `category + custom_check_id`, not by `custom_check_id`
 
 ## Manual Testing with Mock Scenarios
 
-### Prerequisites
-
-```bash
-cd src/Frontend
-npm install
-```
-
-### Running the Dev Server with Mocks
-
-```bash
-VITE_MOCK_SCENARIO=platform-health npm run dev:mocks
-```
-
-This starts the dev server at `http://localhost:5173` with the shared Platform health mock controls enabled.
+Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then use the Platform health scenario and runtime helpers below.
 
 ### Startup Scenario
 
@@ -172,7 +161,7 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 
 ### Running Automated Tests
 
-From the `src/Frontend` directory:
+Use the shared commands in `docs/frontend/testing-basics.md`, then run these Platform health-specific specs:
 
 ```bash
 npx vitest run src/stores/PlatformHealthStore.spec.ts
@@ -202,11 +191,9 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 ## Troubleshooting
 
-### Scenario not loading
+Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 
-1. Check the browser console for errors.
-2. Verify `VITE_MOCK_SCENARIO=platform-health` is set when running `npm run dev:mocks`.
-3. Ensure MSW is enabled.
+Platform health-specific checks:
 
 ### Unexpected topology or custom-check state
 
@@ -216,6 +203,5 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 ### Tests failing
 
-1. Run `npm run type-check`.
-2. Run the focused Platform health specs listed above.
-3. Use `npx vitest run <path> --reporter=verbose` for more detail.
+1. Run the focused Platform health specs listed above.
+2. If row details are wrong, inspect whether the scenario is changing instance health, built-in custom checks, or both.
diff --git a/docs/frontend/testing-basics.md b/docs/frontend/testing-basics.md
new file mode 100644
index 0000000000..962d9aeab8
--- /dev/null
+++ b/docs/frontend/testing-basics.md
@@ -0,0 +1,111 @@
+# Frontend Testing And Mocking Basics
+
+This document covers the shared workflow for frontend mock scenarios and focused Vitest runs.
+
+Use the page-specific docs for feature behavior and scenario meaning:
+
+- `docs/frontend/audit-capability-card.md`
+- `docs/frontend/monitoring-capability-card.md`
+- `docs/frontend/error-capability-card.md`
+- `docs/frontend/platform-health-page.md`
+
+## Prerequisites
+
+```bash
+cd src/Frontend
+npm install
+```
+
+## Running The Dev Server With Mocks
+
+```bash
+npm run dev:mocks
+```
+
+This starts the frontend with MSW intercepting API calls.
+
+## Selecting A Mock Scenario
+
+Set `VITE_MOCK_SCENARIO` before starting `dev:mocks`.
+
+```bash
+# Linux/macOS
+VITE_MOCK_SCENARIO=platform-health npm run dev:mocks
+
+# Windows CMD
+set VITE_MOCK_SCENARIO=platform-health && npm run dev:mocks
+
+# Windows PowerShell
+$env:VITE_MOCK_SCENARIO="platform-health"; npm run dev:mocks
+```
+
+## Where Mock Scenarios Live
+
+- `src/Frontend/test/mocks/scenarios/`
+  - scenario entry points
+- `src/Frontend/test/preconditions/`
+  - reusable API mocks and scenario setup helpers
+- `src/Frontend/test/mocks/scenarios/index.ts`
+  - scenario registry keyed by `VITE_MOCK_SCENARIO`
+
+## Adding A New Scenario
+
+1. Add or reuse preconditions in `src/Frontend/test/preconditions/`.
+2. Create a scenario entry under `src/Frontend/test/mocks/scenarios/`.
+3. Register it in `src/Frontend/test/mocks/scenarios/index.ts`.
+
+Example shape:
+
+```ts
+import { createScenario } from "../scenario-helper";
+import * as precondition from "../../../preconditions";
+
+const { worker, runScenario } = createScenario();
+
+export { worker };
+
+export const setupComplete = (async () => {
+  await runScenario(precondition.scenarioMyScenario);
+})();
+```
+
+## Common Test Commands
+
+Run focused Vitest specs from `src/Frontend`:
+
+```bash
+npx vitest run test/specs/platformcapabilities/monitoring-capability-card.spec.ts
+npx vitest run src/views/PlatformHealthView.spec.ts
+```
+
+Run broader checks:
+
+```bash
+npm run lint
+npm run type-check
+```
+
+Use verbose output when needed:
+
+```bash
+npx vitest run test/specs/platformcapabilities/ --reporter=verbose
+```
+
+## Troubleshooting
+
+### Scenario not loading
+
+1. Check the browser console.
+2. Verify the `VITE_MOCK_SCENARIO` name matches a registered scenario.
+3. Confirm MSW is enabled.
+
+### Reload issues in `dev:mocks`
+
+1. Reload once more after scenario changes if the service worker was updated.
+2. If needed, clear the browser's site data for the local Vite origin and restart `npm run dev:mocks`.
+
+### Test failures
+
+1. Run `npm run type-check`.
+2. Run only the focused spec for the affected page first.
+3. Verify the required preconditions are still registered for that scenario.

From 3cacbb7d880451d8c51d4a2e11f3ed249781590b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 10:43:35 +0200
Subject: [PATCH 32/67] Share platform topology test presets

---
 docs/frontend/audit-capability-card.md        |   2 +
 docs/frontend/error-capability-card.md        |   2 +
 docs/frontend/monitoring-capability-card.md   |   2 +
 docs/frontend/platform-health-page.md         |   2 +
 .../test/mocks/platform-health-state.ts       | 133 +++---------------
 src/Frontend/test/mocks/platform-topology.ts  | 122 ++++++++++++++++
 .../preconditions/platformCapabilities.ts     |  26 +---
 7 files changed, 155 insertions(+), 134 deletions(-)
 create mode 100644 src/Frontend/test/mocks/platform-topology.ts

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index dc11760610..cc34599162 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -28,6 +28,8 @@ The `Messages` indicator carries the capability-specific readiness state. If no
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the audit scenarios below.
 
+For the shared meaning of single-region and multi-region instance topologies, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the auditing-specific layer on top.
+
 #### Available Audit Scenarios
 
 | Scenario                   | Status                  | Badge          | Button        | Description                                                       | Indicators      |
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 2057396f33..f842976b20 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -25,6 +25,8 @@ Unlike the Monitoring and Auditing cards, the Recoverability card has a simpler
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select the recoverability scenario below.
 
+For the shared meaning of primary, remote-error, and multi-region topology states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the recoverability-specific layer on top.
+
 #### Available Recoverability Scenarios
 
 | Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators                         |
diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index c8c42e7d59..df1f5991d4 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -26,6 +26,8 @@ The `Metrics` indicator carries the capability-specific readiness state. If no e
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the monitoring scenarios below.
 
+For the shared meaning of instance topology and availability states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the monitoring-specific layer on top.
+
 #### Available Monitoring Scenarios
 
 | Scenario                  | Status      | Badge       | Button       | Description                                                                                                       | Indicators  |
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index a78c72ef99..9ce827774f 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -4,6 +4,8 @@ This document describes the Platform health page, how it derives its rows and se
 
 For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
 
+This page is also the canonical reference for shared platform topology scenarios used across Platform health and the capability-card docs.
+
 ## Overview
 
 The Platform health page provides instance-level visibility across the ServiceControl platform.
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index af396a6ea5..330fece736 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -2,34 +2,15 @@ import { Status, type default as CustomCheck } from "@/resources/CustomCheck";
 import type { RemoteInstance } from "@/resources/RemoteInstance";
 import type RootUrls from "@/resources/RootUrls";
 import { createCustomCheck } from "../preconditions/customChecks";
+import { clonePlatformTopology, createPlatformTopology, latestPlatformVersion, toRemoteInstances, type PlatformTopology, type PlatformTopologyScenarioName, type PlatformTopologyStatus, updatePlatformTopologyStatus } from "./platform-topology";
 
-const latestPlatformVersion = "6.19.3";
-
-export type PlatformHealthMockScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformHealthMockScenarioName = PlatformTopologyScenarioName;
 export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
 
-export type PlatformHealthMockStatus = "healthy" | "degraded" | "unavailable";
+export type PlatformHealthMockStatus = PlatformTopologyStatus;
 
-export interface PlatformHealthMockState {
-  scenario: PlatformHealthMockScenarioName;
+export interface PlatformHealthMockState extends PlatformTopology {
   customCheckPreset: PlatformHealthCustomCheckPresetName;
-  primary: {
-    name: string;
-    version: string;
-    status: PlatformHealthMockStatus;
-  };
-  remotes: Array<{
-    id: `remote-${number}`;
-    apiUri: string;
-    version: string;
-    status: PlatformHealthMockStatus;
-    instanceType: "audit" | "error";
-  }>;
-  monitoring: {
-    configured: boolean;
-    version: string;
-    status: PlatformHealthMockStatus;
-  } | null;
   customChecks: CustomCheck[];
 }
 
@@ -109,19 +90,7 @@ export function getPlatformHealthPrimaryRoot(): RootUrls {
 }
 
 export function getPlatformHealthRemoteInstances(): RemoteInstance[] {
-  return state.remotes.map(
-    (remote) =>
-      ({
-        api_uri: remote.apiUri,
-        version: remote.version,
-        status: remote.status === "healthy" ? "online" : "unavailable",
-        configuration: {
-          data_retention: remote.instanceType === "error" ? { error_retention_period: "14.00:00:00" } : { audit_retention_period: "7.00:00:00" },
-        },
-        platform_health_status: remote.status,
-        platform_health_id: remote.id,
-      }) as RemoteInstance
-  );
+  return toRemoteInstances(state);
 }
 
 export function getPlatformHealthMonitoringRoot() {
@@ -140,85 +109,13 @@ export function getPlatformHealthCustomChecks() {
 }
 
 function updateStatus(current: PlatformHealthMockState, id: "primary" | "monitoring" | `remote-${number}`, status: PlatformHealthMockStatus) {
-  if (id === "primary") {
-    return { ...current, primary: { ...current.primary, status } };
-  }
-
-  if (id === "monitoring" && current.monitoring) {
-    return { ...current, monitoring: { ...current.monitoring, status } };
-  }
-
   return {
-    ...current,
-    remotes: current.remotes.map((remote) => (remote.id === id ? { ...remote, status } : remote)),
+    ...updatePlatformTopologyStatus(current, id, status),
+    customCheckPreset: current.customCheckPreset,
+    customChecks: current.customChecks.map((check) => structuredClone(check)),
   };
 }
 
-function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMockState {
-  switch (name) {
-    case "single-region-healthy":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
-        ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        customChecks: [],
-      };
-    case "single-region-warning":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
-        ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-        customChecks: [],
-      };
-    case "single-region-danger":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
-        ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
-        customChecks: [],
-      };
-    case "multi-region-healthy":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-        ],
-        monitoring: null,
-        customChecks: [],
-      };
-    case "multi-region-danger":
-      return {
-        scenario: name,
-        customCheckPreset: "none",
-        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
-        ],
-        monitoring: null,
-        customChecks: [],
-      };
-  }
-}
-
 function withCustomChecks(baseState: PlatformHealthMockState, preset: PlatformHealthCustomCheckPresetName, customChecks = createCustomCheckPreset(preset)) {
   return {
     ...baseState,
@@ -279,10 +176,16 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
 
 function cloneState(current: PlatformHealthMockState): PlatformHealthMockState {
   return {
-    ...current,
-    primary: { ...current.primary },
-    remotes: current.remotes.map((remote) => ({ ...remote })),
-    monitoring: current.monitoring ? { ...current.monitoring } : null,
+    ...clonePlatformTopology(current),
+    customCheckPreset: current.customCheckPreset,
     customChecks: current.customChecks.map((check) => structuredClone(check)),
   };
 }
+
+function createScenario(name: PlatformHealthMockScenarioName): PlatformHealthMockState {
+  return {
+    ...createPlatformTopology(name),
+    customCheckPreset: "none",
+    customChecks: [],
+  };
+}
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
new file mode 100644
index 0000000000..0a490bf2a0
--- /dev/null
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -0,0 +1,122 @@
+import { RemoteInstanceStatus, RemoteInstanceType, type RemoteInstance } from "@/resources/RemoteInstance";
+
+export const latestPlatformVersion = "6.19.3";
+
+export type PlatformTopologyScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformTopologyStatus = "healthy" | "degraded" | "unavailable";
+
+export interface PlatformTopologyRemote {
+  id: `remote-${number}`;
+  apiUri: string;
+  version: string;
+  status: PlatformTopologyStatus;
+  instanceType: "audit" | "error";
+}
+
+export interface PlatformTopology {
+  scenario: PlatformTopologyScenarioName;
+  primary: {
+    name: string;
+    version: string;
+    status: PlatformTopologyStatus;
+  };
+  remotes: PlatformTopologyRemote[];
+  monitoring: {
+    configured: boolean;
+    version: string;
+    status: PlatformTopologyStatus;
+  } | null;
+}
+
+export function createPlatformTopology(name: PlatformTopologyScenarioName): PlatformTopology {
+  switch (name) {
+    case "single-region-healthy":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+      };
+    case "single-region-warning":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+      };
+    case "single-region-danger":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+      };
+    case "multi-region-healthy":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+        ],
+        monitoring: null,
+      };
+    case "multi-region-danger":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
+        ],
+        monitoring: null,
+      };
+  }
+}
+
+export function clonePlatformTopology(current: PlatformTopology): PlatformTopology {
+  return {
+    ...current,
+    primary: { ...current.primary },
+    remotes: current.remotes.map((remote) => ({ ...remote })),
+    monitoring: current.monitoring ? { ...current.monitoring } : null,
+  };
+}
+
+export function updatePlatformTopologyStatus(current: PlatformTopology, id: "primary" | "monitoring" | `remote-${number}`, status: PlatformTopologyStatus): PlatformTopology {
+  if (id === "primary") {
+    return { ...current, primary: { ...current.primary, status } };
+  }
+
+  if (id === "monitoring" && current.monitoring) {
+    return { ...current, monitoring: { ...current.monitoring, status } };
+  }
+
+  return {
+    ...current,
+    remotes: current.remotes.map((remote) => (remote.id === id ? { ...remote, status } : remote)),
+  };
+}
+
+export function toRemoteInstances(topology: Pick<PlatformTopology, "remotes">): RemoteInstance[] {
+  return topology.remotes.map((remote) => ({
+    api_uri: remote.apiUri,
+    version: remote.version,
+    status: remote.status === "healthy" ? RemoteInstanceStatus.Online : RemoteInstanceStatus.Unavailable,
+    configuration: {
+      data_retention: remote.instanceType === "error" ? { error_retention_period: "14.00:00:00" } : { audit_retention_period: "7.00:00:00" },
+    },
+    platform_health_status: remote.status,
+    platform_health_id: remote.id,
+    cachedInstanceType: remote.instanceType === "error" ? RemoteInstanceType.Error : RemoteInstanceType.Audit,
+  }));
+}
diff --git a/src/Frontend/test/preconditions/platformCapabilities.ts b/src/Frontend/test/preconditions/platformCapabilities.ts
index eab1a73ded..89919f1e36 100644
--- a/src/Frontend/test/preconditions/platformCapabilities.ts
+++ b/src/Frontend/test/preconditions/platformCapabilities.ts
@@ -2,6 +2,7 @@ import { type RemoteInstance, RemoteInstanceStatus, RemoteInstanceType } from "@
 import { type default as Message, MessageStatus } from "@/resources/Message";
 import type { Endpoint } from "@/resources/MonitoringEndpoint";
 import { monitoredEndpointTemplate } from "../mocks/monitored-endpoint-template";
+import { createPlatformTopology, toRemoteInstances } from "../mocks/platform-topology";
 import type { SetupFactoryOptions } from "../driver";
 import * as precondition from ".";
 
@@ -80,7 +81,7 @@ export const hasAvailableAuditInstance =
 
 /** Precondition: Single audit instance that is unavailable */
 export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) => {
-  const instance = createAuditInstance({ status: RemoteInstanceStatus.Unavailable });
+  const [instance] = toRemoteInstances({ remotes: [createPlatformTopology("single-region-danger").remotes[1]] });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
     body: [instance],
   });
@@ -88,19 +89,17 @@ export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) =>
 
 /** Precondition: Multiple audit instances with mixed availability */
 export const hasPartiallyUnavailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const onlineInstance = createAuditInstance({ apiUri: "http://localhost:33334/api/" });
-  const offlineInstance = createAuditInstance({ apiUri: "http://localhost:33336/api/", status: RemoteInstanceStatus.Unavailable });
+  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-warning").remotes });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
-    body: [onlineInstance, offlineInstance],
+    body: remotes,
   });
 };
 
 /** Precondition: Multiple audit instances all online */
 export const hasMultipleAvailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const instance1 = createAuditInstance({ apiUri: "http://localhost:33334/api/" });
-  const instance2 = createAuditInstance({ apiUri: "http://localhost:33336/api/" });
+  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-healthy").remotes });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
-    body: [instance1, instance2],
+    body: remotes,
   });
 };
 
@@ -196,18 +195,7 @@ export const hasMultipleMonitoredEndpoints =
 /** Precondition: A remote error instance is configured, putting Recoverability into multi-region mode */
 export const hasRemoteErrorInstance = ({ driver }: SetupFactoryOptions) => {
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
-    body: [
-      {
-        api_uri: "http://localhost:33337/api/",
-        version: "6.19.3",
-        status: RemoteInstanceStatus.Online,
-        configuration: {
-          data_retention: {
-            error_retention_period: "30.00:00:00",
-          },
-        },
-      },
-    ],
+    body: toRemoteInstances({ remotes: [createPlatformTopology("multi-region-healthy").remotes[0]] }),
   });
 };
 

From 59ffa2bb6294cc7430a075ea9cfb76c4f6b7015d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 10:46:42 +0200
Subject: [PATCH 33/67] Remove platform health summary banner

---
 src/Frontend/src/views/PlatformHealthView.vue | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 4e31de107d..85ac22bb4a 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { ref } from "vue";
 import LicenseNotExpired from "@/components/LicenseNotExpired.vue";
 import ActionButton from "@/components/ActionButton.vue";
 import PlatformHealthSupportModal from "@/components/platformhealth/PlatformHealthSupportModal.vue";
@@ -13,12 +13,6 @@ useEnvironmentAndVersionsAutoRefresh();
 const showSupportModal = ref(false);
 const expandedRowKey = ref<string | null>(null);
 
-const issueSummaryClass = computed(() => ({
-  "issues-summary": true,
-  warning: store.severity === "warning",
-  danger: store.severity === "danger",
-}));
-
 function openSupportModal() {
   showSupportModal.value = true;
 }
@@ -70,12 +64,6 @@ function toggleRow(row: (typeof store.rows)[number]) {
         </div>
       </div>
 
-      <div class="row">
-        <div class="col-sm-12">
-          <p v-if="store.issueSummary !== 'No issues detected.'" :class="issueSummaryClass">{{ store.issueSummary }}</p>
-        </div>
-      </div>
-
       <div class="row">
         <div class="col-sm-12">
           <section class="panel table-wrap" aria-label="Platform health table">
@@ -147,19 +135,6 @@ function toggleRow(row: (typeof store.rows)[number]) {
   max-width: 760px;
 }
 
-.issues-summary {
-  font-weight: 700;
-  margin-bottom: 1rem;
-}
-
-.issues-summary.warning {
-  color: #9b6200;
-}
-
-.issues-summary.danger {
-  color: #b53a31;
-}
-
 .panel {
   background: #fff;
   border: 1px solid #dfe7e8;

From e0c1aa082f7a78013b8b5a71cfb9d29775d24b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 12:06:43 +0200
Subject: [PATCH 34/67] Correlate platform checks to instances

---
 docs/frontend/audit-capability-card.md        |   6 +-
 docs/frontend/custom-checks-page.md           | 115 ++++++++++++++++++
 docs/frontend/error-capability-card.md        |   6 +-
 docs/frontend/monitoring-capability-card.md   |  12 +-
 docs/frontend/platform-health-page.md         |  38 +++---
 docs/frontend/testing-basics.md               |   3 +-
 src/Frontend/src/resources/RemoteInstance.ts  |   5 +
 .../src/stores/PlatformHealthStore.spec.ts    |  70 ++++++++++-
 .../src/stores/PlatformHealthStore.ts         |  58 ++++-----
 .../src/stores/PlatformModelStore.spec.ts     |  25 ++++
 src/Frontend/src/stores/PlatformModelStore.ts |   2 +-
 .../test/mocks/platform-health-state.spec.ts  |  17 +++
 .../test/mocks/platform-health-state.ts       |   2 +-
 src/Frontend/test/mocks/platform-topology.ts  |   4 +-
 14 files changed, 285 insertions(+), 78 deletions(-)
 create mode 100644 docs/frontend/custom-checks-page.md

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index cc34599162..c19b71c535 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -22,7 +22,7 @@ The Audit Capability Card displays on the ServicePulse dashboard and shows the s
 | Degraded                | Some audit instances offline  | Degraded       | Learn More    |
 | Available               | All audit instances available | Available      | View Messages |
 
-The `Messages` indicator carries the capability-specific readiness state. If no successful messages exist yet, or if `All Messages` is not supported, the card can still be `Available` while the indicator is yellow.
+The `Messages` indicator carries the capability-specific readiness state. If no successful messages exist yet, or if `All Messages` is not supported, the card remains `Available` while the indicator is yellow.
 
 ## Manual Testing with Mock Scenarios
 
@@ -30,7 +30,7 @@ Start from the shared frontend mocking workflow in `docs/frontend/testing-basics
 
 For the shared meaning of single-region and multi-region instance topologies, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the auditing-specific layer on top.
 
-#### Available Audit Scenarios
+### Available Audit Scenarios
 
 | Scenario                   | Status                  | Badge          | Button        | Description                                                       | Indicators      |
 |----------------------------|-------------------------|----------------|---------------|-------------------------------------------------------------------|-----------------|
@@ -107,7 +107,7 @@ It shows a single `Messages` indicator when at least one audit instance is avail
 - yellow when no successful messages exist yet
 - yellow when the current ServiceControl version does not support `All Messages`
 
-Instance-level audit visibility now lives on the `Platform health` page.
+Instance-level audit visibility lives on the `Platform health` page.
 
 ## Troubleshooting
 
diff --git a/docs/frontend/custom-checks-page.md b/docs/frontend/custom-checks-page.md
new file mode 100644
index 0000000000..414f3a04d0
--- /dev/null
+++ b/docs/frontend/custom-checks-page.md
@@ -0,0 +1,115 @@
+# Custom Checks Page Testing Guide
+
+This document describes the frontend Custom Checks page behavior, with a focus on built-in platform custom checks and how they relate to other frontend views.
+
+For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
+
+## Overview
+
+The Custom Checks page shows failing custom checks reported to ServiceControl.
+
+Built-in platform custom checks are handled differently from user-defined custom checks:
+
+- they are hidden by default from the Custom Checks page
+- they are hidden by default from the Custom Checks dashboard tile and menu badge
+- operators can reveal them with `Show platform custom checks`
+- Platform health consumes those built-in checks as secondary platform signals
+
+## Built-In Platform Custom Checks
+
+The built-in platform custom check catalog is curated in:
+
+- `src/Frontend/src/components/customchecks/builtInPlatformChecks.ts`
+
+The frontend uses that catalog for two different purposes:
+
+1. filtering built-in platform checks out of the Custom Checks UI by default
+2. recognizing built-in platform checks that Platform health can use as secondary instance signals
+
+Recognition is based on:
+
+- `category + custom_check_id`
+
+This is intentional because ServiceControl can reuse the same `custom_check_id` across different categories.
+
+## Page Behavior
+
+The Custom Checks page:
+
+- fetches failed custom checks from `customchecks?status=fail&page=<n>`
+- shows only non-platform custom checks by default
+- exposes `Show platform custom checks` to reveal built-in platform checks
+- keeps pagination tied to the visible filtered list
+
+Relevant frontend pieces:
+
+- `src/Frontend/src/views/CustomChecksView.vue`
+- `src/Frontend/src/stores/CustomChecksStore.ts`
+- `src/Frontend/src/components/customchecks/CustomCheckView.vue`
+
+## Platform Health Relationship
+
+Platform health uses built-in platform checks even when the Custom Checks page hides them.
+
+That logic is documented in:
+
+- `docs/frontend/platform-health-page.md`
+
+When Platform health assigns a built-in degraded check to a specific platform instance, it uses:
+
+- built-in recognition by `category + custom_check_id`
+- instance assignment by `originating_endpoint.name`
+
+The Custom Checks page itself does not perform that instance correlation. It only exposes the raw custom check data and the show/hide toggle.
+
+## Manual Testing with Mock Scenarios
+
+Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`.
+
+For built-in platform custom check behavior, the most useful mock setup is:
+
+- `VITE_MOCK_SCENARIO=platform-health npm run dev:mocks`
+
+Then use:
+
+- `window.__platformHealth.setCustomCheckPreset("none")`
+- `window.__platformHealth.setCustomCheckPreset("user-only")`
+- `window.__platformHealth.setCustomCheckPreset("platform-only-primary")`
+- `window.__platformHealth.setCustomCheckPreset("platform-only-primary-degraded")`
+- `window.__platformHealth.setCustomCheckPreset("platform-only-audit")`
+- `window.__platformHealth.setCustomCheckPreset("mixed-primary-and-user")`
+
+### Manual Checks
+
+| Behavior | How to exercise it |
+|----------|--------------------|
+| Built-in platform checks hidden by default | Apply `platform-only-primary` or `platform-only-audit`, then open Custom Checks page |
+| Built-in platform checks shown when toggled on | Apply a platform-only preset, enable `Show platform custom checks` |
+| User-defined checks visible by default | Apply `user-only` or `mixed-primary-and-user` |
+| Platform health reacts to hidden built-in checks | Apply `platform-only-primary-degraded` or `platform-only-audit`, then compare Platform health with Custom Checks page |
+
+## Automated Tests
+
+### Test Files
+
+| File | Type | Description |
+|------|------|-------------|
+| `src/Frontend/src/stores/CustomChecksStore.spec.ts` | Unit | built-in check filtering and toggle behavior |
+
+### Running Automated Tests
+
+Use the shared commands in `docs/frontend/testing-basics.md`, then run:
+
+```bash
+npx vitest run src/stores/CustomChecksStore.spec.ts
+```
+
+## Troubleshooting
+
+Use `docs/frontend/testing-basics.md` for shared troubleshooting.
+
+Custom Checks-specific checks:
+
+1. If a built-in platform check is visible unexpectedly, confirm `showPlatformCustomChecks` is off.
+2. If Platform health reacts to a check that the page is hiding, that is expected behavior.
+3. If a built-in check is classified incorrectly, inspect `category` and `custom_check_id` against `builtInPlatformChecks.ts`.
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index f842976b20..c5b3c7bd72 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -27,7 +27,7 @@ Start from the shared frontend mocking workflow in `docs/frontend/testing-basics
 
 For the shared meaning of primary, remote-error, and multi-region topology states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the recoverability-specific layer on top.
 
-#### Available Recoverability Scenarios
+### Available Recoverability Scenarios
 
 | Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators                         |
 |----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------------------------------|
@@ -98,14 +98,14 @@ return CapabilityStatus.Available;
 
 The recoverability card shows a single `FailedMessages` indicator whenever the primary ServiceControl instance is available.
 
-- green when failures can be managed from the current ServicePulse instance
+- green when failures can be managed from this ServicePulse instance
 - yellow in multi-region mode, where failure management is read-only from the cross-region view
 
 Tooltip text for multi-region mode:
 
 `Message failures are read only in multi-region mode, use the region specific ServicePulse to manage failures.`
 
-Instance-level visibility for ServiceControl still lives on the `Platform health` page instead of on the capability card.
+Instance-level visibility for ServiceControl lives on the `Platform health` page instead of on the capability card.
 
 ## Relationship with Dashboard
 
diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index df1f5991d4..c80000f34e 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -20,7 +20,7 @@ The Monitoring Capability Card displays on the ServicePulse dashboard and shows
 | Unavailable             | Monitoring instance configured but not responding | Unavailable    | Learn More    |
 | Available               | Monitoring instance configured and responding     | Available      | View Metrics  |
 
-The `Metrics` indicator carries the capability-specific readiness state. If no endpoints are currently sending throughput data, the card still stays `Available` while the indicator is yellow.
+The `Metrics` indicator carries the capability-specific readiness state. If no endpoints are sending throughput data, the card stays `Available` while the indicator is yellow.
 
 ## Manual Testing with Mock Scenarios
 
@@ -28,13 +28,13 @@ Start from the shared frontend mocking workflow in `docs/frontend/testing-basics
 
 For the shared meaning of instance topology and availability states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the monitoring-specific layer on top.
 
-#### Available Monitoring Scenarios
+### Available Monitoring Scenarios
 
 | Scenario                  | Status      | Badge       | Button       | Description                                                                                                       | Indicators  |
 |---------------------------|-------------|-------------|--------------|-------------------------------------------------------------------------------------------------------------------|-------------|
-| `monitoring-available`    | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are currently sending throughput data." | Metrics: ✅ |
+| `monitoring-available`    | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are sending throughput data." | Metrics: ✅ |
 | `monitoring-unavailable`  | Unavailable | Unavailable | Learn More   | "The ServiceControl Monitoring instance is configured but not responding..."                                      | None        |
-| `monitoring-no-endpoints` | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are currently sending throughput data." | Metrics: ⚠️ |
+| `monitoring-no-endpoints` | Available   | Available   | View Metrics | "The ServiceControl Monitoring instance is available. Use the Metrics indicator to see whether endpoints are sending throughput data." | Metrics: ⚠️ |
 
 **Indicator Legend:** ✅ = Available/Success, ❌ = Unavailable/Error, ⚠️ = Warning/Not Configured
 
@@ -118,7 +118,7 @@ It shows a single `Metrics` indicator only when the monitoring instance is confi
 - green when monitored endpoints exist
 - yellow when no endpoints are sending throughput data yet
 
-Instance-level monitoring visibility now lives on the `Platform health` page.
+Instance-level monitoring visibility lives on the `Platform health` page.
 
 ## Troubleshooting
 
@@ -128,4 +128,4 @@ Monitoring-specific checks:
 
 1. If the badge is wrong, verify whether the scenario is changing instance connectivity or only endpoint throughput presence.
 2. If the `Metrics` indicator is wrong, inspect the `monitored-endpoints` response for the active scenario.
-3. The `Instance Not Configured` case is still a config-driven manual case, not a standard mock scenario.
+3. The `Instance Not Configured` case is a config-driven manual case, not a standard mock scenario.
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 9ce827774f..cad0771afa 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -6,16 +6,18 @@ For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.
 
 This page is also the canonical reference for shared platform topology scenarios used across Platform health and the capability-card docs.
 
+For Custom Checks page behavior around built-in platform checks, see `docs/frontend/custom-checks-page.md`.
+
 ## Overview
 
 The Platform health page provides instance-level visibility across the ServiceControl platform.
 
-It is intentionally frontend-first and mock-driven in this branch. The page:
+The page is frontend-first and mock-driven. It:
 
 - uses the shared platform model from `PlatformModelStore` as its source of truth for platform instances
 - derives page-specific row and details behavior in `PlatformHealthStore`
 - keeps topology and instance visibility on the page instead of duplicating per-instance widgets on capability cards
-- uses built-in platform custom checks as secondary health signals for page-specific health inference
+- uses built-in platform custom checks as secondary health signals for page-specific health inference, including instance-mapped degraded states
 
 ## Page Behavior
 
@@ -64,7 +66,7 @@ When severity is `none` but at least one row has an upgrade cue, the nav shows t
 
 ## Shared Model Split
 
-The current architecture intentionally separates shared platform state from page-specific health semantics:
+The architecture intentionally separates shared platform state from page-specific health semantics:
 
 - `src/Frontend/src/stores/PlatformModelStore.ts`
   - shared aggregation and normalization layer
@@ -73,18 +75,20 @@ The current architecture intentionally separates shared platform state from page
 - `src/Frontend/src/stores/PlatformHealthStore.ts`
   - page-specific severity, rows, upgrade cues, and details
 
-`PlatformHealthRow` remains page-specific and is not pushed into the shared platform model.
-
 ## Built-In Custom Checks
 
-Built-in platform custom checks are hidden by default from the Custom Checks page, dashboard tile, and menu badge.
+Platform health consumes built-in platform custom checks as secondary signals even when those checks are hidden by default on the Custom Checks page.
 
-On Platform health they are still used as secondary signals to:
+On Platform health they are used to:
 
 - degrade or fail platform-health rows
 - populate expanded row details, including `failure_reason`
 
-The lookup is curated by `category + custom_check_id`, not by `custom_check_id` alone.
+For the shared built-in-check catalog and Custom Checks page behavior, see `docs/frontend/custom-checks-page.md`.
+
+Platform health-specific rule:
+
+- when assigning a built-in degraded check to a specific instance, use `originating_endpoint.name` to match the emitting platform instance
 
 ## Manual Testing with Mock Scenarios
 
@@ -92,7 +96,7 @@ Start from the shared frontend mocking workflow in `docs/frontend/testing-basics
 
 ### Startup Scenario
 
-The Platform health page currently has a single startup scenario:
+The Platform health page has a single startup scenario:
 
 - `platform-health`
 
@@ -102,15 +106,13 @@ After startup, use the browser console runtime helpers to switch topology, statu
 
 ```javascript
 window.__platformHealth.getState()
-window.__platformHealth.getCustomChecks()
 window.__platformHealth.reset()
 window.__platformHealth.setScenario("single-region-healthy")
 window.__platformHealth.setStatus("remote-0", "degraded")
-window.__platformHealth.setCustomCheckPreset("platform-only-primary")
-window.__platformHealth.setCustomChecks([])
-window.__platformHealth.clearCustomChecks()
 ```
 
+For custom-check-specific helpers and presets, see `docs/frontend/custom-checks-page.md`.
+
 ### Topology Scenarios
 
 Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
@@ -118,8 +120,8 @@ Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
 | Scenario | Purpose |
 |----------|---------|
 | `single-region-healthy` | Primary and monitoring healthy, audit remotes healthy |
-| `single-region-warning` | Monitoring healthy, one degraded audit instance |
-| `single-region-danger` | Primary unavailable, audit degraded, monitoring unavailable |
+| `single-region-warning` | Monitoring healthy, audit remotes healthy; pair with a built-in audit preset to exercise degraded audit state |
+| `single-region-danger` | Primary unavailable, audit remotes healthy, monitoring unavailable |
 | `multi-region-healthy` | Primary healthy with remote error instances and no monitoring |
 | `multi-region-danger` | One remote error instance unavailable |
 
@@ -133,7 +135,7 @@ Switch custom-check state independently with `window.__platformHealth.setCustomC
 | `user-only` | Non-platform custom checks only |
 | `platform-only-primary` | Built-in primary critical-error signal |
 | `platform-only-primary-degraded` | Built-in primary degraded signal |
-| `platform-only-audit` | Built-in audit degraded signal |
+| `platform-only-audit` | Built-in audit degraded signal targeted at a specific audit instance |
 | `mixed-primary-and-user` | Combined platform and user checks |
 
 ### Manual Checks
@@ -143,7 +145,7 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Behavior | How to exercise it |
 |----------|--------------------|
 | Healthy single-region table | `setScenario("single-region-healthy")` |
-| Warning state from degraded audit instance | `setScenario("single-region-warning")` |
+| Warning state from degraded audit instance | `setScenario("single-region-warning")` plus `setCustomCheckPreset("platform-only-audit")` |
 | Danger state from unavailable instances | `setScenario("single-region-danger")` or `setScenario("multi-region-danger")` |
 | Multi-region topology | `setScenario("multi-region-healthy")` |
 | Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
@@ -206,4 +208,4 @@ Platform health-specific checks:
 ### Tests failing
 
 1. Run the focused Platform health specs listed above.
-2. If row details are wrong, inspect whether the scenario is changing instance health, built-in custom checks, or both.
+2. If a degraded row is missing or assigned to the wrong instance, inspect the check's `originating_endpoint.name` and the instance name carried in the platform model.
diff --git a/docs/frontend/testing-basics.md b/docs/frontend/testing-basics.md
index 962d9aeab8..0a74e940f8 100644
--- a/docs/frontend/testing-basics.md
+++ b/docs/frontend/testing-basics.md
@@ -4,6 +4,7 @@ This document covers the shared workflow for frontend mock scenarios and focused
 
 Use the page-specific docs for feature behavior and scenario meaning:
 
+- `docs/frontend/custom-checks-page.md`
 - `docs/frontend/audit-capability-card.md`
 - `docs/frontend/monitoring-capability-card.md`
 - `docs/frontend/error-capability-card.md`
@@ -108,4 +109,4 @@ npx vitest run test/specs/platformcapabilities/ --reporter=verbose
 
 1. Run `npm run type-check`.
 2. Run only the focused spec for the affected page first.
-3. Verify the required preconditions are still registered for that scenario.
+3. Verify the required preconditions are registered for that scenario.
diff --git a/src/Frontend/src/resources/RemoteInstance.ts b/src/Frontend/src/resources/RemoteInstance.ts
index ef31cc98db..3fff19175e 100644
--- a/src/Frontend/src/resources/RemoteInstance.ts
+++ b/src/Frontend/src/resources/RemoteInstance.ts
@@ -3,7 +3,12 @@ export interface RemoteInstanceDataRetention {
   error_retention_period?: string;
 }
 
+export interface RemoteInstanceHostConfiguration {
+  instance_name?: string;
+}
+
 export interface RemoteInstanceConfiguration {
+  host?: RemoteInstanceHostConfiguration;
   data_retention?: RemoteInstanceDataRetention;
 }
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index bc04a16978..2679ef4d49 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -22,6 +22,23 @@ describe("PlatformHealthStore", () => {
   });
 
   test("derives warning severity and single-region rows", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/audit-warning",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit-Blue",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
+
     const platformModelStore = usePlatformModelStore();
     platformModelStore.refresh = vi.fn(() => {
       platformModelStore.model = singleRegionWarningModel;
@@ -93,8 +110,11 @@ describe("PlatformHealthStore", () => {
         scenario: "single-region-warning",
         customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
-        remotes: [],
-        monitoring: { configured: true, version: "6.19.3", status: "healthy" },
+        remotes: [
+          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.19.3", status: "healthy", instanceType: "audit" },
+        ],
+        monitoring: { configured: true, version: "6.18.0", status: "healthy" },
         customChecks: [],
       }),
       getCustomChecks: vi.fn(() => []),
@@ -116,7 +136,7 @@ describe("PlatformHealthStore", () => {
 
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
-    expect(store.outdatedOnly).toBe(false);
+    expect(store.outdatedOnly).toBe(true);
   });
 
   test("applies hidden built-in platform custom checks to platform health only", async () => {
@@ -143,7 +163,7 @@ describe("PlatformHealthStore", () => {
         reported_at: "2025-01-10T05:06:30.4074087Z",
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
-          name: "Particular.ServiceControl.Audit",
+          name: "Particular.ServiceControl.Audit-Blue",
           host_id: "host-2",
           host: "Host B",
         },
@@ -160,7 +180,8 @@ describe("PlatformHealthStore", () => {
     await store.refresh();
 
     expect(store.payload?.primary.health).toBe("unavailable");
-    expect(store.payload?.remotes[0].health).toBe("degraded");
+    expect(store.payload?.remotes[0].health).toBe("healthy");
+    expect(store.payload?.remotes[1].health).toBe("degraded");
     expect(store.severity).toBe("danger");
   });
 
@@ -206,6 +227,43 @@ describe("PlatformHealthStore", () => {
     expect(store.issueSummary).toContain("primary Error instance degraded");
     expect(store.rows[0].details).toContain("Error Message Ingestion Process: Error ingestion stopped");
   });
+
+  test("does not degrade an audit instance when the built-in check belongs to another audit instance", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/audit-other-instance",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit.Other",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        remotes: singleRegionWarningModel.remotes.map((remote) => ({
+          ...remote,
+          health: "healthy",
+        })),
+      };
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.payload?.remotes.every((remote) => remote.health === "healthy")).toBe(true);
+    expect(store.severity).toBe("none");
+  });
 });
 
 const singleRegionWarningModel: PlatformModel = {
@@ -234,7 +292,7 @@ const singleRegionWarningModel: PlatformModel = {
       kind: "audit",
       role: "remote-audit",
       version: "6.17.0",
-      health: "degraded",
+      health: "healthy",
       apiUrl: "http://Particular.ServiceControl.Audit-Blue/api/",
     },
   ],
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index b7d9ecf544..befae08f68 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -219,9 +219,9 @@ if (import.meta.hot) {
 export type PlatformHealthStore = ReturnType<typeof usePlatformHealthStore>;
 
 function applyPlatformHealthChecks(model: PlatformModel, checks: CustomCheck[]) {
-  const platformChecks = normalizeChecks(checks).map(getBuiltInPlatformCheck);
-  const primary = applyPlatformCheckHealthToPrimary(model.primary, platformChecks);
-  const remotes = applyPlatformCheckHealthToRemotes(model.remotes, platformChecks);
+  const normalizedChecks = normalizeChecks(checks);
+  const primary = applyPlatformCheckHealthToInstance(model.primary, normalizedChecks);
+  const remotes = model.remotes.map((remote) => applyPlatformCheckHealthToInstance(remote, normalizedChecks));
 
   return {
     ...model,
@@ -247,18 +247,11 @@ function matchesInstance(check: CustomCheck, instance: PlatformInstance) {
     return false;
   }
 
-  switch (platformCheck.target) {
-    case "primary":
-      return instance.role === "primary-error";
-    case "remote-error":
-      return instance.role === "remote-error";
-    case "audit":
-      return instance.role === "remote-audit";
-    case "transport":
-      return instance.role === "remote-audit";
-    default:
-      return false;
+  if (platformCheck.target === "transport") {
+    return instance.role === "remote-audit" && check.originating_endpoint.name === instance.name;
   }
+
+  return check.originating_endpoint.name === instance.name;
 }
 
 function formatCustomCheckDetail(check: CustomCheck) {
@@ -291,34 +284,25 @@ function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
   return [];
 }
 
-function applyPlatformCheckHealthToPrimary(primary: PlatformInstance, platformChecks: Array<ReturnType<typeof getBuiltInPlatformCheck>>) {
-  if (platformChecks.some((check) => check?.target === "primary" && check.severity === "unavailable")) {
-    return { ...primary, health: "unavailable" as const };
-  }
+function applyPlatformCheckHealthToInstance(instance: PlatformInstance, checks: CustomCheck[]) {
+  const matchingPlatformChecks = checks
+    .filter((check) => matchesInstance(check, instance))
+    .map((check) => ({ check, platformCheck: getBuiltInPlatformCheck(check) }))
+    .filter((entry): entry is { check: CustomCheck; platformCheck: NonNullable<ReturnType<typeof getBuiltInPlatformCheck>> } => entry.platformCheck !== null);
 
-  if (platformChecks.some((check) => check?.target === "primary" && check.severity === "degraded") && primary.health === "healthy") {
-    return { ...primary, health: "degraded" as const };
+  if (matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "unavailable")) {
+    return { ...instance, health: "unavailable" as const };
   }
 
-  return primary;
-}
-
-function applyPlatformCheckHealthToRemotes(remotes: PlatformInstance[], platformChecks: Array<ReturnType<typeof getBuiltInPlatformCheck>>) {
-  const hasRemoteUnavailableCheck = platformChecks.some((check) => check?.target === "remote-error" && check.severity === "unavailable");
-  const hasAuditDegradedCheck = platformChecks.some((check) => check?.target === "audit" && check.severity === "degraded");
-  const hasTransportDegradedCheck = platformChecks.some((check) => check?.target === "transport" && check.severity === "degraded");
-
-  return remotes.map((remote) => {
-    if (remote.role === "remote-error" && hasRemoteUnavailableCheck) {
-      return { ...remote, health: "unavailable" as const };
-    }
+  if (instance.health === "healthy" && matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "degraded")) {
+    return { ...instance, health: "degraded" as const };
+  }
 
-    if (remote.role === "remote-audit" && (hasAuditDegradedCheck || hasTransportDegradedCheck) && remote.health === "healthy") {
-      return { ...remote, health: "degraded" as const };
-    }
+  if (instance.health === "degraded" && !matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "degraded")) {
+    return { ...instance, health: "healthy" as const };
+  }
 
-    return remote;
-  });
+  return instance;
 }
 
 function normalizeChecks(checks: CustomCheck[] | unknown) {
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 475c6211b2..9d3fb8a636 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -57,6 +57,31 @@ describe("PlatformModelStore", () => {
     expect(store.errorInstances).toHaveLength(1);
   });
 
+  test("prefers remote configuration host.instance_name over api hostname", async () => {
+    getRoot.mockResolvedValue({
+      name: "Particular.ServiceControl.Primary",
+      platform_health_status: "healthy",
+      platform_health_version: "6.19.3",
+    });
+    getRemoteInstances.mockResolvedValue([
+      {
+        api_uri: "http://localhost:33334/api/",
+        version: "6.19.3",
+        status: "online",
+        configuration: {
+          host: { instance_name: "Particular.ServiceControl.Audit.Blue" },
+          data_retention: { audit_retention_period: "7.00:00:00" },
+        },
+      },
+    ]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.remotes[0].name).toBe("Particular.ServiceControl.Audit.Blue");
+  });
+
   test("uses primary root values directly when the request succeeds", async () => {
     getRoot.mockResolvedValue({
       name: "Particular.ServiceControl.Primary",
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 0353527c2c..b1963a1fbc 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -99,7 +99,7 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
 
     return {
       id: remote.platform_health_id ?? `remote-${index}`,
-      name: extractInstanceName(remote.api_uri),
+      name: remote.configuration?.host?.instance_name ?? extractInstanceName(remote.api_uri),
       kind,
       role: isError ? "remote-error" : "remote-audit",
       version: remote.version,
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
index 73b07b42c9..0793981375 100644
--- a/src/Frontend/test/mocks/platform-health-state.spec.ts
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -40,4 +40,21 @@ describe("platform-health-state", () => {
     expect(checks[0].custom_check_id).toBe("Error Message Ingestion Process");
     expect(checks[0].category).toBe("ServiceControl Health");
   });
+
+  test("keeps warning topology healthy until a related audit custom check is applied", () => {
+    window.__platformHealth?.setScenario("single-region-warning");
+
+    const state = window.__platformHealth?.getState();
+
+    expect(state?.remotes[1].status).toBe("healthy");
+  });
+
+  test("targets the audit degraded preset at a specific audit instance name", () => {
+    window.__platformHealth?.setCustomCheckPreset("platform-only-audit");
+
+    const checks = getPlatformHealthCustomChecks();
+
+    expect(checks).toHaveLength(1);
+    expect(checks[0].originating_endpoint.name).toBe("Particular.ServiceControl.Audit-Blue");
+  });
 });
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 330fece736..6d9e9297b1 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -163,7 +163,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           category: "ServiceControl.Audit Health",
           status: Status.Fail,
           failure_reason: "Audit ingestion failed",
-          originating_endpoint: { name: "Particular.ServiceControl.Audit", host_id: crypto.randomUUID(), host: "audit-host" },
+          originating_endpoint: { name: "Particular.ServiceControl.Audit-Blue", host_id: crypto.randomUUID(), host: "audit-host" },
         }),
       ];
     case "mixed-primary-and-user":
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index 0a490bf2a0..ee6eeaaf4d 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -46,7 +46,7 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
       };
@@ -56,7 +56,7 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
         remotes: [
           { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "degraded", instanceType: "audit" },
+          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
       };

From 2538c093c44b11a1b8e4f37f2e3d90bdbd36f7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 12:21:05 +0200
Subject: [PATCH 35/67] Simplify platform health mock scenarios

---
 docs/frontend/platform-health-page.md                |  5 ++---
 src/Frontend/src/stores/PlatformHealthStore.spec.ts  |  2 +-
 .../test/mocks/platform-health-state.spec.ts         |  4 ++--
 src/Frontend/test/mocks/platform-health-state.ts     |  6 +++---
 src/Frontend/test/mocks/platform-topology.ts         | 12 +-----------
 .../test/preconditions/platformCapabilities.ts       |  3 ++-
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index cad0771afa..469e345968 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -108,7 +108,7 @@ After startup, use the browser console runtime helpers to switch topology, statu
 window.__platformHealth.getState()
 window.__platformHealth.reset()
 window.__platformHealth.setScenario("single-region-healthy")
-window.__platformHealth.setStatus("remote-0", "degraded")
+window.__platformHealth.setStatus("remote-0", "unavailable")
 ```
 
 For custom-check-specific helpers and presets, see `docs/frontend/custom-checks-page.md`.
@@ -120,7 +120,6 @@ Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
 | Scenario | Purpose |
 |----------|---------|
 | `single-region-healthy` | Primary and monitoring healthy, audit remotes healthy |
-| `single-region-warning` | Monitoring healthy, audit remotes healthy; pair with a built-in audit preset to exercise degraded audit state |
 | `single-region-danger` | Primary unavailable, audit remotes healthy, monitoring unavailable |
 | `multi-region-healthy` | Primary healthy with remote error instances and no monitoring |
 | `multi-region-danger` | One remote error instance unavailable |
@@ -145,7 +144,7 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Behavior | How to exercise it |
 |----------|--------------------|
 | Healthy single-region table | `setScenario("single-region-healthy")` |
-| Warning state from degraded audit instance | `setScenario("single-region-warning")` plus `setCustomCheckPreset("platform-only-audit")` |
+| Warning state from degraded audit instance | `setScenario("single-region-healthy")` plus `setCustomCheckPreset("platform-only-audit")` |
 | Danger state from unavailable instances | `setScenario("single-region-danger")` or `setScenario("multi-region-danger")` |
 | Multi-region topology | `setScenario("multi-region-healthy")` |
 | Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 2679ef4d49..6667e07450 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -107,7 +107,7 @@ describe("PlatformHealthStore", () => {
     environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "";
     window.__platformHealth = {
       getState: () => ({
-        scenario: "single-region-warning",
+        scenario: "single-region-healthy",
         customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
         remotes: [
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
index 0793981375..5de78f4c6b 100644
--- a/src/Frontend/test/mocks/platform-health-state.spec.ts
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -41,8 +41,8 @@ describe("platform-health-state", () => {
     expect(checks[0].category).toBe("ServiceControl Health");
   });
 
-  test("keeps warning topology healthy until a related audit custom check is applied", () => {
-    window.__platformHealth?.setScenario("single-region-warning");
+  test("keeps healthy single-region topology healthy until a related audit custom check is applied", () => {
+    window.__platformHealth?.setScenario("single-region-healthy");
 
     const state = window.__platformHealth?.getState();
 
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 6d9e9297b1..96f7e7c5be 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -7,7 +7,7 @@ import { clonePlatformTopology, createPlatformTopology, latestPlatformVersion, t
 export type PlatformHealthMockScenarioName = PlatformTopologyScenarioName;
 export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
 
-export type PlatformHealthMockStatus = PlatformTopologyStatus;
+export type PlatformHealthMockStatus = Exclude<PlatformTopologyStatus, "degraded">;
 
 export interface PlatformHealthMockState extends PlatformTopology {
   customCheckPreset: PlatformHealthCustomCheckPresetName;
@@ -29,14 +29,14 @@ declare global {
   }
 }
 
-let state = withCustomChecks(createScenario("single-region-warning"), "none");
+let state = withCustomChecks(createScenario("single-region-healthy"), "none");
 
 export function installPlatformHealthDevControls() {
   window.__platformHealth = {
     getState: () => cloneState(state),
     getCustomChecks: () => state.customChecks.map((check) => structuredClone(check)),
     reset: () => {
-      state = withCustomChecks(createScenario("single-region-warning"), "none");
+      state = withCustomChecks(createScenario("single-region-healthy"), "none");
       return cloneState(state);
     },
     setScenario: (name) => {
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index ee6eeaaf4d..448a2dd2db 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -2,7 +2,7 @@ import { RemoteInstanceStatus, RemoteInstanceType, type RemoteInstance } from "@
 
 export const latestPlatformVersion = "6.19.3";
 
-export type PlatformTopologyScenarioName = "single-region-healthy" | "single-region-warning" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformTopologyScenarioName = "single-region-healthy" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
 export type PlatformTopologyStatus = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformTopologyRemote {
@@ -40,16 +40,6 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
       };
-    case "single-region-warning":
-      return {
-        scenario: name,
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
-        remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
-        ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
-      };
     case "single-region-danger":
       return {
         scenario: name,
diff --git a/src/Frontend/test/preconditions/platformCapabilities.ts b/src/Frontend/test/preconditions/platformCapabilities.ts
index 89919f1e36..ffa80b1e76 100644
--- a/src/Frontend/test/preconditions/platformCapabilities.ts
+++ b/src/Frontend/test/preconditions/platformCapabilities.ts
@@ -89,7 +89,8 @@ export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) =>
 
 /** Precondition: Multiple audit instances with mixed availability */
 export const hasPartiallyUnavailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-warning").remotes });
+  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-healthy").remotes });
+  remotes[1].status = RemoteInstanceStatus.Unavailable;
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
     body: remotes,
   });

From 51dda2e27c772cadd9ec0b867427b18f549c3303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 15:15:00 +0200
Subject: [PATCH 36/67] Fix platform health audit check mapping

---
 .../src/stores/PlatformHealthStore.spec.ts    | 41 ++++++++++++++++++-
 .../src/stores/PlatformHealthStore.ts         |  8 +++-
 src/Frontend/test/mocks/platform-topology.ts  | 20 +++++----
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 6667e07450..d17028761b 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -111,8 +111,8 @@ describe("PlatformHealthStore", () => {
         customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.19.3", status: "healthy", instanceType: "audit" },
+          { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.19.3", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: "6.18.0", status: "healthy" },
         customChecks: [],
@@ -264,6 +264,43 @@ describe("PlatformHealthStore", () => {
     expect(store.payload?.remotes.every((remote) => remote.health === "healthy")).toBe(true);
     expect(store.severity).toBe("none");
   });
+
+  test("maps the audit degraded preset to the targeted audit instance name from remote configuration", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/audit-targeted-instance",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit-Blue",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        remotes: singleRegionWarningModel.remotes.map((remote) => ({
+          ...remote,
+          health: "healthy",
+        })),
+      };
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.payload?.remotes[0].health).toBe("healthy");
+    expect(store.payload?.remotes[1].health).toBe("degraded");
+  });
 });
 
 const singleRegionWarningModel: PlatformModel = {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index befae08f68..7bd3f6f253 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -248,10 +248,10 @@ function matchesInstance(check: CustomCheck, instance: PlatformInstance) {
   }
 
   if (platformCheck.target === "transport") {
-    return instance.role === "remote-audit" && check.originating_endpoint.name === instance.name;
+    return instance.role === "remote-audit" && sameInstanceName(check.originating_endpoint.name, instance.name);
   }
 
-  return check.originating_endpoint.name === instance.name;
+  return sameInstanceName(check.originating_endpoint.name, instance.name);
 }
 
 function formatCustomCheckDetail(check: CustomCheck) {
@@ -308,3 +308,7 @@ function applyPlatformCheckHealthToInstance(instance: PlatformInstance, checks:
 function normalizeChecks(checks: CustomCheck[] | unknown) {
   return Array.isArray(checks) ? checks : [];
 }
+
+function sameInstanceName(left: string, right: string) {
+  return left.localeCompare(right, undefined, { sensitivity: "accent" }) === 0;
+}
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index 448a2dd2db..81abeda638 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -7,6 +7,7 @@ export type PlatformTopologyStatus = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformTopologyRemote {
   id: `remote-${number}`;
+  name: string;
   apiUri: string;
   version: string;
   status: PlatformTopologyStatus;
@@ -35,8 +36,8 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
       };
@@ -45,8 +46,8 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
       };
@@ -55,8 +56,8 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         scenario: name,
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-0", name: "Particular.ServiceControl.RegionA", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", name: "Particular.ServiceControl.RegionB", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
         ],
         monitoring: null,
       };
@@ -65,8 +66,8 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         scenario: name,
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
-          { id: "remote-1", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
+          { id: "remote-0", name: "Particular.ServiceControl.RegionA", apiUri: "http://Particular.ServiceControl.RegionA/api/", version: latestPlatformVersion, status: "healthy", instanceType: "error" },
+          { id: "remote-1", name: "Particular.ServiceControl.RegionB", apiUri: "http://Particular.ServiceControl.RegionB/api/", version: latestPlatformVersion, status: "unavailable", instanceType: "error" },
         ],
         monitoring: null,
       };
@@ -103,6 +104,9 @@ export function toRemoteInstances(topology: Pick<PlatformTopology, "remotes">):
     version: remote.version,
     status: remote.status === "healthy" ? RemoteInstanceStatus.Online : RemoteInstanceStatus.Unavailable,
     configuration: {
+      host: {
+        instance_name: remote.name,
+      },
       data_retention: remote.instanceType === "error" ? { error_retention_period: "14.00:00:00" } : { audit_retention_period: "7.00:00:00" },
     },
     platform_health_status: remote.status,

From 01f014318ce5f26b88b3d6e235c11d828a866d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 15:42:56 +0200
Subject: [PATCH 37/67] Keep platform health signals in sync

---
 docs/frontend/audit-capability-card.md        |   2 +
 docs/frontend/custom-checks-page.md           |   2 +
 docs/frontend/error-capability-card.md        |   4 +-
 docs/frontend/monitoring-capability-card.md   |   3 +
 docs/frontend/platform-health-page.md         |   6 +-
 docs/frontend/testing-basics.md               |   1 +
 .../capabilities/AuditingCapability.ts        |   2 +-
 .../capabilities/ErrorCapability.ts           |   2 +-
 .../capabilities/MonitoringCapability.ts      |   9 +-
 .../src/stores/PlatformHealthStore.spec.ts    |  72 ++++++++++++
 .../src/stores/PlatformHealthStore.ts         |  39 +++++--
 .../src/stores/PlatformModelStore.spec.ts     |  25 ++++
 src/Frontend/src/stores/PlatformModelStore.ts |  16 ++-
 .../src/views/PlatformHealthView.spec.ts      | 107 +++++++++++++++---
 src/Frontend/src/views/PlatformHealthView.vue |  13 ++-
 .../preconditions/platformCapabilities.ts     |  38 ++++++-
 .../monitoring-capability-card.spec.ts        |  24 ++++
 .../recoverability-capability-card.spec.ts    |  23 ++++
 18 files changed, 344 insertions(+), 44 deletions(-)

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index c19b71c535..a18d3ec619 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -24,6 +24,8 @@ The Audit Capability Card displays on the ServicePulse dashboard and shows the s
 
 The `Messages` indicator carries the capability-specific readiness state. If no successful messages exist yet, or if `All Messages` is not supported, the card remains `Available` while the indicator is yellow.
 
+An audit instance that is degraded but still responding remains available for this card. Only unavailable audit instances affect the badge state.
+
 ## Manual Testing with Mock Scenarios
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the audit scenarios below.
diff --git a/docs/frontend/custom-checks-page.md b/docs/frontend/custom-checks-page.md
index 414f3a04d0..70ac185f46 100644
--- a/docs/frontend/custom-checks-page.md
+++ b/docs/frontend/custom-checks-page.md
@@ -51,6 +51,8 @@ Relevant frontend pieces:
 
 Platform health uses built-in platform checks even when the Custom Checks page hides them.
 
+Platform health also refreshes those custom checks directly, so this behavior does not depend on visiting the Custom Checks page first.
+
 That logic is documented in:
 
 - `docs/frontend/platform-health-page.md`
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index c5b3c7bd72..0a23da6d93 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -86,7 +86,7 @@ The recoverability status is determined by checking the primary instance in the
 
 ```typescript
 // Simplified status determination logic
-const isConnected = platformModelStore.primary?.health === "healthy";
+const isConnected = platformModelStore.primary?.health !== "unavailable";
 
 if (!isConnected) {
   return CapabilityStatus.Unavailable;
@@ -98,6 +98,8 @@ return CapabilityStatus.Available;
 
 The recoverability card shows a single `FailedMessages` indicator whenever the primary ServiceControl instance is available.
 
+A degraded primary instance remains connected for this card. Platform health owns the degraded vs unavailable distinction at the instance level.
+
 - green when failures can be managed from this ServicePulse instance
 - yellow in multi-region mode, where failure management is read-only from the cross-region view
 
diff --git a/docs/frontend/monitoring-capability-card.md b/docs/frontend/monitoring-capability-card.md
index c80000f34e..758096ce0d 100644
--- a/docs/frontend/monitoring-capability-card.md
+++ b/docs/frontend/monitoring-capability-card.md
@@ -22,6 +22,8 @@ The Monitoring Capability Card displays on the ServicePulse dashboard and shows
 
 The `Metrics` indicator carries the capability-specific readiness state. If no endpoints are sending throughput data, the card stays `Available` while the indicator is yellow.
 
+A degraded monitoring instance still counts as connected for this card. Only `unavailable` drives the card into the unavailable state.
+
 ## Manual Testing with Mock Scenarios
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the monitoring scenarios below.
@@ -77,6 +79,7 @@ npx vitest run test/specs/platformcapabilities/monitoring-capability-card.spec.t
 |-------------------------------------------|----------------------------------------------------------------|
 | Available with endpoints sending data     | Shows "Available" status + "View Metrics" button             |
 | Available but no endpoints sending data   | Keeps card available and shows a warning `Metrics` indicator   |
+| Degraded but responding instance          | Keeps card available and still shows `Metrics` behavior        |
 | Instance configured but not responding    | Shows "Unavailable" status                                   |
 | Monitoring not configured in ServicePulse | Shows "Get Started" button                                   |
 | Shared card signals                       | Shows only the `Metrics` indicator when connected              |
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 469e345968..ff760e8a06 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -18,6 +18,7 @@ The page is frontend-first and mock-driven. It:
 - derives page-specific row and details behavior in `PlatformHealthStore`
 - keeps topology and instance visibility on the page instead of duplicating per-instance widgets on capability cards
 - uses built-in platform custom checks as secondary health signals for page-specific health inference, including instance-mapped degraded states
+- refreshes custom checks together with platform instance data so hidden built-in signals are available even when the Custom Checks page has not been opened
 
 ## Page Behavior
 
@@ -34,6 +35,7 @@ Each row shows:
 - current version
 - health state
 - upgrade cue when a newer version is known
+- no upgrade cue when the page only knows that versions differ but does not know a newer target version
 
 Rows for degraded or unavailable instances can expand to show details.
 
@@ -89,6 +91,7 @@ For the shared built-in-check catalog and Custom Checks page behavior, see `docs
 Platform health-specific rule:
 
 - when assigning a built-in degraded check to a specific instance, use `originating_endpoint.name` to match the emitting platform instance
+- built-in platform custom checks are loaded by `PlatformHealthStore` itself, not only as a side effect of visiting the Custom Checks page
 
 ## Manual Testing with Mock Scenarios
 
@@ -177,7 +180,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 | Area | Covered behavior |
 |------|------------------|
 | Platform health store | warning/danger severity, multi-region danger, monitoring presence, version fallback, built-in custom-check health inference |
-| Platform health view | support download gating, upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
+| Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
 | Mock helpers | independent topology and custom-check switching |
 
 ## Key Source Files
@@ -208,3 +211,4 @@ Platform health-specific checks:
 
 1. Run the focused Platform health specs listed above.
 2. If a degraded row is missing or assigned to the wrong instance, inspect the check's `originating_endpoint.name` and the instance name carried in the platform model.
+3. If hidden platform checks are not affecting the page, inspect the `customchecks?status=fail` response instead of assuming the Custom Checks page must be visited first.
diff --git a/docs/frontend/testing-basics.md b/docs/frontend/testing-basics.md
index 0a74e940f8..13038d5aca 100644
--- a/docs/frontend/testing-basics.md
+++ b/docs/frontend/testing-basics.md
@@ -76,6 +76,7 @@ Run focused Vitest specs from `src/Frontend`:
 
 ```bash
 npx vitest run test/specs/platformcapabilities/monitoring-capability-card.spec.ts
+npx vitest run test/specs/platformcapabilities/recoverability-capability-card.spec.ts
 npx vitest run src/views/PlatformHealthView.spec.ts
 ```
 
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
index 066353dc26..307f996b6d 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/AuditingCapability.ts
@@ -102,7 +102,7 @@ export function useAuditingCapability(): CapabilityComposable {
     platformModelStore.auditInstances.map((instance) => ({
       api_uri: instance.apiUrl,
       version: instance.version,
-      status: instance.health === "healthy" ? RemoteInstanceStatus.Online : RemoteInstanceStatus.Unavailable,
+      status: instance.health === "unavailable" ? RemoteInstanceStatus.Unavailable : RemoteInstanceStatus.Online,
       cachedInstanceType: RemoteInstanceType.Audit,
     }))
   );
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index 47b2f9ebdf..c511ae355c 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -26,7 +26,7 @@ export function useErrorCapability(): CapabilityComposable {
   const platformModelStore = usePlatformModelStore();
 
   // Check if instance is connected
-  const isConnected = computed(() => platformModelStore.primary?.health === "healthy");
+  const isConnected = computed(() => platformModelStore.primary?.health !== "unavailable");
 
   // Determine overall error status
   const errorStatus = computed(() => {
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
index 34d39839bc..a2e22eb65b 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/MonitoringCapability.ts
@@ -38,18 +38,17 @@ export function useMonitoringCapability(): CapabilityComposable {
   const { hasMonitoredEndpoints } = storeToRefs(platformCapabilitiesStore);
   const platformModelStore = usePlatformModelStore();
   const hasMonitoringInstance = computed(() => platformModelStore.monitoring !== null);
+  const isMonitoringConnected = computed(() => platformModelStore.monitoring?.health !== "unavailable");
 
   // Determine overall monitoring status
   const monitoringStatus = computed(() => {
-    const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
-
     // 1. Check if a monitoring instance exists in the shared platform model
     if (!hasMonitoringInstance.value) {
       return CapabilityStatus.InstanceNotConfigured;
     }
 
     // 2. Check if we are connected to the monitoring instance
-    if (!connectionSuccessful) {
+    if (!isMonitoringConnected.value) {
       return CapabilityStatus.Unavailable;
     }
 
@@ -69,9 +68,7 @@ export function useMonitoringCapability(): CapabilityComposable {
   // Determine indicators
   const monitoringIndicators = computed(() => {
     const indicators: StatusIndicator[] = [];
-
-    const connectionSuccessful = platformModelStore.monitoring?.health === "healthy";
-    const instanceAvailable = hasMonitoringInstance.value && connectionSuccessful;
+    const instanceAvailable = hasMonitoringInstance.value && isMonitoringConnected.value;
 
     // data available indicator - only show if instance is connected
     if (instanceAvailable) {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index d17028761b..328f626fd5 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -1,11 +1,13 @@
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { createPinia, setActivePinia } from "pinia";
+import { nextTick } from "vue";
 import { Status } from "@/resources/CustomCheck";
 import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
 import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 import type { PlatformModel } from "@/resources/PlatformModel";
+import logger from "@/logger";
 
 describe("PlatformHealthStore", () => {
   beforeEach(() => {
@@ -19,6 +21,11 @@ describe("PlatformHealthStore", () => {
     environmentAndVersionsStore.newVersions.newMVersion.newmversion = true;
     environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber = "6.19.3";
     environmentAndVersionsStore.newVersions.newMVersion.newmversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+
+    vi.spyOn(logger, "warn").mockImplementation(() => undefined);
+
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.refresh = vi.fn(() => Promise.resolve());
   });
 
   test("derives warning severity and single-region rows", async () => {
@@ -301,6 +308,71 @@ describe("PlatformHealthStore", () => {
     expect(store.payload?.remotes[0].health).toBe("healthy");
     expect(store.payload?.remotes[1].health).toBe("degraded");
   });
+
+  test("refreshes custom checks alongside the platform model and keeps rendering when custom checks fail", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.refresh = vi.fn(() => Promise.reject(new Error("custom checks unavailable")));
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = singleRegionWarningModel;
+      return Promise.resolve();
+    });
+
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(customChecksStore.refresh).toHaveBeenCalledTimes(1);
+    expect(platformModelStore.refresh).toHaveBeenCalledTimes(1);
+    expect(store.payload?.primary.health).toBe("healthy");
+    expect(logger.warn).toHaveBeenCalledWith("Unable to refresh custom checks for platform health", expect.any(Error));
+  });
+
+  test("recomputes payload-derived state when failed checks change after refresh", async () => {
+    const customChecksStore = useCustomChecksStore();
+    const platformModelStore = usePlatformModelStore();
+
+    customChecksStore.refresh = vi.fn(() => Promise.resolve());
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        remotes: singleRegionWarningModel.remotes.map((remote) => ({
+          ...remote,
+          health: "healthy",
+        })),
+      };
+      return Promise.resolve();
+    });
+
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.severity).toBe("none");
+
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/audit-targeted-instance",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: Status.Fail,
+        reported_at: "2025-01-10T05:06:30.4074087Z",
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit-Blue",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
+
+    await nextTick();
+
+    expect(store.payload?.remotes[1].health).toBe("degraded");
+    expect(store.severity).toBe("warning");
+    expect(store.rows[2].details).toContain("Audit Message Ingestion: Audit ingestion failed");
+  });
 });
 
 const singleRegionWarningModel: PlatformModel = {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 7bd3f6f253..7707584aeb 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -1,10 +1,11 @@
 import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
-import { computed, ref } from "vue";
+import { computed, ref, watch } from "vue";
 import { isUpgradeAvailable } from "@/composables/serviceSemVer";
 import { getBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
 import type CustomCheck from "@/resources/CustomCheck";
 import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
+import logger from "@/logger";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
@@ -18,9 +19,18 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   const platformModelStore = usePlatformModelStore();
   const customChecksStore = useCustomChecksStore();
   const { rawFailedChecks } = storeToRefs(customChecksStore);
+  const { model: platformModel } = storeToRefs(platformModelStore);
+
+  const currentModel = computed(() => {
+    if (!platformModel.value) {
+      return null;
+    }
+
+    return applyPlatformHealthChecks(platformModel.value, rawFailedChecks.value);
+  });
 
   const severity = computed<PlatformHealthSeverity>(() => {
-    const current = payload.value;
+    const current = currentModel.value;
     if (!current) {
       return "none";
     }
@@ -51,7 +61,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   const outdatedOnly = computed(() => severity.value === "none" && rows.value.some((row) => row.upgradeAvailable));
 
   const rows = computed<PlatformHealthRow[]>(() => {
-    const current = payload.value;
+    const current = currentModel.value;
     if (!current) {
       return [];
     }
@@ -76,7 +86,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   });
 
   const issueSummary = computed(() => {
-    const current = payload.value;
+    const current = currentModel.value;
     if (!current) {
       return "No issues detected.";
     }
@@ -106,7 +116,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   });
 
   const supportDownloadJson = computed(() => {
-    if (!payload.value) {
+    if (!currentModel.value) {
       return "";
     }
 
@@ -115,7 +125,7 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
         schemaVersion: 1,
         generatedAt: new Date().toISOString(),
         supportCaseUrl,
-        platformHealth: payload.value,
+        platformHealth: currentModel.value,
       },
       null,
       2
@@ -123,11 +133,24 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   });
 
   async function refresh() {
-    await platformModelStore.refresh();
+    const [platformModelResult, customChecksResult] = await Promise.allSettled([platformModelStore.refresh(), customChecksStore.refresh()]);
+
+    if (platformModelResult.status === "rejected") {
+      throw platformModelResult.reason;
+    }
+
+    if (customChecksResult.status === "rejected") {
+      // Platform health still renders from platform availability data when custom checks cannot be loaded.
+      logger.warn("Unable to refresh custom checks for platform health", customChecksResult.reason);
+    }
 
-    payload.value = platformModelStore.model ? applyPlatformHealthChecks(platformModelStore.model, rawFailedChecks.value) : null;
+    payload.value = currentModel.value;
   }
 
+  watch(currentModel, (model) => {
+    payload.value = model;
+  });
+
   return {
     payload,
     refresh,
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 9d3fb8a636..efd425aafe 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { createPinia, setActivePinia } from "pinia";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+import { RemoteInstanceType } from "@/resources/RemoteInstance";
 
 const getRoot = vi.fn();
 const getRemoteInstances = vi.fn();
@@ -98,4 +99,28 @@ describe("PlatformModelStore", () => {
     expect(store.primary?.health).toBe("degraded");
     expect(store.primary?.version).toBe("6.18.1");
   });
+
+  test("uses cached remote instance type when an unavailable remote no longer has configuration", async () => {
+    getRoot.mockResolvedValue({
+      name: "Particular.ServiceControl.Primary",
+      platform_health_status: "healthy",
+      platform_health_version: "6.19.3",
+    });
+    getRemoteInstances.mockResolvedValue([
+      {
+        api_uri: "http://localhost:33334/api/",
+        version: "6.19.3",
+        status: "unavailable",
+        cachedInstanceType: RemoteInstanceType.Error,
+      },
+    ]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.remotes[0].kind).toBe("error");
+    expect(store.remotes[0].role).toBe("remote-error");
+    expect(store.isMultiRegion).toBe(true);
+  });
 });
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index b1963a1fbc..5942b4ab41 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -2,7 +2,7 @@ import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed, ref } from "vue";
 import serviceControlClient, { type ServiceControlRootDocument } from "@/components/serviceControlClient";
 import monitoringClient, { type MonitoringRoot } from "@/components/monitoring/monitoringClient";
-import type { RemoteInstance } from "@/resources/RemoteInstance";
+import { RemoteInstanceType, type RemoteInstance } from "@/resources/RemoteInstance";
 import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
 
 export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
@@ -94,7 +94,7 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformIns
 
 function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
   return remotes.map((remote, index) => {
-    const isError = remote.configuration?.data_retention?.error_retention_period !== undefined;
+    const isError = isRemoteErrorInstance(remote);
     const kind = isError ? "error" : "audit";
 
     return {
@@ -109,6 +109,18 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
   });
 }
 
+function isRemoteErrorInstance(remote: RemoteInstance) {
+  if (remote.cachedInstanceType === RemoteInstanceType.Error) {
+    return true;
+  }
+
+  if (remote.cachedInstanceType === RemoteInstanceType.Audit) {
+    return false;
+  }
+
+  return remote.configuration?.data_retention?.error_retention_period !== undefined;
+}
+
 function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance | null {
   if (!monitoringClient.isMonitoringEnabled || monitoringRoot === null) {
     return null;
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 45a57cb838..ab78d27646 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -5,7 +5,8 @@ import { beforeEach, vi } from "vitest";
 import PlatformHealthView from "@/views/PlatformHealthView.vue";
 import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
-import type { PlatformHealthResponse } from "@/resources/PlatformHealth";
+import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+import type { PlatformModel } from "@/resources/PlatformModel";
 
 const downloadFileFromString = vi.fn();
 
@@ -19,6 +20,10 @@ vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
   }),
 }));
 
+vi.mock("@/composables/useEnvironmentAndVersionsAutoRefresh", () => ({
+  default: vi.fn(),
+}));
+
 describe("PlatformHealthView", () => {
   beforeEach(() => {
     setActivePinia(createTestingPinia({ stubActions: false }));
@@ -32,7 +37,8 @@ describe("PlatformHealthView", () => {
 
   test("requires the configuration download before enabling the support link", async () => {
     const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -44,7 +50,7 @@ describe("PlatformHealthView", () => {
       },
       remotes: [],
       monitoring: null,
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     render(PlatformHealthView, {
       global: {
@@ -67,8 +73,8 @@ describe("PlatformHealthView", () => {
   });
 
   test("shows an inline upgrade cue for an outdated instance version", () => {
-    const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -90,7 +96,7 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     render(PlatformHealthView, {
       global: {
@@ -102,9 +108,76 @@ describe("PlatformHealthView", () => {
     expect(screen.getByText(/v6.19.3 available/i)).toBeInTheDocument();
   });
 
-  test("links each instance name to the instance api url", () => {
+  test("does not show an upgrade cue when no newer version is known", () => {
     const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [
+        {
+          id: "remote-0",
+          name: "Particular.ServiceControl.Audit",
+          kind: "audit",
+          role: "remote-audit",
+          version: "6.18.0",
+          health: "healthy",
+          apiUrl: "http://Particular.ServiceControl.Audit/api/",
+        },
+      ],
+      monitoring: null,
+    } satisfies PlatformModel;
+
+    const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
+      {
+        type: "Error instance",
+        instanceName: "Particular.ServiceControl",
+        apiUrl: "http://localhost:33333/api/",
+        version: "6.19.3",
+        health: "healthy",
+        note: "Primary error instance",
+        upgradeAvailable: false,
+        latestVersion: "",
+        upgradeLink: "",
+        isExpandable: false,
+        details: [],
+      },
+      {
+        type: "Audit instance",
+        instanceName: "Particular.ServiceControl.Audit",
+        apiUrl: "http://Particular.ServiceControl.Audit/api/",
+        version: "6.18.0",
+        health: "healthy",
+        note: "Audit instance",
+        upgradeAvailable: false,
+        latestVersion: "",
+        upgradeLink: "",
+        isExpandable: false,
+        details: [],
+      },
+    ]);
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.queryByText(/v6\.19\.3 available/i)).not.toBeInTheDocument();
+
+    rows.mockRestore();
+  });
+
+  test("links each instance name to the instance api url", () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -126,7 +199,7 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     render(PlatformHealthView, {
       global: {
@@ -139,8 +212,8 @@ describe("PlatformHealthView", () => {
   });
 
   test("renders monitoring when present even in multi-region", () => {
-    const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl.CrossRegion",
@@ -170,7 +243,7 @@ describe("PlatformHealthView", () => {
         health: "healthy",
         apiUrl: "http://localhost:33633/",
       },
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     render(PlatformHealthView, {
       global: {
@@ -183,7 +256,8 @@ describe("PlatformHealthView", () => {
 
   test("shows details when clicking a degraded health badge", async () => {
     const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -205,7 +279,7 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
       {
@@ -252,7 +326,8 @@ describe("PlatformHealthView", () => {
 
   test("does not make healthy rows expandable", () => {
     const store = usePlatformHealthStore();
-    store.payload = {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
       primary: {
         id: "primary",
         name: "Particular.ServiceControl",
@@ -264,7 +339,7 @@ describe("PlatformHealthView", () => {
       },
       remotes: [],
       monitoring: null,
-    } satisfies PlatformHealthResponse;
+    } satisfies PlatformModel;
 
     const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
       {
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 85ac22bb4a..bfe4b437ef 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -18,17 +18,20 @@ function openSupportModal() {
 }
 
 function getUpgradeTargetVersion(row: (typeof store.rows)[number]) {
-  return row.latestVersion || store.payload?.primary.version || "";
+  return row.upgradeAvailable ? row.latestVersion : "";
 }
 
 function getUpgradeTargetLink(row: (typeof store.rows)[number]) {
-  return row.upgradeLink || `https://github.com/Particular/ServiceControl/releases/tag/${getUpgradeTargetVersion(row)}`;
+  const targetVersion = getUpgradeTargetVersion(row);
+  if (!targetVersion) {
+    return "";
+  }
+
+  return row.upgradeLink || `https://github.com/Particular/ServiceControl/releases/tag/${targetVersion}`;
 }
 
 function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
-  const targetVersion = getUpgradeTargetVersion(row);
-
-  return row.upgradeAvailable || (!!targetVersion && row.version !== "Unknown" && row.version !== targetVersion);
+  return row.upgradeAvailable && !!getUpgradeTargetVersion(row);
 }
 
 function rowKey(row: (typeof store.rows)[number]) {
diff --git a/src/Frontend/test/preconditions/platformCapabilities.ts b/src/Frontend/test/preconditions/platformCapabilities.ts
index ffa80b1e76..31ef22d935 100644
--- a/src/Frontend/test/preconditions/platformCapabilities.ts
+++ b/src/Frontend/test/preconditions/platformCapabilities.ts
@@ -81,7 +81,9 @@ export const hasAvailableAuditInstance =
 
 /** Precondition: Single audit instance that is unavailable */
 export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) => {
-  const [instance] = toRemoteInstances({ remotes: [createPlatformTopology("single-region-danger").remotes[1]] });
+  const topology = createPlatformTopology("single-region-healthy");
+  topology.remotes[1].status = "unavailable";
+  const [instance] = toRemoteInstances({ remotes: [topology.remotes[1]] });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
     body: [instance],
   });
@@ -89,8 +91,9 @@ export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) =>
 
 /** Precondition: Multiple audit instances with mixed availability */
 export const hasPartiallyUnavailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-healthy").remotes });
-  remotes[1].status = RemoteInstanceStatus.Unavailable;
+  const topology = createPlatformTopology("single-region-healthy");
+  topology.remotes[1].status = "unavailable";
+  const remotes = toRemoteInstances({ remotes: topology.remotes });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
     body: remotes,
   });
@@ -175,6 +178,20 @@ export const hasMonitoringUnavailable = ({ driver }: SetupFactoryOptions) => {
   });
 };
 
+/** Precondition: Monitoring instance reports degraded platform health but still responds */
+export const hasMonitoringDegraded = ({ driver }: SetupFactoryOptions) => {
+  const monitoringInstanceUrl = window.defaultConfig.monitoring_urls[0];
+  driver.mockEndpoint(monitoringInstanceUrl, {
+    body: {
+      platform_health_status: "degraded",
+      platform_health_version: "6.19.3",
+    },
+  });
+  driver.mockEndpoint(`${monitoringInstanceUrl}monitored-endpoints`, {
+    body: [],
+  });
+};
+
 /** Precondition: Multiple monitored endpoints */
 export const hasMultipleMonitoredEndpoints =
   (count: number = 3) =>
@@ -200,6 +217,21 @@ export const hasRemoteErrorInstance = ({ driver }: SetupFactoryOptions) => {
   });
 };
 
+/** Precondition: Primary instance reports degraded platform health but still responds */
+export const hasServiceControlPrimaryDegraded = ({ driver }: SetupFactoryOptions) => {
+  awaitServiceControlRootOverride(driver, {
+    name: "Particular.ServiceControl",
+    platform_health_status: "degraded",
+    platform_health_version: "6.19.3",
+  });
+};
+
+function awaitServiceControlRootOverride(driver: SetupFactoryOptions["driver"], body: Record<string, unknown>) {
+  driver.mockEndpoint(`${window.defaultConfig.service_control_url}`, {
+    body,
+  });
+}
+
 /** Precondition: ServiceControl instance is unavailable */
 export const hasServiceControlUnavailable = ({ driver }: SetupFactoryOptions) => {
   const serviceControlInstanceUrl = window.defaultConfig.service_control_url;
diff --git a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
index ed7b69b9c5..3abc4628de 100644
--- a/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/monitoring-capability-card.spec.ts
@@ -82,6 +82,30 @@ describe("FEATURE: Monitoring capability card", () => {
     });
   });
 
+  describe("RULE: When monitoring instance is degraded but still responding, keep the card available", () => {
+    test("EXAMPLE: Degraded monitoring instance still shows available status and metrics indicator behavior", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(precondition.hasMonitoringDegraded);
+
+      await driver.goTo("/");
+
+      await waitFor(async () => {
+        const card = await monitoringCapabilityCard();
+        expect(card).toBeInTheDocument();
+      });
+
+      await waitFor(async () => {
+        expect(await isMonitoringCardAvailable()).toBe(true);
+      });
+
+      const statusBadge = await monitoringStatusBadge();
+      expect(statusBadge?.textContent).toMatch(/Available/i);
+
+      const metricsIndicator = await monitoringIndicatorByLabel("Metrics");
+      expect(metricsIndicator).toBeInTheDocument();
+    });
+  });
+
   describe("RULE: When monitoring instance is configured but not responding, show 'Unavailable' status", () => {
     test("EXAMPLE: Monitoring instance unavailable shows unavailable status", async ({ driver }) => {
       // Arrange - Set up base preconditions first
diff --git a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
index d8bf3bb500..29ab1a05c2 100644
--- a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
@@ -86,5 +86,28 @@ describe("FEATURE: Recoverability capability card", () => {
       expect(failedMessagesIndicator).toBeInTheDocument();
       expect(failedMessagesIndicator?.querySelector(".light-warning")).not.toBeNull();
     });
+
+    test("EXAMPLE: Degraded primary instance still shows available status while connected", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(precondition.hasServiceControlPrimaryDegraded);
+
+      await driver.goTo("/");
+
+      await waitFor(async () => {
+        const card = await recoverabilityCapabilityCard();
+        expect(card).toBeInTheDocument();
+      });
+
+      await waitFor(async () => {
+        expect(await isRecoverabilityCardAvailable()).toBe(true);
+      });
+
+      const statusBadge = await recoverabilityStatusBadge();
+      expect(statusBadge?.textContent).toMatch(/Available/i);
+
+      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
+      expect(failedMessagesIndicator).toBeInTheDocument();
+      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
+    });
   });
 });

From dacada2aeff305396dda295c66c389851675c9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 30 Aug 2026 15:49:57 +0200
Subject: [PATCH 38/67] Fix platform health view lint

---
 src/Frontend/src/views/PlatformHealthView.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index ab78d27646..30940cb99f 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -36,7 +36,6 @@ describe("PlatformHealthView", () => {
   });
 
   test("requires the configuration download before enabling the support link", async () => {
-    const store = usePlatformHealthStore();
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
       primary: {

From 2d8874c9c04baab5bbaee50b347791ea12a4d61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 09:36:34 +0200
Subject: [PATCH 39/67] Simplify platform health topology scenarios

---
 docs/frontend/audit-capability-card.md        |  2 +-
 docs/frontend/error-capability-card.md        | 15 +++++---------
 docs/frontend/platform-health-page.md         | 20 +++++++++----------
 .../capabilities/ErrorCapability.ts           |  3 +--
 .../src/stores/PlatformHealthStore.spec.ts    | 12 +++++------
 .../src/stores/PlatformHealthStore.ts         |  4 ++--
 .../src/stores/PlatformModelStore.spec.ts     |  4 +---
 src/Frontend/src/stores/PlatformModelStore.ts |  2 --
 .../src/views/PlatformHealthView.spec.ts      |  2 +-
 .../test/mocks/platform-health-state.spec.ts  | 10 +++++-----
 .../test/mocks/platform-health-state.ts       |  4 ++--
 src/Frontend/test/mocks/platform-topology.ts  | 12 +++++------
 .../preconditions/platformCapabilities.ts     | 10 +++++-----
 .../recoverability-capability-card.spec.ts    |  6 +++---
 14 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/docs/frontend/audit-capability-card.md b/docs/frontend/audit-capability-card.md
index a18d3ec619..d8e2e6abaa 100644
--- a/docs/frontend/audit-capability-card.md
+++ b/docs/frontend/audit-capability-card.md
@@ -30,7 +30,7 @@ An audit instance that is degraded but still responding remains available for th
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select one of the audit scenarios below.
 
-For the shared meaning of single-region and multi-region instance topologies, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the auditing-specific layer on top.
+For the shared meaning of audit and remote error platform instances, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the auditing-specific layer on top.
 
 ### Available Audit Scenarios
 
diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 0a23da6d93..1c69871081 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -25,13 +25,13 @@ Unlike the Monitoring and Auditing cards, the Recoverability card has a simpler
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`, then select the recoverability scenario below.
 
-For the shared meaning of primary, remote-error, and multi-region topology states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the recoverability-specific layer on top.
+For the shared meaning of primary and remote error instance states, use `docs/frontend/platform-health-page.md` as the canonical reference. This page documents only the recoverability-specific layer on top.
 
 ### Available Recoverability Scenarios
 
 | Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators                         |
 |----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------------------------------|
-| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | `FailedMessages`: ⚠️ in multi-region, ✅ in single-region |
+| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | `FailedMessages`: ✅ |
 
 ### Testing "Unavailable" State
 
@@ -66,8 +66,8 @@ npx vitest run test/specs/platformcapabilities/recoverability-capability-card.sp
 | Rule                              | Test Case                                                |
 |-----------------------------------|----------------------------------------------------------|
 | ServiceControl instance available | Shows "Available" status + "View Failed Messages" button |
-| Single-region management          | Shows a green `FailedMessages` indicator                 |
-| Multi-region management           | Shows a yellow `FailedMessages` indicator                |
+| Connected primary instance        | Shows a green `FailedMessages` indicator                 |
+| Remote error instances present    | Keeps the `FailedMessages` indicator green               |
 
 **Note:** The "Unavailable" state is not tested because when ServiceControl is unavailable, the entire dashboard is replaced with a connection error view, making the recoverability card inaccessible.
 
@@ -101,11 +101,6 @@ The recoverability card shows a single `FailedMessages` indicator whenever the p
 A degraded primary instance remains connected for this card. Platform health owns the degraded vs unavailable distinction at the instance level.
 
 - green when failures can be managed from this ServicePulse instance
-- yellow in multi-region mode, where failure management is read-only from the cross-region view
-
-Tooltip text for multi-region mode:
-
-`Message failures are read only in multi-region mode, use the region specific ServicePulse to manage failures.`
 
 Instance-level visibility for ServiceControl lives on the `Platform health` page instead of on the capability card.
 
@@ -127,4 +122,4 @@ Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 Recoverability-specific checks:
 
 1. If the card disappears instead of showing `Unavailable`, confirm the scenario has crossed into full ServiceControl connection failure, which replaces the dashboard.
-2. If the `FailedMessages` indicator is wrong, inspect whether the active topology is single-region or has `remote-error` instances.
+2. If the `FailedMessages` indicator is wrong, inspect whether the primary instance is connected.
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index ff760e8a06..e543a973c8 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -110,7 +110,7 @@ After startup, use the browser console runtime helpers to switch topology, statu
 ```javascript
 window.__platformHealth.getState()
 window.__platformHealth.reset()
-window.__platformHealth.setScenario("single-region-healthy")
+window.__platformHealth.setScenario("audit-remotes-healthy")
 window.__platformHealth.setStatus("remote-0", "unavailable")
 ```
 
@@ -122,10 +122,10 @@ Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
 
 | Scenario | Purpose |
 |----------|---------|
-| `single-region-healthy` | Primary and monitoring healthy, audit remotes healthy |
-| `single-region-danger` | Primary unavailable, audit remotes healthy, monitoring unavailable |
-| `multi-region-healthy` | Primary healthy with remote error instances and no monitoring |
-| `multi-region-danger` | One remote error instance unavailable |
+| `audit-remotes-healthy` | Primary and monitoring healthy, audit remotes healthy |
+| `audit-remotes-danger` | Primary healthy, audit remotes healthy, monitoring unavailable |
+| `remote-errors-healthy` | Primary healthy with remote error instances and no monitoring |
+| `remote-errors-danger` | One remote error instance unavailable |
 
 ### Custom Check Presets
 
@@ -146,10 +146,10 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 
 | Behavior | How to exercise it |
 |----------|--------------------|
-| Healthy single-region table | `setScenario("single-region-healthy")` |
-| Warning state from degraded audit instance | `setScenario("single-region-healthy")` plus `setCustomCheckPreset("platform-only-audit")` |
-| Danger state from unavailable instances | `setScenario("single-region-danger")` or `setScenario("multi-region-danger")` |
-| Multi-region topology | `setScenario("multi-region-healthy")` |
+| Healthy audit-remote table | `setScenario("audit-remotes-healthy")` |
+| Warning state from degraded audit instance | `setScenario("audit-remotes-healthy")` plus `setCustomCheckPreset("platform-only-audit")` |
+| Danger state from unavailable instances | `setScenario("audit-remotes-danger")` or `setScenario("remote-errors-danger")` |
+| Remote error instances | `setScenario("remote-errors-healthy")` |
 | Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
 | Expanded row details with `failure_reason` | trigger degraded/unavailable row, then click the health badge |
 | Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
@@ -179,7 +179,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 | Area | Covered behavior |
 |------|------------------|
-| Platform health store | warning/danger severity, multi-region danger, monitoring presence, version fallback, built-in custom-check health inference |
+| Platform health store | warning/danger severity, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
 | Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
 | Mock helpers | independent topology and custom-check switching |
 
diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index c511ae355c..286257e88c 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -5,7 +5,6 @@ import routeLinks from "@/router/routeLinks";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
 const singleRegionTooltip = "Message failures can be managed from this ServicePulse instance.";
-const multiRegionTooltip = "Message failures are read only in multi-region mode, use the region specific ServicePulse to manage failures.";
 
 const ErrorDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.Unavailable]: "The ServiceControl instance is not responding.",
@@ -50,7 +49,7 @@ export function useErrorCapability(): CapabilityComposable {
       return [];
     }
 
-    return [createIndicator("FailedMessages", platformModelStore.isMultiRegion ? CapabilityStatus.PartiallyUnavailable : CapabilityStatus.Available, platformModelStore.isMultiRegion ? multiRegionTooltip : singleRegionTooltip)];
+    return [createIndicator("FailedMessages", CapabilityStatus.Available, singleRegionTooltip)];
   });
 
   // Loading state - error is loading if we haven't attempted connection yet
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 328f626fd5..fa26f9c2bd 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -28,7 +28,7 @@ describe("PlatformHealthStore", () => {
     customChecksStore.refresh = vi.fn(() => Promise.resolve());
   });
 
-  test("derives warning severity and single-region rows", async () => {
+  test("derives warning severity and audit-remote rows", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.replaceFailedChecks([
       {
@@ -66,10 +66,10 @@ describe("PlatformHealthStore", () => {
     expect(store.supportDownloadJson).toContain('"platformHealth"');
   });
 
-  test("derives danger severity for multi-region degraded remote error", async () => {
+  test("derives danger severity for an unavailable remote error instance", async () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.refresh = vi.fn(() => {
-      platformModelStore.model = multiRegionDangerModel;
+      platformModelStore.model = remoteErrorsDangerModel;
       return Promise.resolve();
     });
     const store = usePlatformHealthStore();
@@ -86,7 +86,7 @@ describe("PlatformHealthStore", () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.refresh = vi.fn(() => {
       platformModelStore.model = {
-        ...multiRegionDangerModel,
+        ...remoteErrorsDangerModel,
         monitoring: {
           id: "monitoring",
           name: "Particular.ServiceControl.Monitoring",
@@ -114,7 +114,7 @@ describe("PlatformHealthStore", () => {
     environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "";
     window.__platformHealth = {
       getState: () => ({
-        scenario: "single-region-healthy",
+        scenario: "audit-remotes-healthy",
         customCheckPreset: "none",
         primary: { name: "Particular.ServiceControl", version: "6.19.3", status: "healthy" },
         remotes: [
@@ -416,7 +416,7 @@ const singleRegionWarningModel: PlatformModel = {
   },
 };
 
-const multiRegionDangerModel: PlatformModel = {
+const remoteErrorsDangerModel: PlatformModel = {
   primary: {
     id: "primary",
     name: "Particular.ServiceControl.CrossRegion",
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 7707584aeb..de6b7d7fd4 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -206,7 +206,7 @@ function formatRole(role: PlatformInstance["role"]) {
     case "remote-audit":
       return "Audit instance";
     case "remote-error":
-      return "Regional error instance";
+      return "Remote error instance";
     case "monitoring":
       return "Monitoring instance";
   }
@@ -287,7 +287,7 @@ function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
   }
 
   if (instance.role === "remote-error" && instance.health === "unavailable") {
-    return ["Regional error instance is unavailable."];
+    return ["Remote error instance is unavailable."];
   }
 
   if (instance.role === "remote-audit" && instance.health === "degraded") {
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index efd425aafe..97f23d3c11 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -32,7 +32,7 @@ describe("PlatformModelStore", () => {
     window.__platformHealth = undefined;
   });
 
-  test("keeps monitoring in the shared model for multi-region", async () => {
+  test("keeps monitoring in the shared model when remote error instances exist", async () => {
     getRoot.mockResolvedValue({
       name: "Particular.ServiceControl.CrossRegion",
       platform_health_status: "healthy",
@@ -51,7 +51,6 @@ describe("PlatformModelStore", () => {
     const store = usePlatformModelStore();
     await store.refresh();
 
-    expect(store.isMultiRegion).toBe(true);
     expect(store.monitoring).not.toBeNull();
     expect(store.monitoring?.role).toBe("monitoring");
     expect(store.primary?.role).toBe("primary-error");
@@ -121,6 +120,5 @@ describe("PlatformModelStore", () => {
 
     expect(store.remotes[0].kind).toBe("error");
     expect(store.remotes[0].role).toBe("remote-error");
-    expect(store.isMultiRegion).toBe(true);
   });
 });
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 5942b4ab41..c93b4a6340 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -13,7 +13,6 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const monitoring = computed(() => model.value?.monitoring ?? null);
   const auditInstances = computed(() => remotes.value.filter((instance) => instance.kind === "audit"));
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
-  const isMultiRegion = computed(() => model.value?.remotes.some((instance) => instance.role === "remote-error") ?? false);
 
   async function refresh() {
     const [primaryRoot, remotesResponse, monitoringResponse] = await Promise.all([getPrimaryRoot(), getRemotes(), getMonitoringRoot()]);
@@ -32,7 +31,6 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
     monitoring,
     auditInstances,
     errorInstances,
-    isMultiRegion,
     refresh,
   };
 });
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 30940cb99f..5470d36369 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -210,7 +210,7 @@ describe("PlatformHealthView", () => {
     expect(screen.getByRole("link", { name: "Particular.ServiceControl.Audit" })).toHaveAttribute("href", "http://localhost:33334/api/");
   });
 
-  test("renders monitoring when present even in multi-region", () => {
+  test("renders monitoring when present alongside remote error instances", () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
       primary: {
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
index 5de78f4c6b..5cb01c4c3d 100644
--- a/src/Frontend/test/mocks/platform-health-state.spec.ts
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -8,13 +8,13 @@ describe("platform-health-state", () => {
   });
 
   test("applies built-in and user custom check presets independently of topology scenario", () => {
-    window.__platformHealth?.setScenario("single-region-healthy");
+    window.__platformHealth?.setScenario("audit-remotes-healthy");
     window.__platformHealth?.setCustomCheckPreset("mixed-primary-and-user");
 
     const state = window.__platformHealth?.getState();
     const checks = getPlatformHealthCustomChecks();
 
-    expect(state?.scenario).toBe("single-region-healthy");
+    expect(state?.scenario).toBe("audit-remotes-healthy");
     expect(state?.customCheckPreset).toBe("mixed-primary-and-user");
     expect(checks).toHaveLength(2);
     expect(checks.some((check) => check.custom_check_id === "ServiceControl Primary Instance")).toBe(true);
@@ -29,7 +29,7 @@ describe("platform-health-state", () => {
   });
 
   test("supports a degraded primary platform custom check preset", () => {
-    window.__platformHealth?.setScenario("single-region-healthy");
+    window.__platformHealth?.setScenario("audit-remotes-healthy");
     window.__platformHealth?.setCustomCheckPreset("platform-only-primary-degraded");
 
     const state = window.__platformHealth?.getState();
@@ -41,8 +41,8 @@ describe("platform-health-state", () => {
     expect(checks[0].category).toBe("ServiceControl Health");
   });
 
-  test("keeps healthy single-region topology healthy until a related audit custom check is applied", () => {
-    window.__platformHealth?.setScenario("single-region-healthy");
+  test("keeps healthy audit remote topology healthy until a related audit custom check is applied", () => {
+    window.__platformHealth?.setScenario("audit-remotes-healthy");
 
     const state = window.__platformHealth?.getState();
 
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 96f7e7c5be..0ccc793523 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -29,14 +29,14 @@ declare global {
   }
 }
 
-let state = withCustomChecks(createScenario("single-region-healthy"), "none");
+let state = withCustomChecks(createScenario("audit-remotes-healthy"), "none");
 
 export function installPlatformHealthDevControls() {
   window.__platformHealth = {
     getState: () => cloneState(state),
     getCustomChecks: () => state.customChecks.map((check) => structuredClone(check)),
     reset: () => {
-      state = withCustomChecks(createScenario("single-region-healthy"), "none");
+      state = withCustomChecks(createScenario("audit-remotes-healthy"), "none");
       return cloneState(state);
     },
     setScenario: (name) => {
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index 81abeda638..07c33f8914 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -2,7 +2,7 @@ import { RemoteInstanceStatus, RemoteInstanceType, type RemoteInstance } from "@
 
 export const latestPlatformVersion = "6.19.3";
 
-export type PlatformTopologyScenarioName = "single-region-healthy" | "single-region-danger" | "multi-region-healthy" | "multi-region-danger";
+export type PlatformTopologyScenarioName = "audit-remotes-healthy" | "audit-remotes-danger" | "remote-errors-healthy" | "remote-errors-danger";
 export type PlatformTopologyStatus = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformTopologyRemote {
@@ -31,7 +31,7 @@ export interface PlatformTopology {
 
 export function createPlatformTopology(name: PlatformTopologyScenarioName): PlatformTopology {
   switch (name) {
-    case "single-region-healthy":
+    case "audit-remotes-healthy":
       return {
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
@@ -41,17 +41,17 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
       };
-    case "single-region-danger":
+    case "audit-remotes-danger":
       return {
         scenario: name,
-        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
           { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
           { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
         ],
         monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
       };
-    case "multi-region-healthy":
+    case "remote-errors-healthy":
       return {
         scenario: name,
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
@@ -61,7 +61,7 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         ],
         monitoring: null,
       };
-    case "multi-region-danger":
+    case "remote-errors-danger":
       return {
         scenario: name,
         primary: { name: "Particular.ServiceControl.CrossRegion", version: latestPlatformVersion, status: "healthy" },
diff --git a/src/Frontend/test/preconditions/platformCapabilities.ts b/src/Frontend/test/preconditions/platformCapabilities.ts
index 31ef22d935..fc2630bd86 100644
--- a/src/Frontend/test/preconditions/platformCapabilities.ts
+++ b/src/Frontend/test/preconditions/platformCapabilities.ts
@@ -81,7 +81,7 @@ export const hasAvailableAuditInstance =
 
 /** Precondition: Single audit instance that is unavailable */
 export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) => {
-  const topology = createPlatformTopology("single-region-healthy");
+  const topology = createPlatformTopology("audit-remotes-healthy");
   topology.remotes[1].status = "unavailable";
   const [instance] = toRemoteInstances({ remotes: [topology.remotes[1]] });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
@@ -91,7 +91,7 @@ export const hasUnavailableAuditInstance = ({ driver }: SetupFactoryOptions) =>
 
 /** Precondition: Multiple audit instances with mixed availability */
 export const hasPartiallyUnavailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const topology = createPlatformTopology("single-region-healthy");
+  const topology = createPlatformTopology("audit-remotes-healthy");
   topology.remotes[1].status = "unavailable";
   const remotes = toRemoteInstances({ remotes: topology.remotes });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
@@ -101,7 +101,7 @@ export const hasPartiallyUnavailableAuditInstances = ({ driver }: SetupFactoryOp
 
 /** Precondition: Multiple audit instances all online */
 export const hasMultipleAvailableAuditInstances = ({ driver }: SetupFactoryOptions) => {
-  const remotes = toRemoteInstances({ remotes: createPlatformTopology("single-region-healthy").remotes });
+  const remotes = toRemoteInstances({ remotes: createPlatformTopology("audit-remotes-healthy").remotes });
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
     body: remotes,
   });
@@ -210,10 +210,10 @@ export const hasMultipleMonitoredEndpoints =
 // RECOVERABILITY CAPABILITY
 // =============================================================================
 
-/** Precondition: A remote error instance is configured, putting Recoverability into multi-region mode */
+/** Precondition: A remote error instance is configured */
 export const hasRemoteErrorInstance = ({ driver }: SetupFactoryOptions) => {
   driver.mockEndpoint(`${window.defaultConfig.service_control_url}configuration/remotes`, {
-    body: toRemoteInstances({ remotes: [createPlatformTopology("multi-region-healthy").remotes[0]] }),
+    body: toRemoteInstances({ remotes: [createPlatformTopology("remote-errors-healthy").remotes[0]] }),
   });
 };
 
diff --git a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
index 29ab1a05c2..edb8e6b36f 100644
--- a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
@@ -39,7 +39,7 @@ describe("FEATURE: Recoverability capability card", () => {
   });
 
   describe("RULE: Recoverability card shows capability-specific failure management guidance", () => {
-    test("EXAMPLE: Single-region setup shows a green FailedMessages indicator", async ({ driver }) => {
+    test("EXAMPLE: Connected primary shows a green FailedMessages indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasNoAuditInstances);
@@ -64,7 +64,7 @@ describe("FEATURE: Recoverability capability card", () => {
       expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
     });
 
-    test("EXAMPLE: Multi-region setup shows a yellow FailedMessages indicator", async ({ driver }) => {
+    test("EXAMPLE: Remote error instances do not change the green FailedMessages indicator", async ({ driver }) => {
       // Arrange
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasRemoteErrorInstance);
@@ -84,7 +84,7 @@ describe("FEATURE: Recoverability capability card", () => {
 
       const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
       expect(failedMessagesIndicator).toBeInTheDocument();
-      expect(failedMessagesIndicator?.querySelector(".light-warning")).not.toBeNull();
+      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
     });
 
     test("EXAMPLE: Degraded primary instance still shows available status while connected", async ({ driver }) => {

From 04cdf8a5e4a0851b11975366c12919d3d26c626c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 09:48:29 +0200
Subject: [PATCH 40/67] Fix platform health danger scenarios

---
 docs/frontend/platform-health-page.md         |  5 +++--
 .../src/stores/PlatformHealthStore.spec.ts    | 22 +++++++++++++++++++
 .../src/stores/PlatformHealthStore.ts         |  8 +++++++
 src/Frontend/test/mocks/platform-topology.ts  |  6 ++---
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index e543a973c8..f7a780dc28 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -57,6 +57,7 @@ Current severity rules:
 - `danger`
   - primary error instance unavailable
   - any remote error instance not healthy
+  - any audit instance unavailable
   - monitoring unavailable
 - `warning`
   - primary error instance degraded
@@ -123,7 +124,7 @@ Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
 | Scenario | Purpose |
 |----------|---------|
 | `audit-remotes-healthy` | Primary and monitoring healthy, audit remotes healthy |
-| `audit-remotes-danger` | Primary healthy, audit remotes healthy, monitoring unavailable |
+| `audit-remotes-danger` | Primary healthy, both audit remotes unavailable, monitoring healthy |
 | `remote-errors-healthy` | Primary healthy with remote error instances and no monitoring |
 | `remote-errors-danger` | One remote error instance unavailable |
 
@@ -179,7 +180,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 | Area | Covered behavior |
 |------|------------------|
-| Platform health store | warning/danger severity, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
+| Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
 | Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
 | Mock helpers | independent topology and custom-check switching |
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index fa26f9c2bd..e6bb2aabb3 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -82,6 +82,28 @@ describe("PlatformHealthStore", () => {
     expect(store.issueSummary).toContain("unavailable Error instance");
   });
 
+  test("derives danger severity for unavailable audit remotes", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        remotes: singleRegionWarningModel.remotes.map((remote) => ({
+          ...remote,
+          health: "unavailable",
+        })),
+      };
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.severity).toBe("danger");
+    expect(store.issueSummary).toContain("unavailable Audit instance");
+    expect(store.rows[1].details).toContain("Audit instance is unavailable.");
+    expect(store.rows[2].details).toContain("Audit instance is unavailable.");
+  });
+
   test("includes monitoring unavailability in the issue summary whenever monitoring is configured", async () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.refresh = vi.fn(() => {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index de6b7d7fd4..879772cdb4 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -51,6 +51,10 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       return "danger";
     }
 
+    if (current.remotes.some((remote) => remote.kind === "audit" && remote.health === "unavailable")) {
+      return "danger";
+    }
+
     if (current.remotes.some((remote) => remote.kind === "audit" && remote.health === "degraded")) {
       return "warning";
     }
@@ -294,6 +298,10 @@ function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
     return ["Audit instance is degraded."];
   }
 
+  if (instance.role === "remote-audit" && instance.health === "unavailable") {
+    return ["Audit instance is unavailable."];
+  }
+
   if (instance.role === "primary-error") {
     if (instance.health === "unavailable") {
       return ["Primary error instance is unavailable."];
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index 07c33f8914..280eb6a381 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -46,10 +46,10 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         scenario: name,
         primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "healthy" },
         remotes: [
-          { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "healthy", instanceType: "audit" },
-          { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "healthy", instanceType: "audit" },
+          { id: "remote-0", name: "Particular.ServiceControl.Audit", apiUri: "http://Particular.ServiceControl.Audit/api/", version: "6.18.0", status: "unavailable", instanceType: "audit" },
+          { id: "remote-1", name: "Particular.ServiceControl.Audit-Blue", apiUri: "http://Particular.ServiceControl.Audit-Blue/api/", version: "6.17.0", status: "unavailable", instanceType: "audit" },
         ],
-        monitoring: { configured: true, version: latestPlatformVersion, status: "unavailable" },
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
       };
     case "remote-errors-healthy":
       return {

From 304bab6ac41c455e545a05c2cc28ceb633ca4968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 10:09:35 +0200
Subject: [PATCH 41/67] Add ServicePulse to platform health

---
 docs/frontend/platform-health-page.md         | 10 +++-
 docs/frontend/testing-basics.md               |  1 +
 src/Frontend/public/js/app.constants.js       |  2 +-
 .../src/components/PageFooter.spec.ts         | 59 +++++++++++++++++++
 src/Frontend/src/components/PageFooter.vue    | 18 +++---
 src/Frontend/src/resources/PlatformHealth.ts  |  3 +-
 src/Frontend/src/resources/PlatformModel.ts   |  7 +++
 .../src/stores/EnvironmentAndVersionsStore.ts |  2 +-
 .../src/stores/PlatformHealthStore.spec.ts    | 22 ++++++-
 .../src/stores/PlatformHealthStore.ts         | 26 +++++++-
 .../src/stores/PlatformModelStore.spec.ts     |  3 +
 src/Frontend/src/stores/PlatformModelStore.ts | 13 +++-
 .../src/views/PlatformHealthView.spec.ts      | 57 ++++++++++++++++--
 src/Frontend/src/views/PlatformHealthView.vue |  7 ++-
 src/Frontend/test/drivers/vitest/setup.ts     |  2 +-
 .../test/mocks/platform-updates-template.ts   |  4 +-
 16 files changed, 202 insertions(+), 34 deletions(-)
 create mode 100644 src/Frontend/src/components/PageFooter.spec.ts

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index f7a780dc28..53c91046b3 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -27,16 +27,19 @@ The page renders one row per platform instance:
 - primary error instance
 - zero or more remote instances
 - monitoring instance when configured
+- ServicePulse
 
 Each row shows:
 
 - instance type
-- instance name, linked directly to that instance `apiUrl`
+- name
 - current version
 - health state
 - upgrade cue when a newer version is known
 - no upgrade cue when the page only knows that versions differ but does not know a newer target version
 
+Platform instances link their name directly to `apiUrl`. The `ServicePulse` row keeps the name as plain text.
+
 Rows for degraded or unavailable instances can expand to show details.
 
 Those details come from:
@@ -74,7 +77,7 @@ The architecture intentionally separates shared platform state from page-specifi
 - `src/Frontend/src/stores/PlatformModelStore.ts`
   - shared aggregation and normalization layer
 - `src/Frontend/src/resources/PlatformModel.ts`
-  - shared platform types including `PlatformInstance`
+  - shared platform types including backend platform instances and the frontend `ServicePulse` model
 - `src/Frontend/src/stores/PlatformHealthStore.ts`
   - page-specific severity, rows, upgrade cues, and details
 
@@ -181,7 +184,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 | Area | Covered behavior |
 |------|------------------|
 | Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
-| Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, monitoring row rendering, expandable degraded rows |
+| Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, plain-text ServicePulse row rendering, monitoring row rendering, expandable degraded rows |
 | Mock helpers | independent topology and custom-check switching |
 
 ## Key Source Files
@@ -195,6 +198,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 | `src/Frontend/src/resources/PlatformHealth.ts` | Page-specific response/row types |
 | `src/Frontend/test/mocks/platform-health-state.ts` | Runtime mock topology and custom-check controls |
 | `src/Frontend/src/components/platformhealth/PlatformHealthMenuItem.vue` | Navigation severity and tooltip behavior |
+| `src/Frontend/src/components/PageFooter.vue` | Aggregate platform update status in the footer |
 
 ## Troubleshooting
 
diff --git a/docs/frontend/testing-basics.md b/docs/frontend/testing-basics.md
index 13038d5aca..332ac00d52 100644
--- a/docs/frontend/testing-basics.md
+++ b/docs/frontend/testing-basics.md
@@ -75,6 +75,7 @@ export const setupComplete = (async () => {
 Run focused Vitest specs from `src/Frontend`:
 
 ```bash
+npx vitest run src/components/PageFooter.spec.ts
 npx vitest run test/specs/platformcapabilities/monitoring-capability-card.spec.ts
 npx vitest run test/specs/platformcapabilities/recoverability-capability-card.spec.ts
 npx vitest run src/views/PlatformHealthView.spec.ts
diff --git a/src/Frontend/public/js/app.constants.js b/src/Frontend/public/js/app.constants.js
index 1c1a6c9e2f..805ad089ed 100644
--- a/src/Frontend/public/js/app.constants.js
+++ b/src/Frontend/public/js/app.constants.js
@@ -1,6 +1,6 @@
 window.defaultConfig = {
   default_route: '/dashboard',
-  version: '1.2.0',
+  version: '2.8.0',
   service_control_url: 'http://localhost:33333/api/',
   monitoring_urls: ['http://localhost:33633/'],
   showPendingRetry: false,
diff --git a/src/Frontend/src/components/PageFooter.spec.ts b/src/Frontend/src/components/PageFooter.spec.ts
new file mode 100644
index 0000000000..16db358a20
--- /dev/null
+++ b/src/Frontend/src/components/PageFooter.spec.ts
@@ -0,0 +1,59 @@
+import { render, screen } from "@component-test-utils";
+import { createTestingPinia } from "@pinia/testing";
+import { describe, expect, test, vi } from "vitest";
+import PageFooter from "@/components/PageFooter.vue";
+import { useLicenseStore } from "@/stores/LicenseStore";
+
+const RouterLinkStub = {
+  props: ["to"],
+  template: '<a :href="typeof to === `string` ? to : to?.link ?? ``"><slot /></a>',
+};
+
+const platformHealthStore = vi.hoisted(() => ({
+  outdatedOnly: false,
+  rows: [] as Array<{ upgradeAvailable: boolean }>,
+}));
+
+vi.mock("@/composables/usePlatformHealthStoreAutoRefresh", () => ({
+  default: () => ({
+    store: platformHealthStore,
+  }),
+}));
+
+describe("PageFooter", () => {
+  test("shows updates available and links to platform health when any row is outdated", () => {
+    platformHealthStore.outdatedOnly = false;
+    platformHealthStore.rows = [{ upgradeAvailable: false }, { upgradeAvailable: true }];
+
+    renderFooter();
+
+    const updatesLink = screen.getByRole("link", { name: /Updates available/i });
+    expect(updatesLink).toBeInTheDocument();
+    expect(updatesLink).toHaveAttribute("href", "/platform-health");
+  });
+
+  test("shows platform up to date when no rows are outdated", () => {
+    platformHealthStore.outdatedOnly = false;
+    platformHealthStore.rows = [{ upgradeAvailable: false }];
+
+    renderFooter();
+
+    expect(screen.getByText("Platform up to date")).toBeInTheDocument();
+  });
+});
+
+function renderFooter() {
+  const pinia = createTestingPinia({ stubActions: false });
+  const licenseStore = useLicenseStore(pinia);
+  licenseStore.license.license_status = "valid" as never;
+  licenseStore.licenseStatus.isTrialLicense = false;
+
+  return render(PageFooter, {
+    global: {
+      plugins: [pinia],
+      stubs: {
+        RouterLink: RouterLinkStub,
+      },
+    },
+  });
+}
diff --git a/src/Frontend/src/components/PageFooter.vue b/src/Frontend/src/components/PageFooter.vue
index b1ef748f7a..89f11d5a80 100644
--- a/src/Frontend/src/components/PageFooter.vue
+++ b/src/Frontend/src/components/PageFooter.vue
@@ -3,14 +3,12 @@ import { LicenseStatus } from "@/resources/LicenseInfo";
 import routeLinks from "@/router/routeLinks";
 import FAIcon from "@/components/FAIcon.vue";
 import { faArrowTurnUp, faPlus } from "@fortawesome/free-solid-svg-icons";
-import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
+import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
 import { storeToRefs } from "pinia";
 import { useConfigurationStore } from "@/stores/ConfigurationStore";
 import { useLicenseStore } from "@/stores/LicenseStore";
 
-const { store: environmentAndVersionsStore } = useEnvironmentAndVersionsAutoRefresh();
-const newVersions = environmentAndVersionsStore.newVersions;
-const environment = environmentAndVersionsStore.environment;
+const { store: platformHealthStore } = usePlatformHealthStoreAutoRefresh();
 const licenseStore = useLicenseStore();
 const { licenseStatus, license } = licenseStore;
 const isIntegrated = window.defaultConfig.isIntegrated;
@@ -30,12 +28,12 @@ const { configuration } = storeToRefs(configurationStore);
           </span>
 
           <span v-if="isIntegrated"> Integrated ServicePulse </span>
-          <template v-else-if="environment.sp_version">
-            <span v-if="!newVersions.newSPVersion.newspversion"> ServicePulse v{{ environment.sp_version }} </span>
-            <span v-else>
-              ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" />
-              <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>)
-            </span>
+          <template v-else>
+            <RouterLink v-if="platformHealthStore.outdatedOnly || platformHealthStore.rows.some((row) => row.upgradeAvailable)" :to="routeLinks.platformHealth">
+              <FAIcon class="footer-icon" :icon="faArrowTurnUp" />
+              Updates available
+            </RouterLink>
+            <span v-else>Platform up to date</span>
           </template>
         </div>
       </div>
diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
index 7c8b622110..7afcfc6265 100644
--- a/src/Frontend/src/resources/PlatformHealth.ts
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -6,11 +6,12 @@ export type PlatformHealthResponse = PlatformModel;
 
 export interface PlatformHealthRow {
   type: string;
-  instanceName: string;
+  name: string;
   apiUrl: string;
   version: string;
   health: PlatformInstanceHealth;
   note: string;
+  isLink: boolean;
   upgradeAvailable: boolean;
   latestVersion: string;
   upgradeLink: string;
diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index be49bfe291..58ddd95019 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -2,6 +2,12 @@ export type PlatformInstanceKind = "error" | "audit" | "monitoring";
 export type PlatformInstanceRole = "primary-error" | "remote-error" | "remote-audit" | "monitoring";
 export type PlatformInstanceHealth = "healthy" | "degraded" | "unavailable";
 
+export interface ServicePulse {
+  name: string;
+  version: string;
+  health: "healthy";
+}
+
 export interface PlatformInstance {
   id: string;
   name: string;
@@ -16,4 +22,5 @@ export interface PlatformModel {
   primary: PlatformInstance;
   remotes: PlatformInstance[];
   monitoring: PlatformInstance | null;
+  servicePulse: ServicePulse;
 }
diff --git a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
index e62c0a4050..b56c7e49c0 100644
--- a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
+++ b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
@@ -15,7 +15,7 @@ export const useEnvironmentAndVersionsStore = defineStore("EnvironmentAndVersion
     sc_version: "",
     minimum_supported_sc_version: "6.6.0",
     is_compatible_with_sc: true,
-    sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "1.2.0",
+    sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "2.8.0",
     supportsArchiveGroups: false,
     endpoints_error_url: "",
     known_endpoints_url: "",
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index e6bb2aabb3..922e883545 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -21,6 +21,9 @@ describe("PlatformHealthStore", () => {
     environmentAndVersionsStore.newVersions.newMVersion.newmversion = true;
     environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber = "6.19.3";
     environmentAndVersionsStore.newVersions.newMVersion.newmversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversion = true;
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversionnumber = "2.10.2";
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversionlink = "https://github.com/Particular/ServicePulse/releases/tag/2.10.2";
 
     vi.spyOn(logger, "warn").mockImplementation(() => undefined);
 
@@ -56,10 +59,13 @@ describe("PlatformHealthStore", () => {
     await store.refresh();
 
     expect(store.severity).toBe("warning");
-    expect(store.rows).toHaveLength(4);
+    expect(store.rows).toHaveLength(5);
     expect(store.outdatedOnly).toBe(false);
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
+    expect(store.rows[4].type).toBe("ServicePulse");
+    expect(store.rows[4].upgradeAvailable).toBe(true);
+    expect(store.rows[4].latestVersion).toBe("2.10.2");
     expect(store.issueSummary).toContain("1 issue detected");
     expect(store.issueSummary).toContain("degraded Audit instance");
     expect(store.issueSummary).not.toContain("unavailable Monitoring instance");
@@ -77,8 +83,8 @@ describe("PlatformHealthStore", () => {
     await store.refresh();
 
     expect(store.severity).toBe("danger");
-    expect(store.rows).toHaveLength(3);
-    expect(store.rows.every((row) => row.type === "Error instance" || row.type === "Monitoring instance")).toBe(true);
+    expect(store.rows).toHaveLength(4);
+    expect(store.rows.filter((row) => row.type !== "ServicePulse").every((row) => row.type === "Error instance" || row.type === "Monitoring instance")).toBe(true);
     expect(store.issueSummary).toContain("unavailable Error instance");
   });
 
@@ -436,6 +442,11 @@ const singleRegionWarningModel: PlatformModel = {
     health: "healthy",
     apiUrl: "http://localhost:33633/",
   },
+  servicePulse: {
+    name: "ServicePulse",
+    version: "2.8.0",
+    health: "healthy",
+  },
 };
 
 const remoteErrorsDangerModel: PlatformModel = {
@@ -469,4 +480,9 @@ const remoteErrorsDangerModel: PlatformModel = {
     },
   ],
   monitoring: null,
+  servicePulse: {
+    name: "ServicePulse",
+    version: "2.8.0",
+    health: "healthy",
+  },
 };
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 879772cdb4..b5285de13a 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -4,7 +4,7 @@ import { isUpgradeAvailable } from "@/composables/serviceSemVer";
 import { getBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
 import type CustomCheck from "@/resources/CustomCheck";
-import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
+import type { PlatformInstance, PlatformModel, ServicePulse } from "@/resources/PlatformModel";
 import logger from "@/logger";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { useCustomChecksStore } from "@/stores/CustomChecksStore";
@@ -76,6 +76,8 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
     const latestServiceControlLink = environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink || buildReleaseLink(latestServiceControlVersion);
     const latestMonitoringVersion = environmentAndVersionsStore.newVersions.newMVersion.newmversionnumber || firstKnownVersion(current.monitoring?.version, window.__platformHealth?.getState().monitoring?.version, latestServiceControlVersion);
     const latestMonitoringLink = environmentAndVersionsStore.newVersions.newMVersion.newmversionlink || buildReleaseLink(latestMonitoringVersion);
+    const latestServicePulseVersion = environmentAndVersionsStore.newVersions.newSPVersion.newspversionnumber;
+    const latestServicePulseLink = environmentAndVersionsStore.newVersions.newSPVersion.newspversionlink;
 
     const nextRows: PlatformHealthRow[] = [
       toRow(current.primary, latestServiceControlVersion, latestServiceControlLink, detailsForInstance(current.primary, current, platformChecks)),
@@ -86,6 +88,8 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
       nextRows.push(toRow(current.monitoring, latestMonitoringVersion, latestMonitoringLink, detailsForInstance(current.monitoring, current, platformChecks)));
     }
 
+    nextRows.push(toServicePulseRow(current.servicePulse, latestServicePulseVersion, latestServicePulseLink));
+
     return nextRows;
   });
 
@@ -178,11 +182,12 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string, details: string[]): PlatformHealthRow {
   return {
     type: formatRowType(instance),
-    instanceName: instance.name,
+    name: instance.name,
     apiUrl: instance.apiUrl,
     version: instance.version,
     health: instance.health,
     note: formatRole(instance.role),
+    isLink: true,
     upgradeAvailable: hasUpgrade(instance.version, latestVersion),
     latestVersion,
     upgradeLink,
@@ -191,6 +196,23 @@ function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: s
   };
 }
 
+function toServicePulseRow(servicePulse: ServicePulse, latestVersion: string, upgradeLink: string): PlatformHealthRow {
+  return {
+    type: "ServicePulse",
+    name: servicePulse.name,
+    apiUrl: "",
+    version: servicePulse.version,
+    health: servicePulse.health,
+    note: "ServicePulse",
+    isLink: false,
+    upgradeAvailable: hasUpgrade(servicePulse.version, latestVersion),
+    latestVersion,
+    upgradeLink,
+    isExpandable: false,
+    details: [],
+  };
+}
+
 function formatRowType(instance: PlatformInstance) {
   if (instance.kind === "audit") {
     return "Audit instance";
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 97f23d3c11..4a30900bc0 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -51,6 +51,9 @@ describe("PlatformModelStore", () => {
     const store = usePlatformModelStore();
     await store.refresh();
 
+    expect(store.servicePulse).not.toBeNull();
+    expect(store.servicePulse?.name).toBe("ServicePulse");
+    expect(store.servicePulse?.health).toBe("healthy");
     expect(store.monitoring).not.toBeNull();
     expect(store.monitoring?.role).toBe("monitoring");
     expect(store.primary?.role).toBe("primary-error");
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index c93b4a6340..82cbb30f7a 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -3,7 +3,7 @@ import { computed, ref } from "vue";
 import serviceControlClient, { type ServiceControlRootDocument } from "@/components/serviceControlClient";
 import monitoringClient, { type MonitoringRoot } from "@/components/monitoring/monitoringClient";
 import { RemoteInstanceType, type RemoteInstance } from "@/resources/RemoteInstance";
-import type { PlatformInstance, PlatformModel } from "@/resources/PlatformModel";
+import type { PlatformInstance, PlatformModel, ServicePulse } from "@/resources/PlatformModel";
 
 export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const model = ref<PlatformModel | null>(null);
@@ -11,6 +11,7 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const primary = computed(() => model.value?.primary ?? null);
   const remotes = computed(() => model.value?.remotes ?? []);
   const monitoring = computed(() => model.value?.monitoring ?? null);
+  const servicePulse = computed(() => model.value?.servicePulse ?? null);
   const auditInstances = computed(() => remotes.value.filter((instance) => instance.kind === "audit"));
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
 
@@ -21,6 +22,7 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
       primary: mapPrimary(primaryRoot),
       remotes: mapRemotes(remotesResponse),
       monitoring: mapMonitoring(monitoringResponse),
+      servicePulse: mapServicePulse(),
     };
   }
 
@@ -29,6 +31,7 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
     primary,
     remotes,
     monitoring,
+    servicePulse,
     auditInstances,
     errorInstances,
     refresh,
@@ -135,6 +138,14 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance
   };
 }
 
+function mapServicePulse(): ServicePulse {
+  return {
+    name: "ServicePulse",
+    version: window.defaultConfig?.version ?? "Unknown",
+    health: "healthy",
+  };
+}
+
 function extractInstanceName(apiUri: string) {
   try {
     const uri = new URL(apiUri);
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 5470d36369..af9200c7f1 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -33,6 +33,9 @@ describe("PlatformHealthView", () => {
     environmentAndVersionsStore.newVersions.newSCVersion.newscversion = true;
     environmentAndVersionsStore.newVersions.newSCVersion.newscversionnumber = "6.19.3";
     environmentAndVersionsStore.newVersions.newSCVersion.newscversionlink = "https://github.com/Particular/ServiceControl/releases/tag/6.19.3";
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversion = true;
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversionnumber = "2.10.2";
+    environmentAndVersionsStore.newVersions.newSPVersion.newspversionlink = "https://github.com/Particular/ServicePulse/releases/tag/2.10.2";
   });
 
   test("requires the configuration download before enabling the support link", async () => {
@@ -49,6 +52,7 @@ describe("PlatformHealthView", () => {
       },
       remotes: [],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     render(PlatformHealthView, {
@@ -95,6 +99,7 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     render(PlatformHealthView, {
@@ -132,16 +137,18 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
       {
         type: "Error instance",
-        instanceName: "Particular.ServiceControl",
+        name: "Particular.ServiceControl",
         apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
+        isLink: true,
         upgradeAvailable: false,
         latestVersion: "",
         upgradeLink: "",
@@ -150,11 +157,12 @@ describe("PlatformHealthView", () => {
       },
       {
         type: "Audit instance",
-        instanceName: "Particular.ServiceControl.Audit",
+        name: "Particular.ServiceControl.Audit",
         apiUrl: "http://Particular.ServiceControl.Audit/api/",
         version: "6.18.0",
         health: "healthy",
         note: "Audit instance",
+        isLink: true,
         upgradeAvailable: false,
         latestVersion: "",
         upgradeLink: "",
@@ -174,7 +182,7 @@ describe("PlatformHealthView", () => {
     rows.mockRestore();
   });
 
-  test("links each instance name to the instance api url", () => {
+  test("links each instance name to the instance api url and keeps ServicePulse as plain text", () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
       primary: {
@@ -198,6 +206,7 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     render(PlatformHealthView, {
@@ -208,6 +217,8 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByRole("link", { name: "Particular.ServiceControl" })).toHaveAttribute("href", "http://localhost:33333/api/");
     expect(screen.getByRole("link", { name: "Particular.ServiceControl.Audit" })).toHaveAttribute("href", "http://localhost:33334/api/");
+    expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
+    expect(screen.queryByRole("link", { name: "ServicePulse" })).not.toBeInTheDocument();
   });
 
   test("renders monitoring when present alongside remote error instances", () => {
@@ -242,6 +253,7 @@ describe("PlatformHealthView", () => {
         health: "healthy",
         apiUrl: "http://localhost:33633/",
       },
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     render(PlatformHealthView, {
@@ -278,16 +290,18 @@ describe("PlatformHealthView", () => {
         },
       ],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
       {
         type: "Error instance",
-        instanceName: "Particular.ServiceControl",
+        name: "Particular.ServiceControl",
         apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
+        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
@@ -296,11 +310,12 @@ describe("PlatformHealthView", () => {
       },
       {
         type: "Audit instance",
-        instanceName: "Particular.ServiceControl.Audit",
+        name: "Particular.ServiceControl.Audit",
         apiUrl: "http://localhost:33334/api/",
         version: "6.19.3",
         health: "degraded",
         note: "Audit instance",
+        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
@@ -338,16 +353,18 @@ describe("PlatformHealthView", () => {
       },
       remotes: [],
       monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
     } satisfies PlatformModel;
 
     const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
       {
         type: "Error instance",
-        instanceName: "Particular.ServiceControl",
+        name: "Particular.ServiceControl",
         apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
+        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
@@ -367,4 +384,32 @@ describe("PlatformHealthView", () => {
 
     rows.mockRestore();
   });
+
+  test("renders the Name header and a ServicePulse version nudge", () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [],
+      monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
+    } satisfies PlatformModel;
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    expect(screen.getByRole("columnheader", { name: "Name" })).toBeInTheDocument();
+    expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
+    expect(screen.getByText(/v2.10.2 available/i)).toBeInTheDocument();
+  });
 });
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index bfe4b437ef..7edd0a9023 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -35,7 +35,7 @@ function shouldShowUpgradeCue(row: (typeof store.rows)[number]) {
 }
 
 function rowKey(row: (typeof store.rows)[number]) {
-  return `${row.type}-${row.instanceName}`;
+  return `${row.type}-${row.name}`;
 }
 
 function isExpandable(row: (typeof store.rows)[number]) {
@@ -74,7 +74,7 @@ function toggleRow(row: (typeof store.rows)[number]) {
               <thead>
                 <tr>
                   <th>Type</th>
-                  <th>Instance name</th>
+                  <th>Name</th>
                   <th>Version</th>
                   <th>Health</th>
                 </tr>
@@ -84,7 +84,8 @@ function toggleRow(row: (typeof store.rows)[number]) {
                   <tr>
                     <td class="type-cell">{{ row.type }}</td>
                     <td>
-                      <a class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.instanceName }}</a>
+                      <a v-if="row.isLink" class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.name }}</a>
+                      <span v-else class="instance-name">{{ row.name }}</span>
                       <div class="instance-note">{{ row.note }}</div>
                     </td>
                     <td>
diff --git a/src/Frontend/test/drivers/vitest/setup.ts b/src/Frontend/test/drivers/vitest/setup.ts
index b987eae445..b3fa1393c3 100644
--- a/src/Frontend/test/drivers/vitest/setup.ts
+++ b/src/Frontend/test/drivers/vitest/setup.ts
@@ -34,7 +34,7 @@ if (!config.global.plugins.includes(VueTippy)) {
 
 const defaultConfig = {
   default_route: "/dashboard",
-  version: "1.2.0",
+  version: "2.8.0",
   service_control_url: "http://localhost:33333/api/",
   monitoring_urls: ["http://localhost:33633/"],
   showPendingRetry: false,
diff --git a/src/Frontend/test/mocks/platform-updates-template.ts b/src/Frontend/test/mocks/platform-updates-template.ts
index 2e8d33f73a..553aad1611 100644
--- a/src/Frontend/test/mocks/platform-updates-template.ts
+++ b/src/Frontend/test/mocks/platform-updates-template.ts
@@ -50,8 +50,8 @@ export const serviceControlNoPlatformUpdatesNeeded: Release[] = [
 
 export const servicePulseNoPlatformUpdatesNeeded: Release[] = [
   {
-    tag: "1.37.0",
-    release: "https://github.com/Particular/ServicePulse/releases/tag/1.37.0",
+    tag: "2.10.2",
+    release: "https://github.com/Particular/ServicePulse/releases/tag/2.10.2",
     published: "2023-08-16T14:57:29Z",
   },
   {

From 3d900525661431fcc67a7f3de87485d1ea9b8cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 10:35:53 +0200
Subject: [PATCH 42/67] Refine platform health row details

---
 docs/frontend/platform-health-page.md         | 11 ++-
 src/Frontend/src/resources/PlatformHealth.ts  |  6 +-
 .../src/stores/PlatformHealthStore.spec.ts    | 34 +++++---
 .../src/stores/PlatformHealthStore.ts         | 24 +++---
 .../src/views/PlatformHealthView.spec.ts      | 85 +++++++++++++------
 src/Frontend/src/views/PlatformHealthView.vue | 59 +++++++++----
 .../test/mocks/platform-health-state.ts       |  6 ++
 .../test/preconditions/customChecks.ts        |  3 +-
 8 files changed, 151 insertions(+), 77 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 53c91046b3..62cde02f62 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -38,15 +38,18 @@ Each row shows:
 - upgrade cue when a newer version is known
 - no upgrade cue when the page only knows that versions differ but does not know a newer target version
 
-Platform instances link their name directly to `apiUrl`. The `ServicePulse` row keeps the name as plain text.
+Rows are always expandable via the health badge. Expanded content separates informational details such as `API: <url>` from `healthDetails` such as unavailability or degradation messages. The `ServicePulse` row expands to a neutral `No problems detected.` detail.
 
-Rows for degraded or unavailable instances can expand to show details.
+Rows expand from the health badge to show details.
 
 Those details come from:
 
+- informational row context such as the instance API URL
 - matching built-in platform custom checks when available
 - fallback page-specific messages when no custom-check detail is available
 
+Built-in custom-check `healthDetails` can include both the failure summary and a `Reported at: <timestamp>` line.
+
 ## Severity Model
 
 The page-level severity shown in navigation follows this precedence:
@@ -155,7 +158,7 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Danger state from unavailable instances | `setScenario("audit-remotes-danger")` or `setScenario("remote-errors-danger")` |
 | Remote error instances | `setScenario("remote-errors-healthy")` |
 | Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
-| Expanded row details with `failure_reason` | trigger degraded/unavailable row, then click the health badge |
+| Expanded row details with separate info and issue sections | trigger any row, then click the health badge |
 | Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
 | Support-case modal download flow | click `Open support case`, download the JSON, then verify the support link becomes enabled |
 
@@ -184,7 +187,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 | Area | Covered behavior |
 |------|------------------|
 | Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
-| Platform health view | support download gating, known-version-only upgrade cue rendering, direct instance links, plain-text ServicePulse row rendering, monitoring row rendering, expandable degraded rows |
+| Platform health view | support download gating, known-version-only upgrade cue rendering, plain-text names, API-in-details rendering, monitoring row rendering, always-expandable health badges |
 | Mock helpers | independent topology and custom-check switching |
 
 ## Key Source Files
diff --git a/src/Frontend/src/resources/PlatformHealth.ts b/src/Frontend/src/resources/PlatformHealth.ts
index 7afcfc6265..4a8f9d99ee 100644
--- a/src/Frontend/src/resources/PlatformHealth.ts
+++ b/src/Frontend/src/resources/PlatformHealth.ts
@@ -7,14 +7,12 @@ export type PlatformHealthResponse = PlatformModel;
 export interface PlatformHealthRow {
   type: string;
   name: string;
-  apiUrl: string;
   version: string;
   health: PlatformInstanceHealth;
   note: string;
-  isLink: boolean;
   upgradeAvailable: boolean;
   latestVersion: string;
   upgradeLink: string;
-  isExpandable: boolean;
-  details: string[];
+  infoDetails: string[];
+  healthDetails: string[];
 }
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 922e883545..3792cedec8 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -9,6 +9,8 @@ import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 import type { PlatformModel } from "@/resources/PlatformModel";
 import logger from "@/logger";
 
+const currentReportedAt = new Date().toISOString();
+
 describe("PlatformHealthStore", () => {
   beforeEach(() => {
     setActivePinia(createPinia());
@@ -39,7 +41,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Audit Message Ingestion",
         category: "ServiceControl.Audit Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
@@ -63,9 +65,13 @@ describe("PlatformHealthStore", () => {
     expect(store.outdatedOnly).toBe(false);
     expect(store.rows[2].upgradeAvailable).toBe(true);
     expect(store.rows[2].latestVersion).toBe("6.19.3");
+    expect(store.rows[0].infoDetails[0]).toBe("API: http://localhost:33333/api/");
     expect(store.rows[4].type).toBe("ServicePulse");
     expect(store.rows[4].upgradeAvailable).toBe(true);
     expect(store.rows[4].latestVersion).toBe("2.10.2");
+    expect(store.rows[4].infoDetails).toEqual([]);
+    expect(store.rows[4].healthDetails).toEqual(["No problems detected."]);
+    expect(store.rows[2].healthDetails).toContain(`Reported at: ${currentReportedAt}`);
     expect(store.issueSummary).toContain("1 issue detected");
     expect(store.issueSummary).toContain("degraded Audit instance");
     expect(store.issueSummary).not.toContain("unavailable Monitoring instance");
@@ -106,8 +112,10 @@ describe("PlatformHealthStore", () => {
 
     expect(store.severity).toBe("danger");
     expect(store.issueSummary).toContain("unavailable Audit instance");
-    expect(store.rows[1].details).toContain("Audit instance is unavailable.");
-    expect(store.rows[2].details).toContain("Audit instance is unavailable.");
+    expect(store.rows[1].infoDetails).toContain("API: http://Particular.ServiceControl.Audit/api/");
+    expect(store.rows[1].healthDetails).toContain("Audit instance is unavailable.");
+    expect(store.rows[2].infoDetails).toContain("API: http://Particular.ServiceControl.Audit-Blue/api/");
+    expect(store.rows[2].healthDetails).toContain("Audit instance is unavailable.");
   });
 
   test("includes monitoring unavailability in the issue summary whenever monitoring is configured", async () => {
@@ -182,7 +190,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "ServiceControl Primary Instance",
         category: "Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Critical error detected",
         originating_endpoint: {
           name: "Particular.ServiceControl",
@@ -195,7 +203,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Audit Message Ingestion",
         category: "ServiceControl.Audit Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
@@ -228,7 +236,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Error Message Ingestion Process",
         category: "ServiceControl Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Error ingestion stopped",
         originating_endpoint: {
           name: "Particular.ServiceControl",
@@ -259,8 +267,10 @@ describe("PlatformHealthStore", () => {
 
     expect(store.payload?.primary.health).toBe("degraded");
     expect(store.severity).toBe("warning");
+    expect(store.rows[0].infoDetails).toContain("API: http://localhost:33333/api/");
     expect(store.issueSummary).toContain("primary Error instance degraded");
-    expect(store.rows[0].details).toContain("Error Message Ingestion Process: Error ingestion stopped");
+    expect(store.rows[0].healthDetails).toContain("Error Message Ingestion Process: Error ingestion stopped");
+    expect(store.rows[0].healthDetails).toContain(`Reported at: ${currentReportedAt}`);
   });
 
   test("does not degrade an audit instance when the built-in check belongs to another audit instance", async () => {
@@ -271,7 +281,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Audit Message Ingestion",
         category: "ServiceControl.Audit Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit.Other",
@@ -308,7 +318,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Audit Message Ingestion",
         category: "ServiceControl.Audit Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
@@ -385,7 +395,7 @@ describe("PlatformHealthStore", () => {
         custom_check_id: "Audit Message Ingestion",
         category: "ServiceControl.Audit Health",
         status: Status.Fail,
-        reported_at: "2025-01-10T05:06:30.4074087Z",
+        reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
@@ -399,7 +409,9 @@ describe("PlatformHealthStore", () => {
 
     expect(store.payload?.remotes[1].health).toBe("degraded");
     expect(store.severity).toBe("warning");
-    expect(store.rows[2].details).toContain("Audit Message Ingestion: Audit ingestion failed");
+    expect(store.rows[2].infoDetails).toContain("API: http://Particular.ServiceControl.Audit-Blue/api/");
+    expect(store.rows[2].healthDetails).toContain("Audit Message Ingestion: Audit ingestion failed");
+    expect(store.rows[2].healthDetails).toContain(`Reported at: ${currentReportedAt}`);
   });
 });
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index b5285de13a..0853787dc9 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -179,20 +179,20 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
   };
 });
 
-function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string, details: string[]): PlatformHealthRow {
+function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string, healthDetails: string[]): PlatformHealthRow {
+  const infoDetails = [`API: ${instance.apiUrl}`];
+
   return {
     type: formatRowType(instance),
     name: instance.name,
-    apiUrl: instance.apiUrl,
     version: instance.version,
     health: instance.health,
     note: formatRole(instance.role),
-    isLink: true,
     upgradeAvailable: hasUpgrade(instance.version, latestVersion),
     latestVersion,
     upgradeLink,
-    isExpandable: details.length > 0,
-    details,
+    infoDetails,
+    healthDetails,
   };
 }
 
@@ -200,16 +200,14 @@ function toServicePulseRow(servicePulse: ServicePulse, latestVersion: string, up
   return {
     type: "ServicePulse",
     name: servicePulse.name,
-    apiUrl: "",
     version: servicePulse.version,
     health: servicePulse.health,
     note: "ServicePulse",
-    isLink: false,
     upgradeAvailable: hasUpgrade(servicePulse.version, latestVersion),
     latestVersion,
     upgradeLink,
-    isExpandable: false,
-    details: [],
+    infoDetails: [],
+    healthDetails: ["No problems detected."],
   };
 }
 
@@ -281,7 +279,7 @@ function applyPlatformHealthChecks(model: PlatformModel, checks: CustomCheck[])
 
 function detailsForInstance(instance: PlatformInstance, model: PlatformModel, checks: CustomCheck[]) {
   const matchingPlatformChecks = checks.filter((check) => matchesInstance(check, instance));
-  const details = matchingPlatformChecks.map((check) => formatCustomCheckDetail(check));
+  const details = matchingPlatformChecks.flatMap((check) => formatCustomCheckDetails(check));
 
   if (details.length > 0) {
     return details;
@@ -303,8 +301,10 @@ function matchesInstance(check: CustomCheck, instance: PlatformInstance) {
   return sameInstanceName(check.originating_endpoint.name, instance.name);
 }
 
-function formatCustomCheckDetail(check: CustomCheck) {
-  return check.failure_reason ? `${check.custom_check_id}: ${check.failure_reason}` : check.custom_check_id;
+function formatCustomCheckDetails(check: CustomCheck) {
+  const summary = check.failure_reason ? `${check.custom_check_id}: ${check.failure_reason}` : check.custom_check_id;
+
+  return [summary, `Reported at: ${check.reported_at}`];
 }
 
 function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index af9200c7f1..29c0e306a5 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -8,6 +8,8 @@ import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsS
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 import type { PlatformModel } from "@/resources/PlatformModel";
 
+const currentReportedAt = new Date().toISOString();
+
 const downloadFileFromString = vi.fn();
 
 vi.mock("@/composables/fileDownloadCreator", () => ({
@@ -144,30 +146,26 @@ describe("PlatformHealthView", () => {
       {
         type: "Error instance",
         name: "Particular.ServiceControl",
-        apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
-        isLink: true,
         upgradeAvailable: false,
         latestVersion: "",
         upgradeLink: "",
-        isExpandable: false,
-        details: [],
+        infoDetails: ["API: http://localhost:33333/api/"],
+        healthDetails: [],
       },
       {
         type: "Audit instance",
         name: "Particular.ServiceControl.Audit",
-        apiUrl: "http://Particular.ServiceControl.Audit/api/",
         version: "6.18.0",
         health: "healthy",
         note: "Audit instance",
-        isLink: true,
         upgradeAvailable: false,
         latestVersion: "",
         upgradeLink: "",
-        isExpandable: false,
-        details: [],
+        infoDetails: ["API: http://Particular.ServiceControl.Audit/api/"],
+        healthDetails: [],
       },
     ]);
 
@@ -182,7 +180,7 @@ describe("PlatformHealthView", () => {
     rows.mockRestore();
   });
 
-  test("links each instance name to the instance api url and keeps ServicePulse as plain text", () => {
+  test("renders names as plain text and shows api urls in expanded details", async () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
       primary: {
@@ -215,10 +213,12 @@ describe("PlatformHealthView", () => {
       },
     });
 
-    expect(screen.getByRole("link", { name: "Particular.ServiceControl" })).toHaveAttribute("href", "http://localhost:33333/api/");
-    expect(screen.getByRole("link", { name: "Particular.ServiceControl.Audit" })).toHaveAttribute("href", "http://localhost:33334/api/");
+    expect(screen.queryByRole("link", { name: "Particular.ServiceControl" })).not.toBeInTheDocument();
+    expect(screen.queryByRole("link", { name: "Particular.ServiceControl.Audit" })).not.toBeInTheDocument();
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
-    expect(screen.queryByRole("link", { name: "ServicePulse" })).not.toBeInTheDocument();
+    const user = userEvent.setup();
+    await user.click(screen.getAllByRole("button", { name: /Healthy/i })[0]);
+    expect(screen.getByText("API: http://localhost:33333/api/")).toBeInTheDocument();
   });
 
   test("renders monitoring when present alongside remote error instances", () => {
@@ -265,7 +265,7 @@ describe("PlatformHealthView", () => {
     expect(screen.getByText(/Particular.ServiceControl.Monitoring/i)).toBeInTheDocument();
   });
 
-  test("shows details when clicking a degraded health badge", async () => {
+  test("shows details when clicking a health badge", async () => {
     const store = usePlatformHealthStore();
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
@@ -297,30 +297,26 @@ describe("PlatformHealthView", () => {
       {
         type: "Error instance",
         name: "Particular.ServiceControl",
-        apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
-        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
-        isExpandable: false,
-        details: [],
+        infoDetails: ["API: http://localhost:33333/api/"],
+        healthDetails: [],
       },
       {
         type: "Audit instance",
         name: "Particular.ServiceControl.Audit",
-        apiUrl: "http://localhost:33334/api/",
         version: "6.19.3",
         health: "degraded",
         note: "Audit instance",
-        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
-        isExpandable: true,
-        details: ["Audit Message Ingestion: Audit ingestion failed"],
+        infoDetails: ["API: http://localhost:33334/api/"],
+        healthDetails: ["Audit Message Ingestion: Audit ingestion failed", `Reported at: ${currentReportedAt}`],
       },
     ]);
 
@@ -333,12 +329,14 @@ describe("PlatformHealthView", () => {
     const user = userEvent.setup();
     await user.click(screen.getByRole("button", { name: "Degraded" }));
 
+    expect(screen.getByText("API: http://localhost:33334/api/")).toBeInTheDocument();
     expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
+    expect(screen.getByText(`Reported at: ${currentReportedAt}`)).toBeInTheDocument();
 
     rows.mockRestore();
   });
 
-  test("does not make healthy rows expandable", () => {
+  test("makes healthy rows expandable", async () => {
     const store = usePlatformHealthStore();
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
@@ -360,16 +358,14 @@ describe("PlatformHealthView", () => {
       {
         type: "Error instance",
         name: "Particular.ServiceControl",
-        apiUrl: "http://localhost:33333/api/",
         version: "6.19.3",
         health: "healthy",
         note: "Primary error instance",
-        isLink: true,
         upgradeAvailable: false,
         latestVersion: "6.19.3",
         upgradeLink: "",
-        isExpandable: false,
-        details: [],
+        infoDetails: ["API: http://localhost:33333/api/"],
+        healthDetails: [],
       },
     ]);
 
@@ -379,8 +375,9 @@ describe("PlatformHealthView", () => {
       },
     });
 
-    expect(screen.queryByRole("button", { name: "Healthy" })).not.toBeInTheDocument();
-    expect(screen.getByText("Healthy")).toBeInTheDocument();
+    const user = userEvent.setup();
+    await user.click(screen.getByRole("button", { name: /Healthy/i }));
+    expect(screen.getByText("API: http://localhost:33333/api/")).toBeInTheDocument();
 
     rows.mockRestore();
   });
@@ -412,4 +409,36 @@ describe("PlatformHealthView", () => {
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
     expect(screen.getByText(/v2.10.2 available/i)).toBeInTheDocument();
   });
+
+  test("shows no problems detected when expanding ServicePulse", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "healthy",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [],
+      monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
+    } satisfies PlatformModel;
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    const user = userEvent.setup();
+    const buttons = screen.getAllByRole("button", { name: /Healthy/i });
+    const servicePulseButton = buttons.find((button) => button.getAttribute("aria-controls") === "ServicePulse-ServicePulse-details");
+    expect(servicePulseButton).toBeDefined();
+    await user.click(servicePulseButton!);
+
+    expect(screen.getByText("No problems detected.")).toBeInTheDocument();
+  });
 });
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 7edd0a9023..3cda7544df 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import LicenseNotExpired from "@/components/LicenseNotExpired.vue";
 import ActionButton from "@/components/ActionButton.vue";
 import PlatformHealthSupportModal from "@/components/platformhealth/PlatformHealthSupportModal.vue";
 import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
 import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
 import FAIcon from "@/components/FAIcon.vue";
-import { faArrowTurnUp } from "@fortawesome/free-solid-svg-icons";
+import { faArrowTurnUp, faChevronDown } from "@fortawesome/free-solid-svg-icons";
 
 const { store } = usePlatformHealthStoreAutoRefresh();
 useEnvironmentAndVersionsAutoRefresh();
@@ -38,19 +38,23 @@ function rowKey(row: (typeof store.rows)[number]) {
   return `${row.type}-${row.name}`;
 }
 
-function isExpandable(row: (typeof store.rows)[number]) {
-  return row.isExpandable && (row.health === "degraded" || row.health === "unavailable");
-}
-
 function isExpanded(row: (typeof store.rows)[number]) {
   return expandedRowKey.value === rowKey(row);
 }
 
-function toggleRow(row: (typeof store.rows)[number]) {
-  if (!isExpandable(row)) {
-    return;
-  }
+function chevronClass(row: (typeof store.rows)[number]) {
+  return {
+    expanded: isExpanded(row),
+  };
+}
 
+const healthLabel = computed(() => ({
+  healthy: "Healthy",
+  degraded: "Degraded",
+  unavailable: "Unavailable",
+}));
+
+function toggleRow(row: (typeof store.rows)[number]) {
   expandedRowKey.value = isExpanded(row) ? null : rowKey(row);
 }
 </script>
@@ -84,8 +88,7 @@ function toggleRow(row: (typeof store.rows)[number]) {
                   <tr>
                     <td class="type-cell">{{ row.type }}</td>
                     <td>
-                      <a v-if="row.isLink" class="instance-name" :href="row.apiUrl" target="_blank" rel="noopener noreferrer">{{ row.name }}</a>
-                      <span v-else class="instance-name">{{ row.name }}</span>
+                      <span class="instance-name">{{ row.name }}</span>
                       <div class="instance-note">{{ row.note }}</div>
                     </td>
                     <td>
@@ -96,16 +99,19 @@ function toggleRow(row: (typeof store.rows)[number]) {
                       </a>
                     </td>
                     <td>
-                      <button v-if="isExpandable(row)" type="button" class="health-badge health-badge-button" :class="row.health" :aria-expanded="isExpanded(row)" :aria-controls="`${rowKey(row)}-details`" @click="toggleRow(row)">
-                        {{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}
+                      <button type="button" class="health-badge health-badge-button" :class="row.health" :aria-expanded="isExpanded(row)" :aria-controls="`${rowKey(row)}-details`" @click="toggleRow(row)">
+                        <span>{{ healthLabel[row.health] }}</span>
+                        <FAIcon class="health-chevron" :class="chevronClass(row)" :icon="faChevronDown" />
                       </button>
-                      <span v-else class="health-badge" :class="row.health">{{ row.health.charAt(0).toUpperCase() + row.health.slice(1) }}</span>
                     </td>
                   </tr>
                   <tr v-if="isExpanded(row)" :id="`${rowKey(row)}-details`" class="details-row">
                     <td colspan="4" class="details-cell">
-                      <ul class="details-list">
-                        <li v-for="detail in row.details" :key="detail">{{ detail }}</li>
+                      <ul v-if="row.infoDetails.length > 0" class="details-list details-list-info">
+                        <li v-for="detail in row.infoDetails" :key="detail">{{ detail }}</li>
+                      </ul>
+                      <ul class="details-list details-list-status">
+                        <li v-for="detail in row.healthDetails" :key="detail">{{ detail }}</li>
                       </ul>
                     </td>
                   </tr>
@@ -204,6 +210,7 @@ tbody tr:last-child td {
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  gap: 0.375rem;
   min-width: 104px;
   padding: 5px 10px;
   border-radius: 999px;
@@ -226,6 +233,15 @@ tbody tr:last-child td {
   outline-offset: 2px;
 }
 
+.health-chevron {
+  font-size: 10px;
+  transition: transform 0.15s ease;
+}
+
+.health-chevron.expanded {
+  transform: rotate(180deg);
+}
+
 .health-badge.healthy {
   background: #e3f6ea;
   color: #1f7a3f;
@@ -255,6 +271,15 @@ tbody tr:last-child td {
   color: #4c5b5c;
 }
 
+.details-list-info {
+  color: #617071;
+  margin-bottom: 0.5rem;
+}
+
+.details-list-status {
+  color: #354243;
+}
+
 .footer-icon {
   color: var(--sp-blue);
   margin-right: 4px;
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 0ccc793523..c6903f7c74 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -9,6 +9,8 @@ export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platfo
 
 export type PlatformHealthMockStatus = Exclude<PlatformTopologyStatus, "degraded">;
 
+const currentReportedAt = new Date().toISOString();
+
 export interface PlatformHealthMockState extends PlatformTopology {
   customCheckPreset: PlatformHealthCustomCheckPresetName;
   customChecks: CustomCheck[];
@@ -132,6 +134,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           custom_check_id: "Endpoint dependency check",
           category: "User defined",
           status: Status.Fail,
+          reported_at: currentReportedAt,
           failure_reason: "Downstream dependency unavailable",
           originating_endpoint: { name: "Sales.Endpoint", host_id: crypto.randomUUID(), host: "sales-host" },
         }),
@@ -142,6 +145,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           custom_check_id: "ServiceControl Primary Instance",
           category: "Health",
           status: Status.Fail,
+          reported_at: currentReportedAt,
           failure_reason: "Critical error detected",
           originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
         }),
@@ -152,6 +156,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           custom_check_id: "Error Message Ingestion Process",
           category: "ServiceControl Health",
           status: Status.Fail,
+          reported_at: currentReportedAt,
           failure_reason: "Error ingestion stopped",
           originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
         }),
@@ -162,6 +167,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           custom_check_id: "Audit Message Ingestion",
           category: "ServiceControl.Audit Health",
           status: Status.Fail,
+          reported_at: currentReportedAt,
           failure_reason: "Audit ingestion failed",
           originating_endpoint: { name: "Particular.ServiceControl.Audit-Blue", host_id: crypto.randomUUID(), host: "audit-host" },
         }),
diff --git a/src/Frontend/test/preconditions/customChecks.ts b/src/Frontend/test/preconditions/customChecks.ts
index f7ad6195b0..b5f4213d98 100644
--- a/src/Frontend/test/preconditions/customChecks.ts
+++ b/src/Frontend/test/preconditions/customChecks.ts
@@ -34,13 +34,14 @@ export const hasCustomChecksEmpty = ({ driver }: SetupFactoryOptions) => {
 const generateGuid = () => {
   return crypto.randomUUID();
 };
+const currentReportedAt = new Date().toISOString();
 const customCheckTemplate = <CustomCheck>{
   id: "customchecks/6131fa95-9414-1898-9c83-c5b18587945b",
   custom_check_id: "SampleCustomeCheck",
   category: "SomeCategory",
   status: "Pass",
   failure_reason: "I don't know the reason",
-  reported_at: "2025-01-10T05:06:30.4074087Z",
+  reported_at: currentReportedAt,
   originating_endpoint: {
     name: "EndpointX",
     host_id: "ff605b55-6fbb-af56-5753-73c1ff73e601",

From 8ae37094f6b7750a80813cc7af3245c9847bc484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 10:44:16 +0200
Subject: [PATCH 43/67] Improve platform health support export

---
 docs/frontend/platform-health-page.md         |  4 +-
 .../PlatformHealthSupportModal.vue            | 42 +++++++++++++++++--
 .../src/stores/PlatformHealthStore.ts         |  3 ++
 .../src/views/PlatformHealthView.spec.ts      | 29 +++++++++++--
 4 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 62cde02f62..9bef9c55d5 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -160,7 +160,9 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
 | Expanded row details with separate info and issue sections | trigger any row, then click the health badge |
 | Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
-| Support-case modal download flow | click `Open support case`, download the JSON, then verify the support link becomes enabled |
+| Support-case modal preview and download flow | click `Open support case`, preview `platform-health.json`, then download it and verify the support link becomes enabled |
+
+The support export includes both the current Platform health payload and the current failed custom checks.
 
 ## Automated Tests
 
diff --git a/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue b/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
index 64722faa0b..d44e4a1340 100644
--- a/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
+++ b/src/Frontend/src/components/platformhealth/PlatformHealthSupportModal.vue
@@ -10,16 +10,21 @@ const props = defineProps<{
 
 const emit = defineEmits<{ close: [] }>();
 const hasDownloaded = ref(false);
+const showPreview = ref(false);
 
 function close() {
   emit("close");
 }
 
 function download() {
-  downloadFileFromString(props.downloadJson, "application/json", "platform-configuration.json");
+  downloadFileFromString(props.downloadJson, "application/json", "platform-health.json");
   hasDownloaded.value = true;
 }
 
+function togglePreview() {
+  showPreview.value = !showPreview.value;
+}
+
 function onKeydown(event: KeyboardEvent) {
   if (event.key === "Escape") {
     close();
@@ -47,15 +52,20 @@ onUnmounted(() => {
           </div>
         </div>
         <div class="modal-body">
-          <p>First download the platform configuration. Then open the support case and attach the downloaded configuration file.</p>
+          <p>First download the platform health snapshot. Then open the support case and attach the downloaded file.</p>
           <ol>
-            <li>Download <code>platform-configuration.json</code>.</li>
+            <li>Download or preview <code>platform-health.json</code>.</li>
             <li>Open the support case.</li>
             <li>Attach the downloaded file when raising the case.</li>
           </ol>
+          <div v-if="showPreview" class="preview-panel">
+            <h4 class="preview-title">Preview</h4>
+            <pre class="preview-json" aria-label="Platform health JSON preview">{{ downloadJson }}</pre>
+          </div>
         </div>
         <div class="modal-footer modal-actions">
-          <ActionButton variant="primary" aria-label="Download platform configuration" @click="download">Download platform-configuration.json</ActionButton>
+          <ActionButton variant="primary" aria-label="Download platform health" @click="download">Download platform-health.json</ActionButton>
+          <ActionButton :aria-label="showPreview ? 'Hide platform health preview' : 'Preview platform health'" @click="togglePreview">{{ showPreview ? "Hide preview" : "Preview platform-health.json" }}</ActionButton>
           <a :href="supportCaseUrl" class="btn btn-default" :class="{ disabled: !hasDownloaded }" target="_blank" rel="noreferrer" :aria-disabled="!hasDownloaded" :tabindex="hasDownloaded ? 0 : -1">Then open the support case</a>
           <ActionButton aria-label="Close support dialog" @click="close">Close</ActionButton>
         </div>
@@ -87,6 +97,30 @@ onUnmounted(() => {
   justify-content: flex-end;
 }
 
+.preview-panel {
+  margin-top: 1rem;
+  border: 1px solid #dfe7e8;
+  border-radius: 8px;
+  background: #f9fbfb;
+}
+
+.preview-title {
+  margin: 0;
+  padding: 0.75rem 1rem 0;
+  font-size: 14px;
+}
+
+.preview-json {
+  margin: 0;
+  padding: 0.75rem 1rem 1rem;
+  max-height: 280px;
+  overflow: auto;
+  background: transparent;
+  border: 0;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
 .disabled {
   pointer-events: none;
   opacity: 0.65;
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 0853787dc9..765efe4145 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -134,6 +134,9 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
         generatedAt: new Date().toISOString(),
         supportCaseUrl,
         platformHealth: currentModel.value,
+        customChecks: {
+          failed: rawFailedChecks.value,
+        },
       },
       null,
       2
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 29c0e306a5..35f383e654 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -6,6 +6,7 @@ import PlatformHealthView from "@/views/PlatformHealthView.vue";
 import { usePlatformHealthStore } from "@/stores/PlatformHealthStore";
 import { useEnvironmentAndVersionsStore } from "@/stores/EnvironmentAndVersionsStore";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
+import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import type { PlatformModel } from "@/resources/PlatformModel";
 
 const currentReportedAt = new Date().toISOString();
@@ -40,8 +41,24 @@ describe("PlatformHealthView", () => {
     environmentAndVersionsStore.newVersions.newSPVersion.newspversionlink = "https://github.com/Particular/ServicePulse/releases/tag/2.10.2";
   });
 
-  test("requires the configuration download before enabling the support link", async () => {
+  test("requires the platform health download before enabling the support link and allows preview", async () => {
     const platformModelStore = usePlatformModelStore();
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([
+      {
+        id: "customchecks/audit-warning",
+        custom_check_id: "Audit Message Ingestion",
+        category: "ServiceControl.Audit Health",
+        status: "Fail" as never,
+        reported_at: currentReportedAt,
+        failure_reason: "Audit ingestion failed",
+        originating_endpoint: {
+          name: "Particular.ServiceControl.Audit",
+          host_id: "host-2",
+          host: "Host B",
+        },
+      },
+    ]);
     platformModelStore.model = {
       primary: {
         id: "primary",
@@ -70,10 +87,16 @@ describe("PlatformHealthView", () => {
     const supportLink = screen.getByRole("link", { name: /Then open the support case/i });
     expect(supportLink).toHaveAttribute("aria-disabled", "true");
 
-    await user.click(screen.getByRole("button", { name: /Download platform configuration/i }));
+    await user.click(screen.getByRole("button", { name: /Preview platform health/i }));
+
+    expect(screen.getByLabelText("Platform health JSON preview")).toHaveTextContent('"platformHealth"');
+    expect(screen.getByLabelText("Platform health JSON preview")).toHaveTextContent('"customChecks"');
+    expect(screen.getByLabelText("Platform health JSON preview")).toHaveTextContent('"Audit Message Ingestion"');
+
+    await user.click(screen.getByRole("button", { name: /Download platform health/i }));
 
     expect(downloadFileFromString).toHaveBeenCalledTimes(1);
-    expect(downloadFileFromString).toHaveBeenCalledWith(expect.stringContaining('"platformHealth"'), "application/json", "platform-configuration.json");
+    expect(downloadFileFromString).toHaveBeenCalledWith(expect.stringContaining('"platformHealth"'), "application/json", "platform-health.json");
     expect(supportLink).toHaveAttribute("aria-disabled", "false");
   });
 

From 16cfd88c16644cb24e63d7b2b82d20360e233d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 14:50:02 +0200
Subject: [PATCH 44/67] Source primary and monitoring version from real backend
 responses

---
 docs/frontend/platform-health-page.md         |  5 +++
 .../components/monitoring/monitoringClient.ts |  1 +
 .../src/components/serviceControlClient.ts    |  5 ++-
 .../src/stores/PlatformModelStore.spec.ts     | 36 +++++++------------
 src/Frontend/src/stores/PlatformModelStore.ts | 22 ++++++++----
 5 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 9bef9c55d5..ab76071141 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -84,6 +84,11 @@ The architecture intentionally separates shared platform state from page-specifi
 - `src/Frontend/src/stores/PlatformHealthStore.ts`
   - page-specific severity, rows, upgrade cues, and details
 
+### Primary and Monitoring version sourcing
+
+- the primary root document exposes its version through the `X-Particular-Version` response header, so Platform health reads the primary version from that header; a successful primary root fetch maps to an `healthy` baseline (degraded/unavailable are then derived from built-in custom checks or a fetch failure)
+- the Monitoring root document exposes its version in a `version` field, so Platform health reads the monitoring version from that field
+
 ## Built-In Custom Checks
 
 Platform health consumes built-in platform custom checks as secondary signals even when those checks are hidden by default on the Custom Checks page.
diff --git a/src/Frontend/src/components/monitoring/monitoringClient.ts b/src/Frontend/src/components/monitoring/monitoringClient.ts
index 5197a564b6..bb058956df 100644
--- a/src/Frontend/src/components/monitoring/monitoringClient.ts
+++ b/src/Frontend/src/components/monitoring/monitoringClient.ts
@@ -11,6 +11,7 @@ export interface MetricsConnectionDetails {
 export interface MonitoringRoot {
   platform_health_status?: "healthy" | "degraded" | "unavailable";
   platform_health_version?: string;
+  version?: string;
 }
 
 class MonitoringClient {
diff --git a/src/Frontend/src/components/serviceControlClient.ts b/src/Frontend/src/components/serviceControlClient.ts
index 2f7c3dc972..ad8877821a 100644
--- a/src/Frontend/src/components/serviceControlClient.ts
+++ b/src/Frontend/src/components/serviceControlClient.ts
@@ -36,9 +36,8 @@ class ServiceControlClient {
     }
   }
 
-  public async getRoot() {
-    const [, data] = await this.fetchTypedFromServiceControl<ServiceControlRootDocument>("");
-    return data;
+  public async getRoot(): Promise<[Response, ServiceControlRootDocument]> {
+    return await this.fetchTypedFromServiceControl<ServiceControlRootDocument>("");
   }
 
   public async getRemoteInstances() {
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 4a30900bc0..34be7daae2 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -10,7 +10,7 @@ const getMonitoringRoot = vi.fn();
 vi.mock("@/components/serviceControlClient", () => ({
   default: {
     url: "http://localhost:33333/api/",
-    getRoot: () => getRoot(),
+    getRoot: (...args: unknown[]) => getRoot(...args),
     getRemoteInstances: (...args: unknown[]) => getRemoteInstances(...args),
   },
 }));
@@ -33,11 +33,7 @@ describe("PlatformModelStore", () => {
   });
 
   test("keeps monitoring in the shared model when remote error instances exist", async () => {
-    getRoot.mockResolvedValue({
-      name: "Particular.ServiceControl.CrossRegion",
-      platform_health_status: "healthy",
-      platform_health_version: "6.19.3",
-    });
+    getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.CrossRegion", health: "healthy", version: "6.19.3" }));
     getRemoteInstances.mockResolvedValue([
       {
         api_uri: "http://Particular.ServiceControl.RegionA/api/",
@@ -61,11 +57,7 @@ describe("PlatformModelStore", () => {
   });
 
   test("prefers remote configuration host.instance_name over api hostname", async () => {
-    getRoot.mockResolvedValue({
-      name: "Particular.ServiceControl.Primary",
-      platform_health_status: "healthy",
-      platform_health_version: "6.19.3",
-    });
+    getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.Primary", health: "healthy", version: "6.19.3" }));
     getRemoteInstances.mockResolvedValue([
       {
         api_uri: "http://localhost:33334/api/",
@@ -85,12 +77,8 @@ describe("PlatformModelStore", () => {
     expect(store.remotes[0].name).toBe("Particular.ServiceControl.Audit.Blue");
   });
 
-  test("uses primary root values directly when the request succeeds", async () => {
-    getRoot.mockResolvedValue({
-      name: "Particular.ServiceControl.Primary",
-      platform_health_status: "degraded",
-      platform_health_version: "6.18.1",
-    });
+  test("maps a reachable primary root to healthy with version from the response header", async () => {
+    getRoot.mockResolvedValue([{ headers: new Headers({ "X-Particular-Version": "6.19.3" }) }, { name: "Particular.ServiceControl.Primary" }] as never);
     getRemoteInstances.mockResolvedValue([]);
     getMonitoringRoot.mockResolvedValue(null);
 
@@ -98,16 +86,12 @@ describe("PlatformModelStore", () => {
     await store.refresh();
 
     expect(store.primary?.name).toBe("Particular.ServiceControl.Primary");
-    expect(store.primary?.health).toBe("degraded");
-    expect(store.primary?.version).toBe("6.18.1");
+    expect(store.primary?.health).toBe("healthy");
+    expect(store.primary?.version).toBe("6.19.3");
   });
 
   test("uses cached remote instance type when an unavailable remote no longer has configuration", async () => {
-    getRoot.mockResolvedValue({
-      name: "Particular.ServiceControl.Primary",
-      platform_health_status: "healthy",
-      platform_health_version: "6.19.3",
-    });
+    getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.Primary", health: "healthy", version: "6.19.3" }));
     getRemoteInstances.mockResolvedValue([
       {
         api_uri: "http://localhost:33334/api/",
@@ -125,3 +109,7 @@ describe("PlatformModelStore", () => {
     expect(store.remotes[0].role).toBe("remote-error");
   });
 });
+
+function rootResponse({ name, health, version }: { name: string; health: "healthy" | "degraded" | "unavailable"; version: string }) {
+  return [{ headers: new Headers({ "X-Particular-Version": version }) }, { name, platform_health_status: health, platform_health_version: version }] as never;
+}
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 82cbb30f7a..d7eb10e72c 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -38,14 +38,20 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   };
 });
 
-async function getPrimaryRoot(): Promise<ServiceControlRootDocument | null> {
+async function getPrimaryRoot(): Promise<PrimaryRootResult | null> {
   try {
-    return await serviceControlClient.getRoot();
+    const [response, document] = await serviceControlClient.getRoot();
+    return { document, version: response.headers.get("X-Particular-Version") ?? "" };
   } catch {
     return null;
   }
 }
 
+interface PrimaryRootResult {
+  document: ServiceControlRootDocument;
+  version: string;
+}
+
 async function getRemotes(): Promise<RemoteInstance[]> {
   try {
     return await serviceControlClient.getRemoteInstances();
@@ -69,7 +75,7 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 }
 
-function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformInstance {
+function mapPrimary(primaryRoot: PrimaryRootResult | null): PlatformInstance {
   if (!primaryRoot) {
     return {
       id: "primary",
@@ -82,13 +88,15 @@ function mapPrimary(primaryRoot: ServiceControlRootDocument | null): PlatformIns
     };
   }
 
+  const { document, version } = primaryRoot;
+
   return {
     id: "primary",
-    name: primaryRoot.name,
+    name: document.name,
     kind: "error",
     role: "primary-error",
-    version: primaryRoot.platform_health_version,
-    health: primaryRoot.platform_health_status,
+    version: document.platform_health_version ?? version,
+    health: document.platform_health_status ?? "healthy",
     apiUrl: serviceControlClient.url ?? "",
   };
 }
@@ -132,7 +140,7 @@ function mapMonitoring(monitoringRoot: MonitoringRoot | null): PlatformInstance
     name: "Particular.ServiceControl.Monitoring",
     kind: "monitoring",
     role: "monitoring",
-    version: monitoringRoot?.platform_health_version ?? "Unknown",
+    version: monitoringRoot?.platform_health_version ?? monitoringRoot?.version ?? "Unknown",
     health: monitoringRoot?.platform_health_status ?? "healthy",
     apiUrl: monitoringClient.url ?? "",
   };

From 79e69d4e6c7adb94ed4afc6d02e913b6b4b7cb87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 14:55:06 +0200
Subject: [PATCH 45/67] Fix hardcoded ServicePulse version

---
 src/Frontend/public/js/app.constants.js                | 2 +-
 src/Frontend/src/stores/EnvironmentAndVersionsStore.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Frontend/public/js/app.constants.js b/src/Frontend/public/js/app.constants.js
index 805ad089ed..0e13e04020 100644
--- a/src/Frontend/public/js/app.constants.js
+++ b/src/Frontend/public/js/app.constants.js
@@ -1,6 +1,6 @@
 window.defaultConfig = {
   default_route: '/dashboard',
-  version: '2.8.0',
+  version: '2.10.2',
   service_control_url: 'http://localhost:33333/api/',
   monitoring_urls: ['http://localhost:33633/'],
   showPendingRetry: false,
diff --git a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
index b56c7e49c0..c7f1b48b1d 100644
--- a/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
+++ b/src/Frontend/src/stores/EnvironmentAndVersionsStore.ts
@@ -15,7 +15,7 @@ export const useEnvironmentAndVersionsStore = defineStore("EnvironmentAndVersion
     sc_version: "",
     minimum_supported_sc_version: "6.6.0",
     is_compatible_with_sc: true,
-    sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "2.8.0",
+    sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "2.10.2",
     supportsArchiveGroups: false,
     endpoints_error_url: "",
     known_endpoints_url: "",

From e76905ecc2b9f05b350c02e8500ee054eca3d62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Mon, 31 Aug 2026 16:48:27 +0200
Subject: [PATCH 46/67] Fix static file size test

---
 src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs b/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs
index a29503dfba..56789611c7 100644
--- a/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs
+++ b/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs
@@ -129,8 +129,8 @@ public async Task Should_find_prefer_constants_file_on_disk_over_embedded_if_bot
                 }
             };
             await middleware.Invoke(context);
-            const long sizeOfFileOnDisk = 239; // this is the /app/js/app.constants.js file
-            Assert.That(context.Response.ContentLength, Is.EqualTo(sizeOfFileOnDisk));
+            var pathToConfig = Path.Combine(TestContext.CurrentContext.TestDirectory, "app", "js", "app.constants.js");
+            Assert.That(context.Response.ContentLength, Is.EqualTo(new FileInfo(pathToConfig).Length));
             Assert.That(context.Response.ContentType, Is.EqualTo("application/javascript"));
         }
 
@@ -173,4 +173,4 @@ public override Task Invoke(IOwinContext context)
             }
         }
     }
-}
\ No newline at end of file
+}

From 0e0b4d6da4afeb4e8ce1f4a72ec51c307a131b01 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Tue, 1 Sep 2026 12:07:15 +1000
Subject: [PATCH 47/67] remove recoverability indicator

---
 .../capabilities/ErrorCapability.ts                 | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
index 286257e88c..e22213b366 100644
--- a/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
+++ b/src/Frontend/src/components/platformcapabilities/capabilities/ErrorCapability.ts
@@ -1,11 +1,10 @@
 import { computed } from "vue";
 import { CapabilityStatus } from "@/components/platformcapabilities/constants";
+import type { StatusIndicator } from "@/components/platformcapabilities/types";
 import { type CapabilityComposable, type CapabilityStatusToStringMap, useCapabilityBase } from "./BaseCapability";
 import routeLinks from "@/router/routeLinks";
 import { usePlatformModelStore } from "@/stores/PlatformModelStore";
 
-const singleRegionTooltip = "Message failures can be managed from this ServicePulse instance.";
-
 const ErrorDescriptions: CapabilityStatusToStringMap = {
   [CapabilityStatus.Unavailable]: "The ServiceControl instance is not responding.",
   [CapabilityStatus.Available]: "The ServiceControl instance is available.",
@@ -21,7 +20,7 @@ const ErrorHelpButtonUrl: CapabilityStatusToStringMap = {
 };
 
 export function useErrorCapability(): CapabilityComposable {
-  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus, createIndicator } = useCapabilityBase();
+  const { getDescriptionForStatus, getHelpButtonTextForStatus, getHelpButtonUrlForStatus } = useCapabilityBase();
   const platformModelStore = usePlatformModelStore();
 
   // Check if instance is connected
@@ -44,13 +43,7 @@ export function useErrorCapability(): CapabilityComposable {
   // Determine help button URL based on status
   const errorHelpButtonUrl = computed(() => getHelpButtonUrlForStatus(errorStatus.value, ErrorHelpButtonUrl));
 
-  const errorIndicators = computed(() => {
-    if (!isConnected.value) {
-      return [];
-    }
-
-    return [createIndicator("FailedMessages", CapabilityStatus.Available, singleRegionTooltip)];
-  });
+  const errorIndicators = computed<StatusIndicator[]>(() => []);
 
   // Loading state - error is loading if we haven't attempted connection yet
   const isLoading = computed(() => platformModelStore.model === null);

From 6a6b0bce48c63329409f90c2f0b64382df180e06 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Tue, 1 Sep 2026 12:41:44 +1000
Subject: [PATCH 48/67] remove recoverability test

---
 .../recoverability-capability-card.spec.ts    | 56 +------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

diff --git a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
index edb8e6b36f..cb12189aa7 100644
--- a/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
+++ b/src/Frontend/test/specs/platformcapabilities/recoverability-capability-card.spec.ts
@@ -2,7 +2,7 @@ import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
 import { waitFor } from "@testing-library/vue";
-import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, recoverabilityStatusIndicators, isRecoverabilityCardAvailable, recoverabilityIndicatorByLabel } from "./questions/recoverabilityCapabilityCard";
+import { recoverabilityCapabilityCard, recoverabilityStatusBadge, recoverabilityActionButton, isRecoverabilityCardAvailable } from "./questions/recoverabilityCapabilityCard";
 
 // NOTE: The Recoverability card has two states: Available and Unavailable.
 // However, the Unavailable state cannot be tested because when ServiceControl
@@ -38,55 +38,7 @@ describe("FEATURE: Recoverability capability card", () => {
     });
   });
 
-  describe("RULE: Recoverability card shows capability-specific failure management guidance", () => {
-    test("EXAMPLE: Connected primary shows a green FailedMessages indicator", async ({ driver }) => {
-      // Arrange
-      await driver.setUp(precondition.serviceControlWithMonitoring);
-      await driver.setUp(precondition.hasNoAuditInstances);
-
-      // Act
-      await driver.goTo("/");
-
-      // Assert
-      await waitFor(async () => {
-        const card = await recoverabilityCapabilityCard();
-        expect(card).toBeInTheDocument();
-      });
-
-      await waitFor(async () => {
-        const indicators = await recoverabilityStatusIndicators();
-        expect(indicators).toHaveLength(1);
-      });
-
-      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
-      expect(failedMessagesIndicator).toBeInTheDocument();
-      expect(failedMessagesIndicator?.textContent).toContain("FailedMessages");
-      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
-    });
-
-    test("EXAMPLE: Remote error instances do not change the green FailedMessages indicator", async ({ driver }) => {
-      // Arrange
-      await driver.setUp(precondition.serviceControlWithMonitoring);
-      await driver.setUp(precondition.hasRemoteErrorInstance);
-
-      // Act
-      await driver.goTo("/");
-
-      // Assert
-      await waitFor(async () => {
-        const card = await recoverabilityCapabilityCard();
-        expect(card).toBeInTheDocument();
-      });
-
-      await waitFor(async () => {
-        expect(await isRecoverabilityCardAvailable()).toBe(true);
-      });
-
-      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
-      expect(failedMessagesIndicator).toBeInTheDocument();
-      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
-    });
-
+  describe("RULE: Degraded primary instance still shows available status while connected", () => {
     test("EXAMPLE: Degraded primary instance still shows available status while connected", async ({ driver }) => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(precondition.hasServiceControlPrimaryDegraded);
@@ -104,10 +56,6 @@ describe("FEATURE: Recoverability capability card", () => {
 
       const statusBadge = await recoverabilityStatusBadge();
       expect(statusBadge?.textContent).toMatch(/Available/i);
-
-      const failedMessagesIndicator = await recoverabilityIndicatorByLabel("FailedMessages");
-      expect(failedMessagesIndicator).toBeInTheDocument();
-      expect(failedMessagesIndicator?.querySelector(".light-success")).not.toBeNull();
     });
   });
 });

From 6916079ea44869f29f98cdaa746c6ff095465817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Tue, 1 Sep 2026 08:29:42 +0200
Subject: [PATCH 49/67] Add Platform Topology documentation and clarify direct
 access rules

---
 docs/frontend/platform-health-page.md |  3 +++
 docs/platform-topology.md             | 38 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 docs/platform-topology.md

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index ab76071141..6a38aa5b5c 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -16,6 +16,7 @@ The page is frontend-first and mock-driven. It:
 
 - uses the shared platform model from `PlatformModelStore` as its source of truth for platform instances
 - derives page-specific row and details behavior in `PlatformHealthStore`
+- follows the shared topology rule in `docs/platform-topology.md`: primary and monitoring are direct API targets, while audit/remote rows come from ServiceControl remote configuration and are informational only
 - keeps topology and instance visibility on the page instead of duplicating per-instance widgets on capability cards
 - uses built-in platform custom checks as secondary health signals for page-specific health inference, including instance-mapped degraded states
 - refreshes custom checks together with platform instance data so hidden built-in signals are available even when the Custom Checks page has not been opened
@@ -40,6 +41,8 @@ Each row shows:
 
 Rows are always expandable via the health badge. Expanded content separates informational details such as `API: <url>` from `healthDetails` such as unavailability or degradation messages. The `ServicePulse` row expands to a neutral `No problems detected.` detail.
 
+See `docs/platform-topology.md` for the direct-access rule.
+
 Rows expand from the health badge to show details.
 
 Those details come from:
diff --git a/docs/platform-topology.md b/docs/platform-topology.md
new file mode 100644
index 0000000000..45f6a7ae9f
--- /dev/null
+++ b/docs/platform-topology.md
@@ -0,0 +1,38 @@
+# Platform Topology
+
+This document defines the shared topology language used by Platform health and the related frontend docs.
+
+## Topology
+
+ServicePulse models the platform as:
+
+- primary ServiceControl
+- zero or more remote instances
+- monitoring when configured
+- ServicePulse itself
+
+Remote instances are rendered with `remote-audit` or `remote-error` roles, but they are still model-derived rows. Their `apiUrl` is shown for context.
+
+## Direct Access Rule
+
+Only the primary ServiceControl instance and Monitoring are treated as direct API targets.
+
+Audit remote rows are not assumed to be directly reachable even if they have an API URL.
+
+## Shared Uses
+
+- `docs/frontend/platform-health-page.md`
+- `docs/frontend/platform-health-expanded-settings-mock.html`
+- capability-card docs under `docs/frontend/`
+
+## Row Data
+
+Rows can show:
+
+- instance type
+- name
+- version
+- health state
+- API URL as informational context
+
+Expanded row details should come from model data and capability signals, not from calling audit endpoints directly.

From 6445edb420709eaa8e9d04a073ecc2fbd7d41933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Tue, 1 Sep 2026 09:52:32 +0200
Subject: [PATCH 50/67] Document remote config relay

---
 docs/platform-topology.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/platform-topology.md b/docs/platform-topology.md
index 45f6a7ae9f..f91d1a31f7 100644
--- a/docs/platform-topology.md
+++ b/docs/platform-topology.md
@@ -19,6 +19,19 @@ Only the primary ServiceControl instance and Monitoring are treated as direct AP
 
 Audit remote rows are not assumed to be directly reachable even if they have an API URL.
 
+## Backend Remote Relay
+
+Primary ServiceControl does fan out to remotes when building `GET /api/configuration/remotes`.
+
+It calls each remote's `/api/configuration`, gathers the responses in parallel, and returns a transformed `RemoteConfiguration[]` payload with:
+
+- `api_uri`
+- `version`
+- `status`
+- `configuration`
+
+This is an enriched relay, not a raw pass-through.
+
 ## Shared Uses
 
 - `docs/frontend/platform-health-page.md`

From 929fa731b3a5789083504b0aa6e11637902c5e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Tue, 1 Sep 2026 10:07:49 +0200
Subject: [PATCH 51/67] Refine platform health row details

---
 .../src/stores/PlatformHealthStore.ts         |   2 +-
 .../src/views/PlatformHealthView.spec.ts      |  76 +++++++++
 src/Frontend/src/views/PlatformHealthView.vue | 157 ++++++++++++++++--
 3 files changed, 222 insertions(+), 13 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 765efe4145..0205016e9b 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -329,7 +329,7 @@ function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
 
   if (instance.role === "primary-error") {
     if (instance.health === "unavailable") {
-      return ["Primary error instance is unavailable."];
+      return ["Primary error instance is unavailable. Remote instance status is also unavailable."];
     }
 
     if (instance.health === "degraded" && model.primary.health === "degraded") {
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 35f383e654..a06c697135 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -238,6 +238,7 @@ describe("PlatformHealthView", () => {
 
     expect(screen.queryByRole("link", { name: "Particular.ServiceControl" })).not.toBeInTheDocument();
     expect(screen.queryByRole("link", { name: "Particular.ServiceControl.Audit" })).not.toBeInTheDocument();
+    expect(screen.getByText("Particular.ServiceControl")).toBeInTheDocument();
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
     const user = userEvent.setup();
     await user.click(screen.getAllByRole("button", { name: /Healthy/i })[0]);
@@ -352,6 +353,8 @@ describe("PlatformHealthView", () => {
     const user = userEvent.setup();
     await user.click(screen.getByRole("button", { name: "Degraded" }));
 
+    expect(screen.getByText("Health issues")).toBeInTheDocument();
+    expect(screen.getByText("Information")).toBeInTheDocument();
     expect(screen.getByText("API: http://localhost:33334/api/")).toBeInTheDocument();
     expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
     expect(screen.getByText(`Reported at: ${currentReportedAt}`)).toBeInTheDocument();
@@ -433,6 +436,50 @@ describe("PlatformHealthView", () => {
     expect(screen.getByText(/v2.10.2 available/i)).toBeInTheDocument();
   });
 
+  test("renders health issues before information", async () => {
+    const store = usePlatformHealthStore();
+    const rows = vi.spyOn(store, "rows", "get").mockReturnValue([
+      {
+        type: "Error instance",
+        name: "Particular.ServiceControl",
+        version: "6.19.3",
+        health: "healthy",
+        note: "Primary error instance",
+        upgradeAvailable: false,
+        latestVersion: "6.19.3",
+        upgradeLink: "",
+        infoDetails: ["API: http://localhost:33333/api/"],
+        healthDetails: [],
+      },
+      {
+        type: "Audit instance",
+        name: "Particular.ServiceControl.Audit",
+        version: "6.19.3",
+        health: "degraded",
+        note: "Audit instance",
+        upgradeAvailable: false,
+        latestVersion: "6.19.3",
+        upgradeLink: "",
+        infoDetails: ["API: http://localhost:33334/api/"],
+        healthDetails: ["Audit Message Ingestion: Audit ingestion failed", `Reported at: ${currentReportedAt}`],
+      },
+    ]);
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    const user = userEvent.setup();
+    await user.click(screen.getAllByRole("button", { name: "Degraded" })[0]);
+
+    const detailsRow = screen.getByText("Health issues").closest("td");
+    expect(detailsRow).not.toBeNull();
+    expect(detailsRow!.textContent).toMatch(/Health issues.*Information/s);
+    rows.mockRestore();
+  });
+
   test("shows no problems detected when expanding ServicePulse", async () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
@@ -464,4 +511,33 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByText("No problems detected.")).toBeInTheDocument();
   });
+
+  test("shows the updated primary unavailable wording", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.model = {
+      primary: {
+        id: "primary",
+        name: "Particular.ServiceControl",
+        kind: "error",
+        role: "primary-error",
+        version: "6.19.3",
+        health: "unavailable",
+        apiUrl: "http://localhost:33333/api/",
+      },
+      remotes: [],
+      monitoring: null,
+      servicePulse: { name: "ServicePulse", version: "2.8.0", health: "healthy" },
+    } satisfies PlatformModel;
+
+    render(PlatformHealthView, {
+      global: {
+        plugins: [],
+      },
+    });
+
+    const user = userEvent.setup();
+    await user.click(screen.getByRole("button", { name: /Unavailable/i }));
+
+    expect(screen.getByText("Primary error instance is unavailable. Remote instance status is also unavailable.")).toBeInTheDocument();
+  });
 });
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 3cda7544df..fa2493a9d5 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -6,7 +6,7 @@ import PlatformHealthSupportModal from "@/components/platformhealth/PlatformHeal
 import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
 import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
 import FAIcon from "@/components/FAIcon.vue";
-import { faArrowTurnUp, faChevronDown } from "@fortawesome/free-solid-svg-icons";
+import { faArrowTurnUp, faChevronDown, faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
 
 const { store } = usePlatformHealthStoreAutoRefresh();
 useEnvironmentAndVersionsAutoRefresh();
@@ -48,6 +48,37 @@ function chevronClass(row: (typeof store.rows)[number]) {
   };
 }
 
+function issueEntries(row: (typeof store.rows)[number]) {
+  if (row.type === "ServicePulse") {
+    return [];
+  }
+
+  const entries: Array<{ summary: string; reportedAt?: string }> = [];
+
+  for (let index = 0; index < row.healthDetails.length; index += 1) {
+    const detail = row.healthDetails[index];
+    if (detail.startsWith("Reported at:")) {
+      continue;
+    }
+
+    const nextDetail = row.healthDetails[index + 1];
+    entries.push({
+      summary: detail,
+      reportedAt: nextDetail?.startsWith("Reported at:") ? nextDetail.replace(/^Reported at:\s*/, "") : undefined,
+    });
+
+    if (nextDetail?.startsWith("Reported at:")) {
+      index += 1;
+    }
+  }
+
+  return entries;
+}
+
+function showsNoProblems(row: (typeof store.rows)[number]) {
+  return row.type === "ServicePulse" && row.healthDetails.length === 1 && row.healthDetails[0] === "No problems detected.";
+}
+
 const healthLabel = computed(() => ({
   healthy: "Healthy",
   degraded: "Degraded",
@@ -107,12 +138,33 @@ function toggleRow(row: (typeof store.rows)[number]) {
                   </tr>
                   <tr v-if="isExpanded(row)" :id="`${rowKey(row)}-details`" class="details-row">
                     <td colspan="4" class="details-cell">
-                      <ul v-if="row.infoDetails.length > 0" class="details-list details-list-info">
-                        <li v-for="detail in row.infoDetails" :key="detail">{{ detail }}</li>
-                      </ul>
-                      <ul class="details-list details-list-status">
-                        <li v-for="detail in row.healthDetails" :key="detail">{{ detail }}</li>
-                      </ul>
+                      <div class="details-stack">
+                        <section v-if="issueEntries(row).length > 0" class="details-card details-card-issues">
+                          <div class="details-card-header">
+                            <h3>Health issues</h3>
+                          </div>
+                          <div class="issue-list">
+                            <article v-for="issue in issueEntries(row)" :key="issue.summary + (issue.reportedAt ?? '')" class="issue-item">
+                              <FAIcon class="issue-icon" :icon="faTriangleExclamation" />
+                              <div class="issue-content">
+                                <div class="issue-summary">{{ issue.summary }}</div>
+                                <div v-if="issue.reportedAt" class="issue-meta">Reported at: {{ issue.reportedAt }}</div>
+                              </div>
+                            </article>
+                          </div>
+                        </section>
+
+                        <section class="details-card details-card-info">
+                          <div class="details-card-header">
+                            <h3>Information</h3>
+                          </div>
+                          <ul v-if="row.infoDetails.length > 0" class="details-list details-list-info">
+                            <li v-for="detail in row.infoDetails" :key="detail">{{ detail }}</li>
+                          </ul>
+                          <p v-else-if="showsNoProblems(row)" class="no-problems">No problems detected.</p>
+                          <p v-else class="no-problems no-problems-muted">No additional information.</p>
+                        </section>
+                      </div>
                     </td>
                   </tr>
                 </template>
@@ -189,13 +241,94 @@ tbody tr:last-child td {
 }
 
 .instance-name {
-  color: var(--sp-blue);
-  text-decoration: none;
+  color: #243435;
 }
 
-.instance-name:hover {
-  color: #007f98;
-  text-decoration: underline;
+.details-stack {
+  display: grid;
+  gap: 0.875rem;
+  padding: 0.25rem 0 0.5rem;
+}
+
+.details-card {
+  border: 1px solid #dde5e5;
+  border-radius: 12px;
+  background: #fff;
+  overflow: hidden;
+}
+
+.details-card-issues {
+  border-left: 4px solid #b53a31;
+  background: #fffafa;
+}
+
+.details-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+  padding: 14px 16px;
+  border-bottom: 1px solid #eef2f2;
+}
+
+.details-card-header h3 {
+  margin: 0;
+  font-size: 13px;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: #4c5b5c;
+}
+
+.issue-list {
+  display: grid;
+  gap: 0.75rem;
+  padding: 14px 16px 16px;
+}
+
+.issue-item {
+  display: flex;
+  gap: 0.75rem;
+  align-items: flex-start;
+}
+
+.issue-icon {
+  margin-top: 0.2rem;
+  color: #b53a31;
+  font-size: 14px;
+  flex: none;
+}
+
+.issue-content {
+  display: grid;
+  gap: 0.15rem;
+}
+
+.issue-summary {
+  font-weight: 700;
+  color: #2c3839;
+}
+
+.issue-meta {
+  color: #73544d;
+  font-size: 12px;
+}
+
+.details-card-info .details-list,
+.details-card-info .no-problems {
+  margin: 0;
+  padding: 14px 16px 16px;
+}
+
+.details-card-info .details-list {
+  padding-left: 2rem;
+}
+
+.no-problems {
+  color: #4c5b5c;
+}
+
+.no-problems-muted {
+  color: #748081;
 }
 
 .type-cell {

From d528ccf0379e4d92a9d6a6bb33c5d87f0b98e335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Tue, 1 Sep 2026 13:56:08 +0200
Subject: [PATCH 52/67] Refactor platform custom checks

---
 docs/frontend/custom-checks-page.md           | 47 ++++++++----------
 docs/frontend/platform-health-page.md         | 34 ++++++-------
 .../customchecks/builtInPlatformChecks.ts     | 49 -------------------
 src/Frontend/src/resources/CustomCheck.ts     |  1 +
 .../src/stores/CustomChecksStore.spec.ts      | 11 +++--
 src/Frontend/src/stores/CustomChecksStore.ts  |  3 +-
 .../src/stores/PlatformHealthStore.spec.ts    | 17 +++++--
 .../src/stores/PlatformHealthStore.ts         | 21 ++------
 .../test/mocks/platform-health-state.spec.ts  |  6 ++-
 .../test/mocks/platform-health-state.ts       |  3 ++
 .../platform-health/platform-health.ts        |  3 +-
 .../test/preconditions/customChecks.ts        |  1 +
 .../viewing-failing-custom-checks.spec.ts     |  4 +-
 .../customchecks/viewing-no-data.spec.ts      |  1 +
 14 files changed, 75 insertions(+), 126 deletions(-)
 delete mode 100644 src/Frontend/src/components/customchecks/builtInPlatformChecks.ts

diff --git a/docs/frontend/custom-checks-page.md b/docs/frontend/custom-checks-page.md
index 70ac185f46..76806c2e8e 100644
--- a/docs/frontend/custom-checks-page.md
+++ b/docs/frontend/custom-checks-page.md
@@ -1,6 +1,6 @@
 # Custom Checks Page Testing Guide
 
-This document describes the frontend Custom Checks page behavior, with a focus on built-in platform custom checks and how they relate to other frontend views.
+This document describes the frontend Custom Checks page behavior, with a focus on internal platform custom checks and how they relate to other frontend views.
 
 For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.md`.
 
@@ -8,37 +8,31 @@ For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.
 
 The Custom Checks page shows failing custom checks reported to ServiceControl.
 
-Built-in platform custom checks are handled differently from user-defined custom checks:
+Internal platform custom checks are handled differently from user-defined custom checks:
 
 - they are hidden by default from the Custom Checks page
 - they are hidden by default from the Custom Checks dashboard tile and menu badge
 - operators can reveal them with `Show platform custom checks`
-- Platform health consumes those built-in checks as secondary platform signals
+- Platform health consumes those internal checks as secondary platform signals
 
-## Built-In Platform Custom Checks
+## Internal Platform Custom Checks
 
-The built-in platform custom check catalog is curated in:
+ServiceControl now marks internal custom checks with `internal: true`.
 
-- `src/Frontend/src/components/customchecks/builtInPlatformChecks.ts`
+The frontend uses that flag for two different purposes:
 
-The frontend uses that catalog for two different purposes:
+1. filtering internal platform checks out of the Custom Checks UI by default
+2. recognizing internal platform checks that Platform health can use as secondary instance signals
 
-1. filtering built-in platform checks out of the Custom Checks UI by default
-2. recognizing built-in platform checks that Platform health can use as secondary instance signals
-
-Recognition is based on:
-
-- `category + custom_check_id`
-
-This is intentional because ServiceControl can reuse the same `custom_check_id` across different categories.
+Older ServiceControl versions may omit the flag. In that case, the check is treated as non-internal.
 
 ## Page Behavior
 
 The Custom Checks page:
 
 - fetches failed custom checks from `customchecks?status=fail&page=<n>`
-- shows only non-platform custom checks by default
-- exposes `Show platform custom checks` to reveal built-in platform checks
+- shows only non-internal custom checks by default
+- exposes `Show platform custom checks` to reveal internal platform checks
 - keeps pagination tied to the visible filtered list
 
 Relevant frontend pieces:
@@ -49,7 +43,7 @@ Relevant frontend pieces:
 
 ## Platform Health Relationship
 
-Platform health uses built-in platform checks even when the Custom Checks page hides them.
+Platform health uses internal platform checks even when the Custom Checks page hides them.
 
 Platform health also refreshes those custom checks directly, so this behavior does not depend on visiting the Custom Checks page first.
 
@@ -57,9 +51,8 @@ That logic is documented in:
 
 - `docs/frontend/platform-health-page.md`
 
-When Platform health assigns a built-in degraded check to a specific platform instance, it uses:
+When Platform health assigns an internal custom check to a specific platform instance, it uses:
 
-- built-in recognition by `category + custom_check_id`
 - instance assignment by `originating_endpoint.name`
 
 The Custom Checks page itself does not perform that instance correlation. It only exposes the raw custom check data and the show/hide toggle.
@@ -68,7 +61,7 @@ The Custom Checks page itself does not perform that instance correlation. It onl
 
 Start from the shared frontend mocking workflow in `docs/frontend/testing-basics.md`.
 
-For built-in platform custom check behavior, the most useful mock setup is:
+For internal platform custom check behavior, the most useful mock setup is:
 
 - `VITE_MOCK_SCENARIO=platform-health npm run dev:mocks`
 
@@ -85,10 +78,10 @@ Then use:
 
 | Behavior | How to exercise it |
 |----------|--------------------|
-| Built-in platform checks hidden by default | Apply `platform-only-primary` or `platform-only-audit`, then open Custom Checks page |
-| Built-in platform checks shown when toggled on | Apply a platform-only preset, enable `Show platform custom checks` |
+| Internal platform checks hidden by default | Apply `platform-only-primary` or `platform-only-audit`, then open Custom Checks page |
+| Internal platform checks shown when toggled on | Apply a platform-only preset, enable `Show platform custom checks` |
 | User-defined checks visible by default | Apply `user-only` or `mixed-primary-and-user` |
-| Platform health reacts to hidden built-in checks | Apply `platform-only-primary-degraded` or `platform-only-audit`, then compare Platform health with Custom Checks page |
+| Platform health reacts to hidden internal checks | Apply `platform-only-primary-degraded` or `platform-only-audit`, then compare Platform health with Custom Checks page |
 
 ## Automated Tests
 
@@ -96,7 +89,7 @@ Then use:
 
 | File | Type | Description |
 |------|------|-------------|
-| `src/Frontend/src/stores/CustomChecksStore.spec.ts` | Unit | built-in check filtering and toggle behavior |
+| `src/Frontend/src/stores/CustomChecksStore.spec.ts` | Unit | internal check filtering and toggle behavior |
 
 ### Running Automated Tests
 
@@ -112,6 +105,6 @@ Use `docs/frontend/testing-basics.md` for shared troubleshooting.
 
 Custom Checks-specific checks:
 
-1. If a built-in platform check is visible unexpectedly, confirm `showPlatformCustomChecks` is off.
+1. If an internal platform check is visible unexpectedly, confirm `showPlatformCustomChecks` is off.
 2. If Platform health reacts to a check that the page is hiding, that is expected behavior.
-3. If a built-in check is classified incorrectly, inspect `category` and `custom_check_id` against `builtInPlatformChecks.ts`.
+3. If an internal check is classified incorrectly, inspect the `internal` flag in the ServiceControl response.
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 6a38aa5b5c..deb27f8537 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -6,7 +6,7 @@ For shared frontend mock and Vitest workflow, see `docs/frontend/testing-basics.
 
 This page is also the canonical reference for shared platform topology scenarios used across Platform health and the capability-card docs.
 
-For Custom Checks page behavior around built-in platform checks, see `docs/frontend/custom-checks-page.md`.
+For Custom Checks page behavior around internal platform checks, see `docs/frontend/custom-checks-page.md`.
 
 ## Overview
 
@@ -18,8 +18,8 @@ The page is frontend-first and mock-driven. It:
 - derives page-specific row and details behavior in `PlatformHealthStore`
 - follows the shared topology rule in `docs/platform-topology.md`: primary and monitoring are direct API targets, while audit/remote rows come from ServiceControl remote configuration and are informational only
 - keeps topology and instance visibility on the page instead of duplicating per-instance widgets on capability cards
-- uses built-in platform custom checks as secondary health signals for page-specific health inference, including instance-mapped degraded states
-- refreshes custom checks together with platform instance data so hidden built-in signals are available even when the Custom Checks page has not been opened
+- uses internal platform custom checks as secondary health signals for page-specific health inference, including instance-mapped degraded states
+- refreshes custom checks together with platform instance data so hidden internal signals are available even when the Custom Checks page has not been opened
 
 ## Page Behavior
 
@@ -48,7 +48,7 @@ Rows expand from the health badge to show details.
 Those details come from:
 
 - informational row context such as the instance API URL
-- matching built-in platform custom checks when available
+- matching internal platform custom checks when available
 - fallback page-specific messages when no custom-check detail is available
 
 Built-in custom-check `healthDetails` can include both the failure summary and a `Reported at: <timestamp>` line.
@@ -89,24 +89,24 @@ The architecture intentionally separates shared platform state from page-specifi
 
 ### Primary and Monitoring version sourcing
 
-- the primary root document exposes its version through the `X-Particular-Version` response header, so Platform health reads the primary version from that header; a successful primary root fetch maps to an `healthy` baseline (degraded/unavailable are then derived from built-in custom checks or a fetch failure)
+- the primary root document exposes its version through the `X-Particular-Version` response header, so Platform health reads the primary version from that header; a successful primary root fetch maps to an `healthy` baseline (degraded/unavailable are then derived from internal custom checks or a fetch failure)
 - the Monitoring root document exposes its version in a `version` field, so Platform health reads the monitoring version from that field
 
-## Built-In Custom Checks
+## Internal Custom Checks
 
-Platform health consumes built-in platform custom checks as secondary signals even when those checks are hidden by default on the Custom Checks page.
+Platform health consumes internal platform custom checks as secondary signals even when those checks are hidden by default on the Custom Checks page.
 
 On Platform health they are used to:
 
-- degrade or fail platform-health rows
+- degrade platform-health rows
 - populate expanded row details, including `failure_reason`
 
-For the shared built-in-check catalog and Custom Checks page behavior, see `docs/frontend/custom-checks-page.md`.
+For the shared internal-check behavior and Custom Checks page behavior, see `docs/frontend/custom-checks-page.md`.
 
 Platform health-specific rule:
 
-- when assigning a built-in degraded check to a specific instance, use `originating_endpoint.name` to match the emitting platform instance
-- built-in platform custom checks are loaded by `PlatformHealthStore` itself, not only as a side effect of visiting the Custom Checks page
+- when assigning an internal degraded check to a specific instance, use `originating_endpoint.name` to match the emitting platform instance
+- internal platform custom checks are loaded by `PlatformHealthStore` itself, not only as a side effect of visiting the Custom Checks page
 
 ## Manual Testing with Mock Scenarios
 
@@ -150,9 +150,9 @@ Switch custom-check state independently with `window.__platformHealth.setCustomC
 |--------|---------|
 | `none` | No custom checks |
 | `user-only` | Non-platform custom checks only |
-| `platform-only-primary` | Built-in primary critical-error signal |
-| `platform-only-primary-degraded` | Built-in primary degraded signal |
-| `platform-only-audit` | Built-in audit degraded signal targeted at a specific audit instance |
+| `platform-only-primary` | Internal primary critical-error signal |
+| `platform-only-primary-degraded` | Internal primary degraded signal |
+| `platform-only-audit` | Internal audit degraded signal targeted at a specific audit instance |
 | `mixed-primary-and-user` | Combined platform and user checks |
 
 ### Manual Checks
@@ -165,7 +165,7 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Warning state from degraded audit instance | `setScenario("audit-remotes-healthy")` plus `setCustomCheckPreset("platform-only-audit")` |
 | Danger state from unavailable instances | `setScenario("audit-remotes-danger")` or `setScenario("remote-errors-danger")` |
 | Remote error instances | `setScenario("remote-errors-healthy")` |
-| Built-in platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
+| Internal platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
 | Expanded row details with separate info and issue sections | trigger any row, then click the health badge |
 | Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
 | Support-case modal preview and download flow | click `Open support case`, preview `platform-health.json`, then download it and verify the support link becomes enabled |
@@ -178,7 +178,7 @@ The support export includes both the current Platform health payload and the cur
 
 | File | Type | Description |
 |------|------|-------------|
-| `src/Frontend/src/stores/PlatformHealthStore.spec.ts` | Component/unit | Platform health severity, row derivation, and built-in check inference |
+| `src/Frontend/src/stores/PlatformHealthStore.spec.ts` | Component/unit | Platform health severity, row derivation, and internal check inference |
 | `src/Frontend/src/views/PlatformHealthView.spec.ts` | Component | Page rendering, upgrade cues, row expansion, and support modal behavior |
 | `src/Frontend/test/mocks/platform-health-state.spec.ts` | Unit | Runtime mock helper behavior and custom-check preset switching |
 
@@ -196,7 +196,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 | Area | Covered behavior |
 |------|------------------|
-| Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, built-in custom-check health inference |
+| Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, internal custom-check health inference |
 | Platform health view | support download gating, known-version-only upgrade cue rendering, plain-text names, API-in-details rendering, monitoring row rendering, always-expandable health badges |
 | Mock helpers | independent topology and custom-check switching |
 
diff --git a/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts b/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts
deleted file mode 100644
index b1d00bcd78..0000000000
--- a/src/Frontend/src/components/customchecks/builtInPlatformChecks.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import type CustomCheck from "@/resources/CustomCheck";
-
-export type PlatformCheckTarget = "primary" | "audit" | "remote-error" | "transport" | "none";
-export type PlatformCheckSeverity = "degraded" | "unavailable" | "ignore";
-
-export interface BuiltInPlatformCheck {
-  category: string;
-  customCheckId: string;
-  target: PlatformCheckTarget;
-  severity: PlatformCheckSeverity;
-}
-
-const builtInPlatformChecks: BuiltInPlatformCheck[] = [
-  { category: "Configuration", customCheckId: "Saga Audit Configuration", target: "none", severity: "ignore" },
-  { category: "Health", customCheckId: "ServiceControl Primary Instance", target: "primary", severity: "unavailable" },
-  { category: "Health", customCheckId: "ServiceControl Remotes", target: "remote-error", severity: "unavailable" },
-  { category: "ServiceControl Health", customCheckId: "Error Message Ingestion Process", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "Error Message Ingestion", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "Error Database Index Errors", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "Error Database Index Lag", target: "primary", severity: "degraded" },
-  { category: "Storage space", customCheckId: "ServiceControl database", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "Message Ingestion Process", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "RavenDB dirty memory", target: "primary", severity: "degraded" },
-  { category: "ServiceControl Health", customCheckId: "Audit Message Ingestion Process", target: "audit", severity: "degraded" },
-  { category: "ServiceControl.Audit Health", customCheckId: "Audit Message Ingestion", target: "audit", severity: "degraded" },
-  { category: "ServiceControl.Audit Health", customCheckId: "Audit Database Index Lag", target: "audit", severity: "degraded" },
-  { category: "Storage space", customCheckId: "ServiceControl.Audit database", target: "audit", severity: "degraded" },
-  { category: "ServiceControl.Audit Health", customCheckId: "Audit Message Ingestion Process", target: "audit", severity: "degraded" },
-  { category: "ServiceControl.Audit Health", customCheckId: "RavenDB dirty memory", target: "audit", severity: "degraded" },
-  { category: "Transport", customCheckId: "Dead Letter Queue", target: "transport", severity: "degraded" },
-];
-
-const builtInPlatformCheckMap = new Map(builtInPlatformChecks.map((check) => [toCheckKey(check.category, check.customCheckId), check]));
-
-export function isBuiltInPlatformCheck(check: CustomCheck) {
-  return builtInPlatformCheckMap.has(getBuiltInPlatformCheckKey(check));
-}
-
-export function getBuiltInPlatformCheck(check: CustomCheck) {
-  return builtInPlatformCheckMap.get(getBuiltInPlatformCheckKey(check)) ?? null;
-}
-
-export function getBuiltInPlatformCheckKey(check: Pick<CustomCheck, "category" | "custom_check_id">) {
-  return toCheckKey(check.category, check.custom_check_id);
-}
-
-function toCheckKey(category: string, customCheckId: string) {
-  return `${category}::${customCheckId}`;
-}
diff --git a/src/Frontend/src/resources/CustomCheck.ts b/src/Frontend/src/resources/CustomCheck.ts
index eb9123bc8c..92507ecd45 100644
--- a/src/Frontend/src/resources/CustomCheck.ts
+++ b/src/Frontend/src/resources/CustomCheck.ts
@@ -8,6 +8,7 @@ export default interface CustomCheck {
   reported_at: string;
   failure_reason: string;
   originating_endpoint: EndpointDetails;
+  internal?: boolean;
 }
 
 export enum Status {
diff --git a/src/Frontend/src/stores/CustomChecksStore.spec.ts b/src/Frontend/src/stores/CustomChecksStore.spec.ts
index d8fb66322b..1db6830eb0 100644
--- a/src/Frontend/src/stores/CustomChecksStore.spec.ts
+++ b/src/Frontend/src/stores/CustomChecksStore.spec.ts
@@ -8,10 +8,10 @@ describe("CustomChecksStore", () => {
     setActivePinia(createPinia());
   });
 
-  test("hides built-in platform custom checks by default", () => {
+  test("hides internal platform custom checks by default", () => {
     const store = useCustomChecksStore();
 
-    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health"), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
+    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health", true), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
 
     expect(store.rawFailingCount).toBe(2);
     expect(store.failedChecks).toHaveLength(1);
@@ -19,10 +19,10 @@ describe("CustomChecksStore", () => {
     expect(store.failedChecks[0].custom_check_id).toBe("SampleCustomeCheck 1");
   });
 
-  test("shows built-in platform custom checks when toggled on", () => {
+  test("shows internal platform custom checks when toggled on", () => {
     const store = useCustomChecksStore();
 
-    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health"), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
+    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health", true), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
     store.showPlatformCustomChecks = true;
 
     expect(store.failedChecks).toHaveLength(2);
@@ -30,7 +30,7 @@ describe("CustomChecksStore", () => {
   });
 });
 
-function createCheck(custom_check_id: string, category: string) {
+function createCheck(custom_check_id: string, category: string, internal = false) {
   return {
     id: `customchecks/${custom_check_id}`,
     custom_check_id,
@@ -38,6 +38,7 @@ function createCheck(custom_check_id: string, category: string) {
     status: Status.Fail,
     reported_at: "2025-01-10T05:06:30.4074087Z",
     failure_reason: "Failure",
+    internal,
     originating_endpoint: {
       name: "EndpointX",
       host_id: "host-id",
diff --git a/src/Frontend/src/stores/CustomChecksStore.ts b/src/Frontend/src/stores/CustomChecksStore.ts
index 1c6b3ad931..4316cd063f 100644
--- a/src/Frontend/src/stores/CustomChecksStore.ts
+++ b/src/Frontend/src/stores/CustomChecksStore.ts
@@ -3,7 +3,6 @@ import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed, ref, watch } from "vue";
 import { useCounter } from "@vueuse/core";
 import serviceControlClient from "@/components/serviceControlClient";
-import { isBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 
 export const useCustomChecksStore = defineStore("CustomChecksStore", () => {
   const prefix = "customchecks/";
@@ -15,7 +14,7 @@ export const useCustomChecksStore = defineStore("CustomChecksStore", () => {
 
   const { count, inc, dec } = useCounter(0);
   const skipRefresh = computed(() => count.value > 0);
-  const failedChecks = computed(() => (showPlatformCustomChecks.value ? rawFailedChecks.value : rawFailedChecks.value.filter((check) => !isBuiltInPlatformCheck(check))));
+  const failedChecks = computed(() => (showPlatformCustomChecks.value ? rawFailedChecks.value : rawFailedChecks.value.filter((check) => !check.internal)));
   const failingCount = computed(() => failedChecks.value.length);
 
   const refresh = async () => {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 3792cedec8..0d7713e4df 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -43,6 +43,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
           host_id: "host-2",
@@ -182,7 +183,7 @@ describe("PlatformHealthStore", () => {
     expect(store.outdatedOnly).toBe(true);
   });
 
-  test("applies hidden built-in platform custom checks to platform health only", async () => {
+  test("applies internal platform custom checks to platform health only", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.replaceFailedChecks([
       {
@@ -192,6 +193,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Critical error detected",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl",
           host_id: "host-1",
@@ -205,6 +207,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
           host_id: "host-2",
@@ -222,13 +225,13 @@ describe("PlatformHealthStore", () => {
 
     await store.refresh();
 
-    expect(store.payload?.primary.health).toBe("unavailable");
+    expect(store.payload?.primary.health).toBe("degraded");
     expect(store.payload?.remotes[0].health).toBe("healthy");
     expect(store.payload?.remotes[1].health).toBe("degraded");
-    expect(store.severity).toBe("danger");
+    expect(store.severity).toBe("warning");
   });
 
-  test("maps built-in degraded primary custom checks to primary degraded", async () => {
+  test("maps internal degraded primary custom checks to primary degraded", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.replaceFailedChecks([
       {
@@ -238,6 +241,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Error ingestion stopped",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl",
           host_id: "host-1",
@@ -273,7 +277,7 @@ describe("PlatformHealthStore", () => {
     expect(store.rows[0].healthDetails).toContain(`Reported at: ${currentReportedAt}`);
   });
 
-  test("does not degrade an audit instance when the built-in check belongs to another audit instance", async () => {
+  test("does not degrade an audit instance when the internal check belongs to another audit instance", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.replaceFailedChecks([
       {
@@ -283,6 +287,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit.Other",
           host_id: "host-2",
@@ -320,6 +325,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
           host_id: "host-2",
@@ -397,6 +403,7 @@ describe("PlatformHealthStore", () => {
         status: Status.Fail,
         reported_at: currentReportedAt,
         failure_reason: "Audit ingestion failed",
+        internal: true,
         originating_endpoint: {
           name: "Particular.ServiceControl.Audit-Blue",
           host_id: "host-2",
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 0205016e9b..48bff07947 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -1,7 +1,6 @@
 import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
 import { computed, ref, watch } from "vue";
 import { isUpgradeAvailable } from "@/composables/serviceSemVer";
-import { getBuiltInPlatformCheck } from "@/components/customchecks/builtInPlatformChecks";
 import type { PlatformHealthResponse, PlatformHealthRow, PlatformHealthSeverity } from "@/resources/PlatformHealth";
 import type CustomCheck from "@/resources/CustomCheck";
 import type { PlatformInstance, PlatformModel, ServicePulse } from "@/resources/PlatformModel";
@@ -292,15 +291,10 @@ function detailsForInstance(instance: PlatformInstance, model: PlatformModel, ch
 }
 
 function matchesInstance(check: CustomCheck, instance: PlatformInstance) {
-  const platformCheck = getBuiltInPlatformCheck(check);
-  if (!platformCheck) {
+  if (!check.internal) {
     return false;
   }
 
-  if (platformCheck.target === "transport") {
-    return instance.role === "remote-audit" && sameInstanceName(check.originating_endpoint.name, instance.name);
-  }
-
   return sameInstanceName(check.originating_endpoint.name, instance.name);
 }
 
@@ -341,20 +335,13 @@ function fallbackDetails(instance: PlatformInstance, model: PlatformModel) {
 }
 
 function applyPlatformCheckHealthToInstance(instance: PlatformInstance, checks: CustomCheck[]) {
-  const matchingPlatformChecks = checks
-    .filter((check) => matchesInstance(check, instance))
-    .map((check) => ({ check, platformCheck: getBuiltInPlatformCheck(check) }))
-    .filter((entry): entry is { check: CustomCheck; platformCheck: NonNullable<ReturnType<typeof getBuiltInPlatformCheck>> } => entry.platformCheck !== null);
-
-  if (matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "unavailable")) {
-    return { ...instance, health: "unavailable" as const };
-  }
+  const matchingPlatformChecks = checks.filter((check) => matchesInstance(check, instance));
 
-  if (instance.health === "healthy" && matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "degraded")) {
+  if (matchingPlatformChecks.length > 0 && instance.health === "healthy") {
     return { ...instance, health: "degraded" as const };
   }
 
-  if (instance.health === "degraded" && !matchingPlatformChecks.some(({ platformCheck }) => platformCheck.severity === "degraded")) {
+  if (instance.health === "degraded" && matchingPlatformChecks.length === 0) {
     return { ...instance, health: "healthy" as const };
   }
 
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
index 5cb01c4c3d..679f4bb1cc 100644
--- a/src/Frontend/test/mocks/platform-health-state.spec.ts
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -7,7 +7,7 @@ describe("platform-health-state", () => {
     window.__platformHealth?.reset();
   });
 
-  test("applies built-in and user custom check presets independently of topology scenario", () => {
+  test("applies internal and user custom check presets independently of topology scenario", () => {
     window.__platformHealth?.setScenario("audit-remotes-healthy");
     window.__platformHealth?.setCustomCheckPreset("mixed-primary-and-user");
 
@@ -19,6 +19,8 @@ describe("platform-health-state", () => {
     expect(checks).toHaveLength(2);
     expect(checks.some((check) => check.custom_check_id === "ServiceControl Primary Instance")).toBe(true);
     expect(checks.some((check) => check.category === "User defined")).toBe(true);
+    expect(checks.some((check) => check.internal)).toBe(true);
+    expect(checks.some((check) => !check.internal)).toBe(true);
   });
 
   test("allows explicit custom checks to replace a preset", () => {
@@ -39,6 +41,7 @@ describe("platform-health-state", () => {
     expect(checks).toHaveLength(1);
     expect(checks[0].custom_check_id).toBe("Error Message Ingestion Process");
     expect(checks[0].category).toBe("ServiceControl Health");
+    expect(checks[0].internal).toBe(true);
   });
 
   test("keeps healthy audit remote topology healthy until a related audit custom check is applied", () => {
@@ -56,5 +59,6 @@ describe("platform-health-state", () => {
 
     expect(checks).toHaveLength(1);
     expect(checks[0].originating_endpoint.name).toBe("Particular.ServiceControl.Audit-Blue");
+    expect(checks[0].internal).toBe(true);
   });
 });
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index c6903f7c74..ba5d09a381 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -147,6 +147,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           status: Status.Fail,
           reported_at: currentReportedAt,
           failure_reason: "Critical error detected",
+          internal: true,
           originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
         }),
       ];
@@ -158,6 +159,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           status: Status.Fail,
           reported_at: currentReportedAt,
           failure_reason: "Error ingestion stopped",
+          internal: true,
           originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
         }),
       ];
@@ -169,6 +171,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           status: Status.Fail,
           reported_at: currentReportedAt,
           failure_reason: "Audit ingestion failed",
+          internal: true,
           originating_endpoint: { name: "Particular.ServiceControl.Audit-Blue", host_id: crypto.randomUUID(), host: "audit-host" },
         }),
       ];
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index 5d1ed35436..0be4eae083 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -7,6 +7,8 @@ const { worker, driver, runScenario } = createScenario();
 
 export { worker };
 
+installPlatformHealthDevControls();
+
 export const setupComplete = (async () => {
   await runScenario(precondition.serviceControlWithMonitoring);
   await runScenario(() => {
@@ -42,7 +44,6 @@ export const setupComplete = (async () => {
     });
     return Promise.resolve();
   });
-  installPlatformHealthDevControls();
 })();
 
 function stateVersion() {
diff --git a/src/Frontend/test/preconditions/customChecks.ts b/src/Frontend/test/preconditions/customChecks.ts
index b5f4213d98..d836a596ad 100644
--- a/src/Frontend/test/preconditions/customChecks.ts
+++ b/src/Frontend/test/preconditions/customChecks.ts
@@ -47,6 +47,7 @@ const customCheckTemplate = <CustomCheck>{
     host_id: "ff605b55-6fbb-af56-5753-73c1ff73e601",
     host: "ABC",
   },
+  internal: false,
 };
 
 export const hasCustomChecks =
diff --git a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
index 1f2c74ad81..30b54f5b4f 100644
--- a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
@@ -48,7 +48,7 @@ describe("FEATURE: Failing custom checks", () => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(
         precondition.getCustomChecks([
-          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable" }),
+          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable", internal: true }),
           precondition.createCustomCheck({ custom_check_id: "SampleCustomeCheck 1", category: "Some Category 1", status: Status.Fail, failure_reason: "configured to fail on endpoint 1" }),
         ])
       );
@@ -69,7 +69,7 @@ describe("FEATURE: Failing custom checks", () => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(
         precondition.getCustomChecks([
-          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable" }),
+          precondition.createCustomCheck({ custom_check_id: "ServiceControl Primary Instance", category: "Health", status: Status.Fail, failure_reason: "Primary unavailable", internal: true }),
           precondition.createCustomCheck({ custom_check_id: "SampleCustomeCheck 1", category: "Some Category 1", status: Status.Fail, failure_reason: "configured to fail on endpoint 1" }),
         ])
       );
diff --git a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
index 8732216bbb..b2e12697b2 100644
--- a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
@@ -40,6 +40,7 @@ describe("FEATURE: No data", () => {
             category: "Health",
             status: Status.Fail,
             failure_reason: "Critical error detected",
+            internal: true,
           }),
         ])
       );

From 066b3e6c53d459a6c13d0216e2159bea83ca688a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Wed, 2 Sep 2026 07:28:14 +0200
Subject: [PATCH 53/67] Fix custom check paging and health preservation

---
 .../src/stores/CustomChecksStore.spec.ts      | 10 ++++++++
 .../src/stores/PlatformHealthStore.spec.ts    | 23 +++++++++++++++++++
 .../src/stores/PlatformHealthStore.ts         |  4 ----
 src/Frontend/src/views/CustomChecksView.vue   |  6 ++---
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/Frontend/src/stores/CustomChecksStore.spec.ts b/src/Frontend/src/stores/CustomChecksStore.spec.ts
index 1db6830eb0..453079c34d 100644
--- a/src/Frontend/src/stores/CustomChecksStore.spec.ts
+++ b/src/Frontend/src/stores/CustomChecksStore.spec.ts
@@ -28,6 +28,16 @@ describe("CustomChecksStore", () => {
     expect(store.failedChecks).toHaveLength(2);
     expect(store.failingCount).toBe(2);
   });
+
+  test("keeps the server failing count even when internal checks are hidden", () => {
+    const store = useCustomChecksStore();
+
+    store.replaceFailedChecks([createCheck("ServiceControl Primary Instance", "Health", true), createCheck("SampleCustomeCheck 1", "Some Category 1")]);
+
+    expect(store.rawFailingCount).toBe(2);
+    expect(store.failingCount).toBe(1);
+    expect(store.failedChecks).toHaveLength(1);
+  });
 });
 
 function createCheck(custom_check_id: string, category: string, internal = false) {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 0d7713e4df..b1be2efdae 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -353,6 +353,29 @@ describe("PlatformHealthStore", () => {
     expect(store.payload?.remotes[1].health).toBe("degraded");
   });
 
+  test("preserves a degraded instance when no internal check matches it", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.replaceFailedChecks([]);
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = {
+        ...singleRegionWarningModel,
+        primary: {
+          ...singleRegionWarningModel.primary,
+          health: "degraded",
+        },
+      };
+      return Promise.resolve();
+    });
+
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.payload?.primary.health).toBe("degraded");
+  });
+
   test("refreshes custom checks alongside the platform model and keeps rendering when custom checks fail", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.refresh = vi.fn(() => Promise.reject(new Error("custom checks unavailable")));
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 48bff07947..90e7fc1c10 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -341,10 +341,6 @@ function applyPlatformCheckHealthToInstance(instance: PlatformInstance, checks:
     return { ...instance, health: "degraded" as const };
   }
 
-  if (instance.health === "degraded" && matchingPlatformChecks.length === 0) {
-    return { ...instance, health: "healthy" as const };
-  }
-
   return instance;
 }
 
diff --git a/src/Frontend/src/views/CustomChecksView.vue b/src/Frontend/src/views/CustomChecksView.vue
index 53b2a86a1b..11a1d81de2 100644
--- a/src/Frontend/src/views/CustomChecksView.vue
+++ b/src/Frontend/src/views/CustomChecksView.vue
@@ -7,7 +7,7 @@ import useCustomChecksStoreAutoRefresh from "@/composables/useCustomChecksStoreA
 
 const { store } = useCustomChecksStoreAutoRefresh();
 
-const { pageNumber, failingCount, failedChecks, showPlatformCustomChecks } = storeToRefs(store);
+const { pageNumber, failedChecks, rawFailingCount, showPlatformCustomChecks } = storeToRefs(store);
 </script>
 
 <template>
@@ -23,12 +23,12 @@ const { pageNumber, failingCount, failedChecks, showPlatformCustomChecks } = sto
     </div>
 
     <section name="custom_checks">
-      <NoData v-if="failingCount === 0" message="No failed custom checks" role="note" aria-label="customcheck-message" />
+      <NoData v-if="rawFailingCount === 0" message="No failed custom checks" role="note" aria-label="customcheck-message" />
       <div v-else class="row" role="table" aria-label="custom-check-list">
         <div class="col-sm-12">
           <CustomCheckView v-for="item of failedChecks" :key="item.id" :custom-check="item" />
           <div class="row">
-            <PaginationStrip :items-per-page="10" :total-count="failingCount" v-model="pageNumber" role="row" aria-label="custom-check-pagination" />
+            <PaginationStrip :items-per-page="10" :total-count="rawFailingCount" v-model="pageNumber" role="row" aria-label="custom-check-pagination" />
           </div>
         </div>
       </div>

From 31a6328c70c8b161e553462818858f70c62e00d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Wed, 2 Sep 2026 13:15:11 +0200
Subject: [PATCH 54/67] Handle primary outage in platform health

---
 docs/frontend/custom-checks-page.md           |  3 +-
 docs/frontend/platform-health-page.md         |  6 ++-
 docs/platform-topology.md                     |  2 +
 .../src/stores/PlatformHealthStore.spec.ts    | 14 +++++++
 .../src/stores/PlatformModelStore.spec.ts     | 21 ++++++++++
 src/Frontend/src/stores/PlatformModelStore.ts |  3 +-
 src/Frontend/src/views/PlatformHealthView.vue | 41 +++++++++++++++++--
 .../test/mocks/platform-health-state.spec.ts  | 20 ++++++++-
 .../test/mocks/platform-health-state.ts       | 16 +-------
 src/Frontend/test/mocks/platform-topology.ts  |  9 +++-
 .../platform-health/platform-health.ts        | 18 +++++++-
 .../viewing-failing-custom-checks.spec.ts     |  4 +-
 .../customchecks/viewing-no-data.spec.ts      |  2 +-
 .../primary-unavailable.spec.ts               | 24 +++++++++++
 14 files changed, 155 insertions(+), 28 deletions(-)
 create mode 100644 src/Frontend/test/specs/platformhealth/primary-unavailable.spec.ts

diff --git a/docs/frontend/custom-checks-page.md b/docs/frontend/custom-checks-page.md
index 76806c2e8e..ca7dc328dd 100644
--- a/docs/frontend/custom-checks-page.md
+++ b/docs/frontend/custom-checks-page.md
@@ -69,7 +69,6 @@ Then use:
 
 - `window.__platformHealth.setCustomCheckPreset("none")`
 - `window.__platformHealth.setCustomCheckPreset("user-only")`
-- `window.__platformHealth.setCustomCheckPreset("platform-only-primary")`
 - `window.__platformHealth.setCustomCheckPreset("platform-only-primary-degraded")`
 - `window.__platformHealth.setCustomCheckPreset("platform-only-audit")`
 - `window.__platformHealth.setCustomCheckPreset("mixed-primary-and-user")`
@@ -78,7 +77,7 @@ Then use:
 
 | Behavior | How to exercise it |
 |----------|--------------------|
-| Internal platform checks hidden by default | Apply `platform-only-primary` or `platform-only-audit`, then open Custom Checks page |
+| Internal platform checks hidden by default | Apply `platform-only-primary-degraded` or `platform-only-audit`, then open Custom Checks page |
 | Internal platform checks shown when toggled on | Apply a platform-only preset, enable `Show platform custom checks` |
 | User-defined checks visible by default | Apply `user-only` or `mixed-primary-and-user` |
 | Platform health reacts to hidden internal checks | Apply `platform-only-primary-degraded` or `platform-only-audit`, then compare Platform health with Custom Checks page |
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index deb27f8537..59547f3ef6 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -141,6 +141,7 @@ Switch topology at runtime with `window.__platformHealth.setScenario(...)`:
 | `audit-remotes-danger` | Primary healthy, both audit remotes unavailable, monitoring healthy |
 | `remote-errors-healthy` | Primary healthy with remote error instances and no monitoring |
 | `remote-errors-danger` | One remote error instance unavailable |
+| `primary-unavailable` | Primary root unavailable, no remotes discovered, monitoring healthy |
 
 ### Custom Check Presets
 
@@ -150,7 +151,6 @@ Switch custom-check state independently with `window.__platformHealth.setCustomC
 |--------|---------|
 | `none` | No custom checks |
 | `user-only` | Non-platform custom checks only |
-| `platform-only-primary` | Internal primary critical-error signal |
 | `platform-only-primary-degraded` | Internal primary degraded signal |
 | `platform-only-audit` | Internal audit degraded signal targeted at a specific audit instance |
 | `mixed-primary-and-user` | Combined platform and user checks |
@@ -165,7 +165,8 @@ Verify these behaviors from the single startup scenario plus runtime switches:
 | Warning state from degraded audit instance | `setScenario("audit-remotes-healthy")` plus `setCustomCheckPreset("platform-only-audit")` |
 | Danger state from unavailable instances | `setScenario("audit-remotes-danger")` or `setScenario("remote-errors-danger")` |
 | Remote error instances | `setScenario("remote-errors-healthy")` |
-| Internal platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary")` or `setCustomCheckPreset("platform-only-audit")` |
+| Primary unavailable with no remotes | `setScenario("primary-unavailable")` |
+| Internal platform checks hidden from Custom Checks UI but applied to Platform health | `setCustomCheckPreset("platform-only-primary-degraded")` or `setCustomCheckPreset("platform-only-audit")` |
 | Expanded row details with separate info and issue sections | trigger any row, then click the health badge |
 | Upgrade cue rendering | use instances whose versions differ from the known latest version in the scenario data |
 | Support-case modal preview and download flow | click `Open support case`, preview `platform-health.json`, then download it and verify the support link becomes enabled |
@@ -230,3 +231,4 @@ Platform health-specific checks:
 1. Run the focused Platform health specs listed above.
 2. If a degraded row is missing or assigned to the wrong instance, inspect the check's `originating_endpoint.name` and the instance name carried in the platform model.
 3. If hidden platform checks are not affecting the page, inspect the `customchecks?status=fail` response instead of assuming the Custom Checks page must be visited first.
+4. If remotes are unexpectedly present after a primary outage, verify the `primary-unavailable` mock scenario is active and that remote discovery is skipped for that refresh.
diff --git a/docs/platform-topology.md b/docs/platform-topology.md
index f91d1a31f7..5cebd95b1b 100644
--- a/docs/platform-topology.md
+++ b/docs/platform-topology.md
@@ -32,6 +32,8 @@ It calls each remote's `/api/configuration`, gathers the responses in parallel,
 
 This is an enriched relay, not a raw pass-through.
 
+If the primary ServiceControl root is unavailable, ServicePulse does not attempt remote discovery for that refresh cycle.
+
 ## Shared Uses
 
 - `docs/frontend/platform-health-page.md`
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index b1be2efdae..c9e13c43b0 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -396,6 +396,20 @@ describe("PlatformHealthStore", () => {
     expect(logger.warn).toHaveBeenCalledWith("Unable to refresh custom checks for platform health", expect.any(Error));
   });
 
+  test("renders no remotes when the primary model refresh fails", async () => {
+    const customChecksStore = useCustomChecksStore();
+    customChecksStore.refresh = vi.fn(() => Promise.reject(new Error("custom checks unavailable")));
+
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => Promise.reject(new Error("primary unavailable")));
+
+    const store = usePlatformHealthStore();
+
+    await expect(store.refresh()).rejects.toThrow("primary unavailable");
+
+    expect(store.payload).toBeNull();
+  });
+
   test("recomputes payload-derived state when failed checks change after refresh", async () => {
     const customChecksStore = useCustomChecksStore();
     const platformModelStore = usePlatformModelStore();
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 34be7daae2..629f9aab9f 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -108,6 +108,27 @@ describe("PlatformModelStore", () => {
     expect(store.remotes[0].kind).toBe("error");
     expect(store.remotes[0].role).toBe("remote-error");
   });
+
+  test("skips remote discovery when the primary root is unavailable", async () => {
+    getRoot.mockRejectedValue(new Error("primary unavailable"));
+    getRemoteInstances.mockResolvedValue([
+      {
+        api_uri: "http://localhost:33334/api/",
+        version: "6.19.3",
+        status: "online",
+        configuration: { data_retention: { audit_retention_period: "7.00:00:00" } },
+      },
+    ]);
+    getMonitoringRoot.mockResolvedValue({ platform_health_status: "healthy", platform_health_version: "6.19.3" });
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(getRemoteInstances).not.toHaveBeenCalled();
+    expect(store.primary?.health).toBe("unavailable");
+    expect(store.remotes).toHaveLength(0);
+    expect(store.monitoring?.health).toBe("healthy");
+  });
 });
 
 function rootResponse({ name, health, version }: { name: string; health: "healthy" | "degraded" | "unavailable"; version: string }) {
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index d7eb10e72c..6b9eee7218 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -16,7 +16,8 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
 
   async function refresh() {
-    const [primaryRoot, remotesResponse, monitoringResponse] = await Promise.all([getPrimaryRoot(), getRemotes(), getMonitoringRoot()]);
+    const [primaryRoot, monitoringResponse] = await Promise.all([getPrimaryRoot(), getMonitoringRoot()]);
+    const remotesResponse = primaryRoot ? await getRemotes() : [];
 
     model.value = {
       primary: mapPrimary(primaryRoot),
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index fa2493a9d5..ad6d53ae5c 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -7,6 +7,7 @@ import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthSt
 import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
 import FAIcon from "@/components/FAIcon.vue";
 import { faArrowTurnUp, faChevronDown, faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
+import { WarningLevel } from "@/components/WarningLevel";
 
 const { store } = usePlatformHealthStoreAutoRefresh();
 useEnvironmentAndVersionsAutoRefresh();
@@ -75,6 +76,24 @@ function issueEntries(row: (typeof store.rows)[number]) {
   return entries;
 }
 
+function issueWarningLevel(row: (typeof store.rows)[number]) {
+  switch (row.health) {
+    case "degraded":
+      return WarningLevel.Warning;
+    case "unavailable":
+      return WarningLevel.Danger;
+    default:
+      return WarningLevel.None;
+  }
+}
+
+function issuePanelClass(row: (typeof store.rows)[number]) {
+  return {
+    warning: row.health === "degraded",
+    danger: row.health === "unavailable",
+  };
+}
+
 function showsNoProblems(row: (typeof store.rows)[number]) {
   return row.type === "ServicePulse" && row.healthDetails.length === 1 && row.healthDetails[0] === "No problems detected.";
 }
@@ -139,13 +158,13 @@ function toggleRow(row: (typeof store.rows)[number]) {
                   <tr v-if="isExpanded(row)" :id="`${rowKey(row)}-details`" class="details-row">
                     <td colspan="4" class="details-cell">
                       <div class="details-stack">
-                        <section v-if="issueEntries(row).length > 0" class="details-card details-card-issues">
+                        <section v-if="issueEntries(row).length > 0" class="details-card details-card-issues" :class="issuePanelClass(row)">
                           <div class="details-card-header">
                             <h3>Health issues</h3>
                           </div>
                           <div class="issue-list">
                             <article v-for="issue in issueEntries(row)" :key="issue.summary + (issue.reportedAt ?? '')" class="issue-item">
-                              <FAIcon class="issue-icon" :icon="faTriangleExclamation" />
+                              <FAIcon class="issue-icon" :class="issueWarningLevel(row)" :icon="faTriangleExclamation" />
                               <div class="issue-content">
                                 <div class="issue-summary">{{ issue.summary }}</div>
                                 <div v-if="issue.reportedAt" class="issue-meta">Reported at: {{ issue.reportedAt }}</div>
@@ -258,6 +277,15 @@ tbody tr:last-child td {
 }
 
 .details-card-issues {
+  background: #fffafa;
+}
+
+.details-card-issues.warning {
+  border-left: 4px solid var(--bs-warning);
+  background: #fffdf2;
+}
+
+.details-card-issues.danger {
   border-left: 4px solid #b53a31;
   background: #fffafa;
 }
@@ -293,11 +321,18 @@ tbody tr:last-child td {
 
 .issue-icon {
   margin-top: 0.2rem;
-  color: #b53a31;
   font-size: 14px;
   flex: none;
 }
 
+.issue-icon.warning {
+  color: var(--bs-warning);
+}
+
+.issue-icon.danger {
+  color: #b53a31;
+}
+
 .issue-content {
   display: grid;
   gap: 0.15rem;
diff --git a/src/Frontend/test/mocks/platform-health-state.spec.ts b/src/Frontend/test/mocks/platform-health-state.spec.ts
index 679f4bb1cc..650b5cb5c7 100644
--- a/src/Frontend/test/mocks/platform-health-state.spec.ts
+++ b/src/Frontend/test/mocks/platform-health-state.spec.ts
@@ -24,7 +24,7 @@ describe("platform-health-state", () => {
   });
 
   test("allows explicit custom checks to replace a preset", () => {
-    window.__platformHealth?.setCustomCheckPreset("platform-only-primary");
+    window.__platformHealth?.setCustomCheckPreset("platform-only-primary-degraded");
     window.__platformHealth?.setCustomChecks([]);
 
     expect(window.__platformHealth?.getCustomChecks()).toEqual([]);
@@ -61,4 +61,22 @@ describe("platform-health-state", () => {
     expect(checks[0].originating_endpoint.name).toBe("Particular.ServiceControl.Audit-Blue");
     expect(checks[0].internal).toBe(true);
   });
+
+  test("supports a primary unavailable scenario", () => {
+    window.__platformHealth?.setScenario("primary-unavailable");
+
+    const state = window.__platformHealth?.getState();
+
+    expect(state?.scenario).toBe("primary-unavailable");
+    expect(state?.primary.status).toBe("unavailable");
+    expect(state?.remotes).toHaveLength(0);
+  });
+
+  test("fails custom checks retrieval in the primary unavailable scenario", () => {
+    window.__platformHealth?.setScenario("primary-unavailable");
+
+    const checks = getPlatformHealthCustomChecks();
+
+    expect(checks).toHaveLength(0);
+  });
 });
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index ba5d09a381..b4e7e8cadb 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -5,7 +5,7 @@ import { createCustomCheck } from "../preconditions/customChecks";
 import { clonePlatformTopology, createPlatformTopology, latestPlatformVersion, toRemoteInstances, type PlatformTopology, type PlatformTopologyScenarioName, type PlatformTopologyStatus, updatePlatformTopologyStatus } from "./platform-topology";
 
 export type PlatformHealthMockScenarioName = PlatformTopologyScenarioName;
-export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
+export type PlatformHealthCustomCheckPresetName = "none" | "user-only" | "platform-only-primary-degraded" | "platform-only-audit" | "mixed-primary-and-user";
 
 export type PlatformHealthMockStatus = Exclude<PlatformTopologyStatus, "degraded">;
 
@@ -139,18 +139,6 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
           originating_endpoint: { name: "Sales.Endpoint", host_id: crypto.randomUUID(), host: "sales-host" },
         }),
       ];
-    case "platform-only-primary":
-      return [
-        createCustomCheck({
-          custom_check_id: "ServiceControl Primary Instance",
-          category: "Health",
-          status: Status.Fail,
-          reported_at: currentReportedAt,
-          failure_reason: "Critical error detected",
-          internal: true,
-          originating_endpoint: { name: "Particular.ServiceControl", host_id: crypto.randomUUID(), host: "sc-host" },
-        }),
-      ];
     case "platform-only-primary-degraded":
       return [
         createCustomCheck({
@@ -176,7 +164,7 @@ function createCustomCheckPreset(name: PlatformHealthCustomCheckPresetName): Cus
         }),
       ];
     case "mixed-primary-and-user":
-      return [...createCustomCheckPreset("platform-only-primary"), ...createCustomCheckPreset("user-only")];
+      return [...createCustomCheckPreset("platform-only-primary-degraded"), ...createCustomCheckPreset("user-only")];
     case "none":
     default:
       return [];
diff --git a/src/Frontend/test/mocks/platform-topology.ts b/src/Frontend/test/mocks/platform-topology.ts
index 280eb6a381..50e7aa130f 100644
--- a/src/Frontend/test/mocks/platform-topology.ts
+++ b/src/Frontend/test/mocks/platform-topology.ts
@@ -2,7 +2,7 @@ import { RemoteInstanceStatus, RemoteInstanceType, type RemoteInstance } from "@
 
 export const latestPlatformVersion = "6.19.3";
 
-export type PlatformTopologyScenarioName = "audit-remotes-healthy" | "audit-remotes-danger" | "remote-errors-healthy" | "remote-errors-danger";
+export type PlatformTopologyScenarioName = "audit-remotes-healthy" | "audit-remotes-danger" | "remote-errors-healthy" | "remote-errors-danger" | "primary-unavailable";
 export type PlatformTopologyStatus = "healthy" | "degraded" | "unavailable";
 
 export interface PlatformTopologyRemote {
@@ -71,6 +71,13 @@ export function createPlatformTopology(name: PlatformTopologyScenarioName): Plat
         ],
         monitoring: null,
       };
+    case "primary-unavailable":
+      return {
+        scenario: name,
+        primary: { name: "Particular.ServiceControl", version: latestPlatformVersion, status: "unavailable" },
+        remotes: [],
+        monitoring: { configured: true, version: latestPlatformVersion, status: "healthy" },
+      };
   }
 }
 
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index 0be4eae083..32755d7899 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -12,7 +12,13 @@ installPlatformHealthDevControls();
 export const setupComplete = (async () => {
   await runScenario(precondition.serviceControlWithMonitoring);
   await runScenario(() => {
+    const primaryUnavailable = () => window.__platformHealth?.getState().scenario === "primary-unavailable";
+
     driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}`, "get", () => {
+      if (primaryUnavailable()) {
+        return Promise.resolve({ body: { detail: "Primary unavailable" }, status: 503 });
+      }
+
       const body = getPlatformHealthPrimaryRoot();
 
       return Promise.resolve({
@@ -21,8 +27,18 @@ export const setupComplete = (async () => {
         headers: { "X-Particular-Version": stateVersion() },
       });
     });
-    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}configuration/remotes`, "get", () => Promise.resolve({ body: getPlatformHealthRemoteInstances() }));
+    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}configuration/remotes`, "get", () => {
+      if (primaryUnavailable()) {
+        return Promise.resolve({ body: { detail: "Primary unavailable" }, status: 503 });
+      }
+
+      return Promise.resolve({ body: getPlatformHealthRemoteInstances() });
+    });
     driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}customchecks`, "get", (url) => {
+      if (primaryUnavailable()) {
+        return Promise.resolve({ body: { detail: "Primary unavailable" }, status: 503 });
+      }
+
       const status = url.searchParams.get("status");
       const body = getPlatformHealthCustomChecks();
 
diff --git a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
index 30b54f5b4f..36354a8d67 100644
--- a/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-failing-custom-checks.spec.ts
@@ -44,7 +44,7 @@ describe("FEATURE: Failing custom checks", () => {
       });
     });
 
-    test("EXAMPLE: Built-in platform custom checks are hidden from the page by default", async ({ driver }) => {
+    test("EXAMPLE: Internal platform custom checks are hidden from the page by default", async ({ driver }) => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(
         precondition.getCustomChecks([
@@ -65,7 +65,7 @@ describe("FEATURE: Failing custom checks", () => {
       });
     });
 
-    test("EXAMPLE: Built-in platform custom checks are hidden from the dashboard count by default", async ({ driver }) => {
+    test("EXAMPLE: Internal platform custom checks are hidden from the dashboard count by default", async ({ driver }) => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(
         precondition.getCustomChecks([
diff --git a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
index b2e12697b2..efc19408a5 100644
--- a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
@@ -31,7 +31,7 @@ describe("FEATURE: No data", () => {
       });
     });
 
-    test("EXAMPLE: Built-in platform custom checks are hidden by default but can be shown", async ({ driver }) => {
+    test("EXAMPLE: Internal platform custom checks are hidden by default but can be shown", async ({ driver }) => {
       await driver.setUp(precondition.serviceControlWithMonitoring);
       await driver.setUp(
         precondition.getCustomChecks([
diff --git a/src/Frontend/test/specs/platformhealth/primary-unavailable.spec.ts b/src/Frontend/test/specs/platformhealth/primary-unavailable.spec.ts
new file mode 100644
index 0000000000..5fb7e5fc57
--- /dev/null
+++ b/src/Frontend/test/specs/platformhealth/primary-unavailable.spec.ts
@@ -0,0 +1,24 @@
+import { test, describe } from "../../drivers/vitest/driver";
+import { expect } from "vitest";
+import { waitFor } from "@testing-library/vue";
+import * as precondition from "../../preconditions";
+import { installPlatformHealthDevControls } from "../../mocks/platform-health-state";
+
+describe("FEATURE: Platform health primary unavailable", () => {
+  test("EXAMPLE: primary unavailable does not load remotes or custom checks", async ({ driver }) => {
+    await driver.setUp(precondition.serviceControlWithMonitoring);
+    await driver.setUp(precondition.hasCustomChecks(1, 0));
+    installPlatformHealthDevControls();
+    window.__platformHealth?.setScenario("primary-unavailable");
+
+    await driver.goTo("/platform-health");
+
+    await waitFor(() => {
+      const state = window.__platformHealth?.getState();
+      expect(state?.scenario).toBe("primary-unavailable");
+      expect(state?.remotes).toHaveLength(0);
+    });
+
+    expect(window.__platformHealth?.getCustomChecks()).toHaveLength(0);
+  });
+});

From b2420306b953a471c25fc6a512e2a038e3a41d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Wed, 2 Sep 2026 13:27:31 +0200
Subject: [PATCH 55/67] Hide empty platform custom checks toggle

---
 docs/frontend/custom-checks-page.md           |  4 +--
 docs/frontend/platform-health-page.md         |  1 +
 src/Frontend/src/views/CustomChecksView.vue   |  6 +++--
 .../customchecks/viewing-no-data.spec.ts      | 26 ++++++++++++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/docs/frontend/custom-checks-page.md b/docs/frontend/custom-checks-page.md
index ca7dc328dd..22f51d4fec 100644
--- a/docs/frontend/custom-checks-page.md
+++ b/docs/frontend/custom-checks-page.md
@@ -12,7 +12,7 @@ Internal platform custom checks are handled differently from user-defined custom
 
 - they are hidden by default from the Custom Checks page
 - they are hidden by default from the Custom Checks dashboard tile and menu badge
-- operators can reveal them with `Show platform custom checks`
+- operators can reveal them with `Show platform custom checks` when internal checks are present
 - Platform health consumes those internal checks as secondary platform signals
 
 ## Internal Platform Custom Checks
@@ -32,7 +32,7 @@ The Custom Checks page:
 
 - fetches failed custom checks from `customchecks?status=fail&page=<n>`
 - shows only non-internal custom checks by default
-- exposes `Show platform custom checks` to reveal internal platform checks
+- exposes `Show platform custom checks` to reveal internal platform checks when any are present
 - keeps pagination tied to the visible filtered list
 
 Relevant frontend pieces:
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 59547f3ef6..caa2421441 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -154,6 +154,7 @@ Switch custom-check state independently with `window.__platformHealth.setCustomC
 | `platform-only-primary-degraded` | Internal primary degraded signal |
 | `platform-only-audit` | Internal audit degraded signal targeted at a specific audit instance |
 | `mixed-primary-and-user` | Combined platform and user checks |
+| `Show platform custom checks` | Only appears when internal checks are present |
 
 ### Manual Checks
 
diff --git a/src/Frontend/src/views/CustomChecksView.vue b/src/Frontend/src/views/CustomChecksView.vue
index 11a1d81de2..fdb14996ca 100644
--- a/src/Frontend/src/views/CustomChecksView.vue
+++ b/src/Frontend/src/views/CustomChecksView.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed } from "vue";
 import NoData from "@/components/NoData.vue";
 import CustomCheckView from "@/components/customchecks/CustomCheckView.vue";
 import { storeToRefs } from "pinia";
@@ -7,7 +8,8 @@ import useCustomChecksStoreAutoRefresh from "@/composables/useCustomChecksStoreA
 
 const { store } = useCustomChecksStoreAutoRefresh();
 
-const { pageNumber, failedChecks, rawFailingCount, showPlatformCustomChecks } = storeToRefs(store);
+const { pageNumber, failedChecks, rawFailingCount, rawFailedChecks, showPlatformCustomChecks } = storeToRefs(store);
+const hasInternalChecks = computed(() => rawFailedChecks.value.some((check) => check.internal));
 </script>
 
 <template>
@@ -15,7 +17,7 @@ const { pageNumber, failedChecks, rawFailingCount, showPlatformCustomChecks } =
     <div class="row">
       <div class="col-sm-12 padded page-header-row">
         <h1>Custom checks</h1>
-        <label class="show-platform-toggle">
+        <label v-if="hasInternalChecks" class="show-platform-toggle">
           <input v-model="showPlatformCustomChecks" type="checkbox" aria-label="Show platform custom checks" />
           <span>Show platform custom checks</span>
         </label>
diff --git a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
index efc19408a5..aa0c64ed57 100644
--- a/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
+++ b/src/Frontend/test/specs/customchecks/viewing-no-data.spec.ts
@@ -2,7 +2,7 @@ import { test, describe } from "../../drivers/vitest/driver";
 import { expect } from "vitest";
 import * as precondition from "../../preconditions";
 import { customChecksFailedRowsList, customChecksMessage, showPlatformCustomChecksToggle } from "./questions/failedCustomChecks";
-import { waitFor } from "@testing-library/vue";
+import { waitFor, screen } from "@testing-library/vue";
 import userEvent from "@testing-library/user-event";
 import { Status } from "@/resources/CustomCheck";
 
@@ -51,11 +51,35 @@ describe("FEATURE: No data", () => {
         expect(customChecksMessage()).toBe("No failed custom checks");
       });
 
+      await waitFor(() => {
+        expect(showPlatformCustomChecksToggle()).toBeInTheDocument();
+      });
+
       await userEvent.click(showPlatformCustomChecksToggle());
 
       await waitFor(async () => {
         expect(await customChecksFailedRowsList()).toHaveLength(1);
       });
     });
+
+    test("EXAMPLE: The platform custom checks toggle is hidden when there are no internal checks", async ({ driver }) => {
+      await driver.setUp(precondition.serviceControlWithMonitoring);
+      await driver.setUp(
+        precondition.getCustomChecks([
+          precondition.createCustomCheck({
+            custom_check_id: "SampleCustomeCheck 1",
+            category: "Some Category 1",
+            status: Status.Fail,
+            failure_reason: "configured to fail on endpoint 1",
+          }),
+        ])
+      );
+
+      await driver.goTo("/custom-checks");
+
+      await waitFor(() => {
+        expect(screen.queryByRole("checkbox", { name: /Show platform custom checks/i })).toBeNull();
+      });
+    });
   });
 });

From 05a65922215ad669ec10910f93aa300321216a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Wed, 2 Sep 2026 13:35:14 +0200
Subject: [PATCH 56/67] Refine platform health info table

---
 .../src/views/PlatformHealthView.spec.ts      |  9 ++-
 src/Frontend/src/views/PlatformHealthView.vue | 57 +++++++++++++++++--
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index a06c697135..b743927b83 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -242,7 +242,8 @@ describe("PlatformHealthView", () => {
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
     const user = userEvent.setup();
     await user.click(screen.getAllByRole("button", { name: /Healthy/i })[0]);
-    expect(screen.getByText("API: http://localhost:33333/api/")).toBeInTheDocument();
+    expect(screen.getByText("API")).toBeInTheDocument();
+    expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
   });
 
   test("renders monitoring when present alongside remote error instances", () => {
@@ -355,7 +356,8 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByText("Health issues")).toBeInTheDocument();
     expect(screen.getByText("Information")).toBeInTheDocument();
-    expect(screen.getByText("API: http://localhost:33334/api/")).toBeInTheDocument();
+    expect(screen.getAllByText("API").length).toBeGreaterThan(0);
+    expect(screen.getByText("http://localhost:33334/api/")).toBeInTheDocument();
     expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
     expect(screen.getByText(`Reported at: ${currentReportedAt}`)).toBeInTheDocument();
 
@@ -403,7 +405,8 @@ describe("PlatformHealthView", () => {
 
     const user = userEvent.setup();
     await user.click(screen.getByRole("button", { name: /Healthy/i }));
-    expect(screen.getByText("API: http://localhost:33333/api/")).toBeInTheDocument();
+    expect(screen.getByText("API")).toBeInTheDocument();
+    expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
 
     rows.mockRestore();
   });
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index ad6d53ae5c..867b2de609 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -76,6 +76,22 @@ function issueEntries(row: (typeof store.rows)[number]) {
   return entries;
 }
 
+function infoEntries(row: (typeof store.rows)[number]) {
+  return row.infoDetails.map((detail) => {
+    if (detail.startsWith("API: ")) {
+      return {
+        label: "API",
+        value: detail.substring("API: ".length),
+      };
+    }
+
+    return {
+      label: "Info",
+      value: detail,
+    };
+  });
+}
+
 function issueWarningLevel(row: (typeof store.rows)[number]) {
   switch (row.health) {
     case "degraded":
@@ -177,9 +193,14 @@ function toggleRow(row: (typeof store.rows)[number]) {
                           <div class="details-card-header">
                             <h3>Information</h3>
                           </div>
-                          <ul v-if="row.infoDetails.length > 0" class="details-list details-list-info">
-                            <li v-for="detail in row.infoDetails" :key="detail">{{ detail }}</li>
-                          </ul>
+                          <table v-if="row.infoDetails.length > 0" class="details-table details-table-info">
+                            <tbody>
+                              <tr v-for="entry in infoEntries(row)" :key="`${entry.label}-${entry.value}`">
+                                <td class="details-table-key">{{ entry.label }}</td>
+                                <td>{{ entry.value }}</td>
+                              </tr>
+                            </tbody>
+                          </table>
                           <p v-else-if="showsNoProblems(row)" class="no-problems">No problems detected.</p>
                           <p v-else class="no-problems no-problems-muted">No additional information.</p>
                         </section>
@@ -348,14 +369,38 @@ tbody tr:last-child td {
   font-size: 12px;
 }
 
-.details-card-info .details-list,
+.details-card-info .details-table,
 .details-card-info .no-problems {
   margin: 0;
   padding: 14px 16px 16px;
 }
 
-.details-card-info .details-list {
-  padding-left: 2rem;
+.details-table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.details-table td {
+  padding: 0.4rem 0;
+  vertical-align: top;
+  border-bottom: 1px solid #eef2f2;
+}
+
+.details-table tr:last-child td {
+  border-bottom: none;
+}
+
+.details-table-key {
+  width: 112px;
+  color: #4c5b5c;
+  font-weight: 500;
+  text-align: center;
+  padding-right: 1rem;
+}
+
+.details-table td {
+  color: #617071;
+  word-break: break-word;
 }
 
 .no-problems {

From 70126d65b1f9cbe89574c8772cf730d2e47c46cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Wed, 2 Sep 2026 15:00:10 +0200
Subject: [PATCH 57/67] Fix dashboard icon focus

---
 src/Frontend/src/components/FAIcon.vue                      | 4 ++--
 src/Frontend/src/components/dashboard/DashboardMenuItem.vue | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Frontend/src/components/FAIcon.vue b/src/Frontend/src/components/FAIcon.vue
index 7caac12d24..3ea1427b12 100644
--- a/src/Frontend/src/components/FAIcon.vue
+++ b/src/Frontend/src/components/FAIcon.vue
@@ -13,6 +13,6 @@ withDefaults(
 </script>
 
 <template>
-  <FontAwesomeIcon v-if="title" :icon="icon" :size="size" v-tippy="title" />
-  <FontAwesomeIcon v-else :icon="icon" :size="size" />
+  <FontAwesomeIcon v-if="title" :icon="icon" :size="size" focusable="false" v-tippy="title" />
+  <FontAwesomeIcon v-else :icon="icon" :size="size" focusable="false" />
 </template>
diff --git a/src/Frontend/src/components/dashboard/DashboardMenuItem.vue b/src/Frontend/src/components/dashboard/DashboardMenuItem.vue
index 28d1efdfa9..fe5b21cc5a 100644
--- a/src/Frontend/src/components/dashboard/DashboardMenuItem.vue
+++ b/src/Frontend/src/components/dashboard/DashboardMenuItem.vue
@@ -7,7 +7,7 @@ import FAIcon from "@/components/FAIcon.vue";
 
 <template>
   <RouterLink :to="routeLinks.dashboard">
-    <FAIcon :icon="faGauge" title="Dashboard" />
+    <FAIcon class="dashboard-icon" :icon="faGauge" aria-hidden="true" focusable="false" tabindex="-1" />
     <span class="navbar-label">Dashboard</span>
   </RouterLink>
 </template>
@@ -15,4 +15,8 @@ import FAIcon from "@/components/FAIcon.vue";
 <style scoped>
 @import "@/assets/navbar.css";
 @import "@/assets/header-menu-item.css";
+
+.dashboard-icon {
+  pointer-events: none;
+}
 </style>

From 98152d06294d5f9cb54ebf365bd385aa78297e7d Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 16:16:28 +1000
Subject: [PATCH 58/67] add a greeen icon to "platform up to date"

---
 src/Frontend/src/components/PageFooter.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Frontend/src/components/PageFooter.vue b/src/Frontend/src/components/PageFooter.vue
index 89f11d5a80..649b1b9cfa 100644
--- a/src/Frontend/src/components/PageFooter.vue
+++ b/src/Frontend/src/components/PageFooter.vue
@@ -2,7 +2,7 @@
 import { LicenseStatus } from "@/resources/LicenseInfo";
 import routeLinks from "@/router/routeLinks";
 import FAIcon from "@/components/FAIcon.vue";
-import { faArrowTurnUp, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faArrowTurnUp, faCircleCheck, faPlus } from "@fortawesome/free-solid-svg-icons";
 import usePlatformHealthStoreAutoRefresh from "@/composables/usePlatformHealthStoreAutoRefresh";
 import { storeToRefs } from "pinia";
 import { useConfigurationStore } from "@/stores/ConfigurationStore";
@@ -33,7 +33,7 @@ const { configuration } = storeToRefs(configurationStore);
               <FAIcon class="footer-icon" :icon="faArrowTurnUp" />
               Updates available
             </RouterLink>
-            <span v-else>Platform up to date</span>
+            <span v-else><FAIcon class="footer-icon" :icon="faCircleCheck" /> Platform up to date</span>
           </template>
         </div>
       </div>

From 0b1720b48ef49dcbc78398383692d05cc336f431 Mon Sep 17 00:00:00 2001
From: Rhys Bevilaqua <rhys.bevilaqua@particular.net>
Date: Thu, 3 Sep 2026 14:25:13 +0800
Subject: [PATCH 59/67] Use root instance configuration to get the instance
 name

---
 src/Frontend/src/resources/Configuration.ts   |  1 +
 .../src/stores/PlatformModelStore.spec.ts     | 28 +++++++++++++++++++
 src/Frontend/src/stores/PlatformModelStore.ts | 20 +++++++++----
 .../test/mocks/platform-health-state.ts       |  8 ++++++
 .../platform-health/platform-health.ts        |  9 +++++-
 5 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/Frontend/src/resources/Configuration.ts b/src/Frontend/src/resources/Configuration.ts
index 53b2bacf73..4730396891 100644
--- a/src/Frontend/src/resources/Configuration.ts
+++ b/src/Frontend/src/resources/Configuration.ts
@@ -30,6 +30,7 @@ interface DataRetention {
   error_retention_period: string;
 }
 interface Host {
+  instance_name?: string;
   service_name: string;
   raven_db_path: string;
   logging: Logging;
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 629f9aab9f..a42fe378c2 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -6,12 +6,14 @@ import { RemoteInstanceType } from "@/resources/RemoteInstance";
 const getRoot = vi.fn();
 const getRemoteInstances = vi.fn();
 const getMonitoringRoot = vi.fn();
+const getConfiguration = vi.fn();
 
 vi.mock("@/components/serviceControlClient", () => ({
   default: {
     url: "http://localhost:33333/api/",
     getRoot: (...args: unknown[]) => getRoot(...args),
     getRemoteInstances: (...args: unknown[]) => getRemoteInstances(...args),
+    fetchFromServiceControl: (...args: unknown[]) => getConfiguration(...args),
   },
 }));
 
@@ -29,6 +31,7 @@ describe("PlatformModelStore", () => {
     getRoot.mockReset();
     getRemoteInstances.mockReset();
     getMonitoringRoot.mockReset();
+    getConfiguration.mockReset();
     window.__platformHealth = undefined;
   });
 
@@ -90,6 +93,31 @@ describe("PlatformModelStore", () => {
     expect(store.primary?.version).toBe("6.19.3");
   });
 
+  test("uses host.instance_name from /api/configuration for the primary name", async () => {
+    getRoot.mockResolvedValue(rootResponse({ name: "ServiceControl", health: "healthy", version: "6.19.3" }));
+    getConfiguration.mockResolvedValue({ json: async () => ({ host: { instance_name: "booger" } }) } as never);
+    getRemoteInstances.mockResolvedValue([]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.primary?.name).toBe("booger");
+    expect(store.primary?.health).toBe("healthy");
+  });
+
+  test("falls back to the root document name when configuration has no host.instance_name", async () => {
+    getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.Primary", health: "healthy", version: "6.19.3" }));
+    getConfiguration.mockResolvedValue({ json: async () => ({ host: {} }) } as never);
+    getRemoteInstances.mockResolvedValue([]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.primary?.name).toBe("Particular.ServiceControl.Primary");
+  });
+
   test("uses cached remote instance type when an unavailable remote no longer has configuration", async () => {
     getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.Primary", health: "healthy", version: "6.19.3" }));
     getRemoteInstances.mockResolvedValue([
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index 6b9eee7218..e483007715 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -3,6 +3,7 @@ import { computed, ref } from "vue";
 import serviceControlClient, { type ServiceControlRootDocument } from "@/components/serviceControlClient";
 import monitoringClient, { type MonitoringRoot } from "@/components/monitoring/monitoringClient";
 import { RemoteInstanceType, type RemoteInstance } from "@/resources/RemoteInstance";
+import type Configuration from "@/resources/Configuration";
 import type { PlatformInstance, PlatformModel, ServicePulse } from "@/resources/PlatformModel";
 
 export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
@@ -16,11 +17,11 @@ export const usePlatformModelStore = defineStore("PlatformModelStore", () => {
   const errorInstances = computed(() => remotes.value.filter((instance) => instance.kind === "error"));
 
   async function refresh() {
-    const [primaryRoot, monitoringResponse] = await Promise.all([getPrimaryRoot(), getMonitoringRoot()]);
+    const [primaryRoot, monitoringResponse, configuration] = await Promise.all([getPrimaryRoot(), getMonitoringRoot(), getConfiguration()]);
     const remotesResponse = primaryRoot ? await getRemotes() : [];
 
     model.value = {
-      primary: mapPrimary(primaryRoot),
+      primary: mapPrimary(primaryRoot, configuration),
       remotes: mapRemotes(remotesResponse),
       monitoring: mapMonitoring(monitoringResponse),
       servicePulse: mapServicePulse(),
@@ -61,6 +62,15 @@ async function getRemotes(): Promise<RemoteInstance[]> {
   }
 }
 
+async function getConfiguration(): Promise<Configuration | null> {
+  try {
+    const response = await serviceControlClient.fetchFromServiceControl("configuration");
+    return (await response.json()) as Configuration;
+  } catch {
+    return null;
+  }
+}
+
 async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   if (!monitoringClient.isMonitoringEnabled) {
     return null;
@@ -76,11 +86,11 @@ async function getMonitoringRoot(): Promise<MonitoringRoot | null> {
   }
 }
 
-function mapPrimary(primaryRoot: PrimaryRootResult | null): PlatformInstance {
+function mapPrimary(primaryRoot: PrimaryRootResult | null, configuration: Configuration | null): PlatformInstance {
   if (!primaryRoot) {
     return {
       id: "primary",
-      name: "Particular.ServiceControl",
+      name: configuration?.host?.instance_name ?? "Particular.ServiceControl",
       kind: "error",
       role: "primary-error",
       version: "Unknown",
@@ -93,7 +103,7 @@ function mapPrimary(primaryRoot: PrimaryRootResult | null): PlatformInstance {
 
   return {
     id: "primary",
-    name: document.name,
+    name: configuration?.host?.instance_name ?? document.name,
     kind: "error",
     role: "primary-error",
     version: document.platform_health_version ?? version,
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index b4e7e8cadb..6c2bba7bd8 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -95,6 +95,14 @@ export function getPlatformHealthRemoteInstances(): RemoteInstance[] {
   return toRemoteInstances(state);
 }
 
+export function getPlatformHealthConfiguration() {
+  return {
+    host: {
+      instance_name: state.primary.name,
+    },
+  };
+}
+
 export function getPlatformHealthMonitoringRoot() {
   if (state.monitoring === null) {
     return null;
diff --git a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
index 32755d7899..5780af210d 100644
--- a/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
+++ b/src/Frontend/test/mocks/scenarios/platform-health/platform-health.ts
@@ -1,7 +1,7 @@
 import * as precondition from "../../../preconditions";
 import { ApiRoutes } from "@/composables/apiRoutes";
 import { createScenario } from "../scenario-helper";
-import { getPlatformHealthCustomChecks, getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
+import { getPlatformHealthConfiguration, getPlatformHealthCustomChecks, getPlatformHealthMonitoringRoot, getPlatformHealthPrimaryRoot, getPlatformHealthRemoteInstances, installPlatformHealthDevControls } from "../../platform-health-state";
 
 const { worker, driver, runScenario } = createScenario();
 
@@ -34,6 +34,13 @@ export const setupComplete = (async () => {
 
       return Promise.resolve({ body: getPlatformHealthRemoteInstances() });
     });
+    driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}configuration`, "get", () => {
+      if (primaryUnavailable()) {
+        return Promise.resolve({ body: { detail: "Primary unavailable" }, status: 503 });
+      }
+
+      return Promise.resolve({ body: getPlatformHealthConfiguration() });
+    });
     driver.mockEndpointDynamic(`${window.defaultConfig.service_control_url}customchecks`, "get", (url) => {
       if (primaryUnavailable()) {
         return Promise.resolve({ body: { detail: "Primary unavailable" }, status: 503 });

From bc006a547b8244fe722eea77bca7da5eff269479 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 16:46:14 +1000
Subject: [PATCH 60/67] add more info to instances

---
 src/Frontend/src/resources/PlatformModel.ts   |  6 ++
 .../src/stores/PlatformHealthStore.spec.ts    | 72 +++++++++++++++++++
 .../src/stores/PlatformHealthStore.ts         | 24 +++++++
 .../src/stores/PlatformModelStore.spec.ts     | 42 +++++++++++
 src/Frontend/src/stores/PlatformModelStore.ts |  7 ++
 .../src/views/PlatformHealthView.spec.ts      |  6 +-
 src/Frontend/src/views/PlatformHealthView.vue | 24 ++++---
 .../test/mocks/platform-health-state.ts       |  9 +++
 8 files changed, 178 insertions(+), 12 deletions(-)

diff --git a/src/Frontend/src/resources/PlatformModel.ts b/src/Frontend/src/resources/PlatformModel.ts
index 58ddd95019..b5a8739d83 100644
--- a/src/Frontend/src/resources/PlatformModel.ts
+++ b/src/Frontend/src/resources/PlatformModel.ts
@@ -16,6 +16,12 @@ export interface PlatformInstance {
   version: string;
   health: PlatformInstanceHealth;
   apiUrl: string;
+  transportType?: string;
+  errorLogQueue?: string;
+  errorQueue?: string;
+  forwardErrorMessages?: boolean;
+  errorRetentionPeriod?: string;
+  auditRetentionPeriod?: string;
 }
 
 export interface PlatformModel {
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index c9e13c43b0..b8d751a732 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -33,6 +33,43 @@ describe("PlatformHealthStore", () => {
     customChecksStore.refresh = vi.fn(() => Promise.resolve());
   });
 
+  test("includes transport and retention details in infoDetails when present", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = primaryWithTransportModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    const primaryRow = store.rows[0];
+    expect(primaryRow.infoDetails).toContain("API: http://localhost:33333/api/");
+    expect(primaryRow.infoDetails).toContain("Transport: RabbitMQ.QuorumConventionalRouting");
+    expect(primaryRow.infoDetails).toContain("Error queue: error");
+    expect(primaryRow.infoDetails).toContain("Error log queue: error.log");
+    expect(primaryRow.infoDetails).toContain("Forward error messages: Yes");
+    expect(primaryRow.infoDetails).toContain("Error retention: 14.00:00:00");
+
+    const auditRow = store.rows[1];
+    expect(auditRow.infoDetails).toContain("API: http://Particular.ServiceControl.Audit/api/");
+    expect(auditRow.infoDetails).toContain("Audit retention: 7.00:00:00");
+    expect(auditRow.infoDetails).not.toContain(expect.stringContaining("Transport"));
+  });
+
+  test("omits transport and retention from infoDetails when not present", async () => {
+    const platformModelStore = usePlatformModelStore();
+    platformModelStore.refresh = vi.fn(() => {
+      platformModelStore.model = singleRegionWarningModel;
+      return Promise.resolve();
+    });
+    const store = usePlatformHealthStore();
+
+    await store.refresh();
+
+    expect(store.rows[0].infoDetails).toEqual(["API: http://localhost:33333/api/"]);
+  });
+
   test("derives warning severity and audit-remote rows", async () => {
     const customChecksStore = useCustomChecksStore();
     customChecksStore.replaceFailedChecks([
@@ -459,6 +496,41 @@ describe("PlatformHealthStore", () => {
   });
 });
 
+const primaryWithTransportModel: PlatformModel = {
+  primary: {
+    id: "primary",
+    name: "Particular.ServiceControl",
+    kind: "error",
+    role: "primary-error",
+    version: "6.19.3",
+    health: "healthy",
+    apiUrl: "http://localhost:33333/api/",
+    transportType: "RabbitMQ.QuorumConventionalRouting",
+    errorQueue: "error",
+    errorLogQueue: "error.log",
+    forwardErrorMessages: true,
+    errorRetentionPeriod: "14.00:00:00",
+  },
+  remotes: [
+    {
+      id: "remote-0",
+      name: "Particular.ServiceControl.Audit",
+      kind: "audit",
+      role: "remote-audit",
+      version: "6.19.3",
+      health: "healthy",
+      apiUrl: "http://Particular.ServiceControl.Audit/api/",
+      auditRetentionPeriod: "7.00:00:00",
+    },
+  ],
+  monitoring: null,
+  servicePulse: {
+    name: "ServicePulse",
+    version: "2.8.0",
+    health: "healthy",
+  },
+};
+
 const singleRegionWarningModel: PlatformModel = {
   primary: {
     id: "primary",
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 90e7fc1c10..cd0b929f7c 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -184,6 +184,30 @@ export const usePlatformHealthStore = defineStore("PlatformHealthStore", () => {
 function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: string, healthDetails: string[]): PlatformHealthRow {
   const infoDetails = [`API: ${instance.apiUrl}`];
 
+  if (instance.transportType) {
+    infoDetails.push(`Transport: ${instance.transportType}`);
+  }
+
+  if (instance.errorQueue) {
+    infoDetails.push(`Error queue: ${instance.errorQueue}`);
+  }
+
+  if (instance.errorLogQueue) {
+    infoDetails.push(`Error log queue: ${instance.errorLogQueue}`);
+  }
+
+  if (instance.forwardErrorMessages !== undefined) {
+    infoDetails.push(`Forward error messages: ${instance.forwardErrorMessages ? "Yes" : "No"}`);
+  }
+
+  if (instance.errorRetentionPeriod) {
+    infoDetails.push(`Error retention: ${instance.errorRetentionPeriod}`);
+  }
+
+  if (instance.auditRetentionPeriod) {
+    infoDetails.push(`Audit retention: ${instance.auditRetentionPeriod}`);
+  }
+
   return {
     type: formatRowType(instance),
     name: instance.name,
diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index a42fe378c2..2a1fe4e3cc 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -137,6 +137,48 @@ describe("PlatformModelStore", () => {
     expect(store.remotes[0].role).toBe("remote-error");
   });
 
+  test("maps transport and retention fields from configuration and remotes", async () => {
+    getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl", health: "healthy", version: "6.19.3" }));
+    getConfiguration.mockResolvedValue({
+      json: async () => ({
+        host: { instance_name: "Particular.ServiceControl" },
+        transport: {
+          transport_type: "RabbitMQ.QuorumConventionalRouting",
+          error_log_queue: "error.log",
+          error_queue: "error",
+          forward_error_messages: true,
+        },
+        data_retention: {
+          error_retention_period: "14.00:00:00",
+        },
+      }),
+    } as never);
+    getRemoteInstances.mockResolvedValue([
+      {
+        api_uri: "http://localhost:33334/api/",
+        version: "6.19.3",
+        status: "online",
+        configuration: {
+          host: { instance_name: "Particular.ServiceControl.Audit" },
+          data_retention: { audit_retention_period: "7.00:00:00" },
+        },
+      },
+    ]);
+    getMonitoringRoot.mockResolvedValue(null);
+
+    const store = usePlatformModelStore();
+    await store.refresh();
+
+    expect(store.primary?.transportType).toBe("RabbitMQ.QuorumConventionalRouting");
+    expect(store.primary?.errorQueue).toBe("error");
+    expect(store.primary?.errorLogQueue).toBe("error.log");
+    expect(store.primary?.forwardErrorMessages).toBe(true);
+    expect(store.primary?.errorRetentionPeriod).toBe("14.00:00:00");
+
+    expect(store.remotes[0].auditRetentionPeriod).toBe("7.00:00:00");
+    expect(store.remotes[0].errorRetentionPeriod).toBeUndefined();
+  });
+
   test("skips remote discovery when the primary root is unavailable", async () => {
     getRoot.mockRejectedValue(new Error("primary unavailable"));
     getRemoteInstances.mockResolvedValue([
diff --git a/src/Frontend/src/stores/PlatformModelStore.ts b/src/Frontend/src/stores/PlatformModelStore.ts
index e483007715..8618f38ca7 100644
--- a/src/Frontend/src/stores/PlatformModelStore.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.ts
@@ -109,6 +109,11 @@ function mapPrimary(primaryRoot: PrimaryRootResult | null, configuration: Config
     version: document.platform_health_version ?? version,
     health: document.platform_health_status ?? "healthy",
     apiUrl: serviceControlClient.url ?? "",
+    transportType: configuration?.transport?.transport_type,
+    errorLogQueue: configuration?.transport?.error_log_queue,
+    errorQueue: configuration?.transport?.error_queue,
+    forwardErrorMessages: configuration?.transport?.forward_error_messages,
+    errorRetentionPeriod: configuration?.data_retention?.error_retention_period,
   };
 }
 
@@ -125,6 +130,8 @@ function mapRemotes(remotes: RemoteInstance[]): PlatformInstance[] {
       version: remote.version,
       health: remote.platform_health_status ?? (remote.status === "online" ? "healthy" : "unavailable"),
       apiUrl: remote.api_uri,
+      errorRetentionPeriod: remote.configuration?.data_retention?.error_retention_period,
+      auditRetentionPeriod: remote.configuration?.data_retention?.audit_retention_period,
     };
   });
 }
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index b743927b83..22df0b2c63 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -242,7 +242,7 @@ describe("PlatformHealthView", () => {
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
     const user = userEvent.setup();
     await user.click(screen.getAllByRole("button", { name: /Healthy/i })[0]);
-    expect(screen.getByText("API")).toBeInTheDocument();
+    expect(screen.getByText("API:")).toBeInTheDocument();
     expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
   });
 
@@ -356,7 +356,7 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByText("Health issues")).toBeInTheDocument();
     expect(screen.getByText("Information")).toBeInTheDocument();
-    expect(screen.getAllByText("API").length).toBeGreaterThan(0);
+    expect(screen.getAllByText("API:").length).toBeGreaterThan(0);
     expect(screen.getByText("http://localhost:33334/api/")).toBeInTheDocument();
     expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
     expect(screen.getByText(`Reported at: ${currentReportedAt}`)).toBeInTheDocument();
@@ -405,7 +405,7 @@ describe("PlatformHealthView", () => {
 
     const user = userEvent.setup();
     await user.click(screen.getByRole("button", { name: /Healthy/i }));
-    expect(screen.getByText("API")).toBeInTheDocument();
+    expect(screen.getByText("API:")).toBeInTheDocument();
     expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
 
     rows.mockRestore();
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 867b2de609..d7bb1f77f5 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -78,10 +78,11 @@ function issueEntries(row: (typeof store.rows)[number]) {
 
 function infoEntries(row: (typeof store.rows)[number]) {
   return row.infoDetails.map((detail) => {
-    if (detail.startsWith("API: ")) {
+    const colonIndex = detail.indexOf(": ");
+    if (colonIndex > 0) {
       return {
-        label: "API",
-        value: detail.substring("API: ".length),
+        label: detail.substring(0, colonIndex),
+        value: detail.substring(colonIndex + 2),
       };
     }
 
@@ -196,7 +197,7 @@ function toggleRow(row: (typeof store.rows)[number]) {
                           <table v-if="row.infoDetails.length > 0" class="details-table details-table-info">
                             <tbody>
                               <tr v-for="entry in infoEntries(row)" :key="`${entry.label}-${entry.value}`">
-                                <td class="details-table-key">{{ entry.label }}</td>
+                                <td class="details-table-key">{{ entry.label }}:</td>
                                 <td>{{ entry.value }}</td>
                               </tr>
                             </tbody>
@@ -369,7 +370,11 @@ tbody tr:last-child td {
   font-size: 12px;
 }
 
-.details-card-info .details-table,
+.details-card-info .details-table {
+  margin: 0;
+  padding: 14px 0 16px;
+}
+
 .details-card-info .no-problems {
   margin: 0;
   padding: 14px 16px 16px;
@@ -381,7 +386,7 @@ tbody tr:last-child td {
 }
 
 .details-table td {
-  padding: 0.4rem 0;
+  padding: 0.4rem 16px 0.4rem 0;
   vertical-align: top;
   border-bottom: 1px solid #eef2f2;
 }
@@ -390,11 +395,12 @@ tbody tr:last-child td {
   border-bottom: none;
 }
 
-.details-table-key {
-  width: 112px;
+.details-table td.details-table-key {
+  width: 224px;
   color: #4c5b5c;
   font-weight: 500;
-  text-align: center;
+  text-align: left;
+  padding-left: 16px;
   padding-right: 1rem;
 }
 
diff --git a/src/Frontend/test/mocks/platform-health-state.ts b/src/Frontend/test/mocks/platform-health-state.ts
index 6c2bba7bd8..4bc30f525a 100644
--- a/src/Frontend/test/mocks/platform-health-state.ts
+++ b/src/Frontend/test/mocks/platform-health-state.ts
@@ -100,6 +100,15 @@ export function getPlatformHealthConfiguration() {
     host: {
       instance_name: state.primary.name,
     },
+    transport: {
+      transport_type: "LearningTransport",
+      error_log_queue: "error.log",
+      error_queue: "error",
+      forward_error_messages: false,
+    },
+    data_retention: {
+      error_retention_period: "15.00:00:00",
+    },
   };
 }
 

From 0cf59ae4b28dac483e3367589ab2e4c6658b4a4c Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 16:50:12 +1000
Subject: [PATCH 61/67] update docs pages to match changes

---
 docs/frontend/error-capability-card.md | 15 +++++----------
 docs/frontend/platform-health-page.md  |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/docs/frontend/error-capability-card.md b/docs/frontend/error-capability-card.md
index 1c69871081..adc599387c 100644
--- a/docs/frontend/error-capability-card.md
+++ b/docs/frontend/error-capability-card.md
@@ -29,9 +29,9 @@ For the shared meaning of primary and remote error instance states, use `docs/fr
 
 ### Available Recoverability Scenarios
 
-| Scenario                   | Status    | Badge     | Button               | Description                                 | Indicators                         |
-|----------------------------|-----------|-----------|----------------------|---------------------------------------------|------------------------------------|
-| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." | `FailedMessages`: ✅ |
+| Scenario                   | Status    | Badge     | Button               | Description                                 |
+|----------------------------|-----------|-----------|----------------------|---------------------------------------------|
+| `recoverability-available` | Available | Available | View Failed Messages | "The ServiceControl instance is available." |
 
 ### Testing "Unavailable" State
 
@@ -66,8 +66,7 @@ npx vitest run test/specs/platformcapabilities/recoverability-capability-card.sp
 | Rule                              | Test Case                                                |
 |-----------------------------------|----------------------------------------------------------|
 | ServiceControl instance available | Shows "Available" status + "View Failed Messages" button |
-| Connected primary instance        | Shows a green `FailedMessages` indicator                 |
-| Remote error instances present    | Keeps the `FailedMessages` indicator green               |
+| Degraded primary instance         | Still shows "Available" status while connected           |
 
 **Note:** The "Unavailable" state is not tested because when ServiceControl is unavailable, the entire dashboard is replaced with a connection error view, making the recoverability card inaccessible.
 
@@ -96,14 +95,10 @@ return CapabilityStatus.Available;
 
 ## Status Indicators
 
-The recoverability card shows a single `FailedMessages` indicator whenever the primary ServiceControl instance is available.
+The recoverability card does not display status indicators. Instance-level visibility for ServiceControl lives on the `Platform health` page instead of on the capability card.
 
 A degraded primary instance remains connected for this card. Platform health owns the degraded vs unavailable distinction at the instance level.
 
-- green when failures can be managed from this ServicePulse instance
-
-Instance-level visibility for ServiceControl lives on the `Platform health` page instead of on the capability card.
-
 ## Relationship with Dashboard
 
 The Recoverability capability card is tightly coupled to the main ServiceControl connection:
diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index caa2421441..6b6c5953a1 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -47,7 +47,7 @@ Rows expand from the health badge to show details.
 
 Those details come from:
 
-- informational row context such as the instance API URL
+- informational row context: API URL, transport type, error/audit queue names, forward error messages setting, and error/audit retention periods (when available from instance configuration)
 - matching internal platform custom checks when available
 - fallback page-specific messages when no custom-check detail is available
 
@@ -198,7 +198,7 @@ npx vitest run test/mocks/platform-health-state.spec.ts
 
 | Area | Covered behavior |
 |------|------------------|
-| Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, internal custom-check health inference |
+| Platform health store | warning/danger severity, unavailable audit remotes, remote error instance danger, monitoring presence, version fallback, internal custom-check health inference, transport and retention details in infoDetails |
 | Platform health view | support download gating, known-version-only upgrade cue rendering, plain-text names, API-in-details rendering, monitoring row rendering, always-expandable health badges |
 | Mock helpers | independent topology and custom-check switching |
 

From 50e6cbb96da516c532821f8da9ad46832b2f4392 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 16:55:44 +1000
Subject: [PATCH 62/67] fix

---
 src/Frontend/src/stores/PlatformModelStore.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index 2a1fe4e3cc..ef4278f3dc 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -95,7 +95,7 @@ describe("PlatformModelStore", () => {
 
   test("uses host.instance_name from /api/configuration for the primary name", async () => {
     getRoot.mockResolvedValue(rootResponse({ name: "ServiceControl", health: "healthy", version: "6.19.3" }));
-    getConfiguration.mockResolvedValue({ json: async () => ({ host: { instance_name: "booger" } }) } as never);
+    getConfiguration.mockResolvedValue({ json: () => Promise.resolve({ host: { instance_name: "booger" } }) } as never);
     getRemoteInstances.mockResolvedValue([]);
     getMonitoringRoot.mockResolvedValue(null);
 
@@ -108,7 +108,7 @@ describe("PlatformModelStore", () => {
 
   test("falls back to the root document name when configuration has no host.instance_name", async () => {
     getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl.Primary", health: "healthy", version: "6.19.3" }));
-    getConfiguration.mockResolvedValue({ json: async () => ({ host: {} }) } as never);
+    getConfiguration.mockResolvedValue({ json: () => Promise.resolve({ host: {} }) } as never);
     getRemoteInstances.mockResolvedValue([]);
     getMonitoringRoot.mockResolvedValue(null);
 
@@ -140,7 +140,7 @@ describe("PlatformModelStore", () => {
   test("maps transport and retention fields from configuration and remotes", async () => {
     getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl", health: "healthy", version: "6.19.3" }));
     getConfiguration.mockResolvedValue({
-      json: async () => ({
+      json: () => Promise.resolve({
         host: { instance_name: "Particular.ServiceControl" },
         transport: {
           transport_type: "RabbitMQ.QuorumConventionalRouting",

From 458a9ecffe23f95ab2e6937f6343a5cadf70e214 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 17:01:28 +1000
Subject: [PATCH 63/67] lint fix

---
 .../src/stores/PlatformModelStore.spec.ts     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformModelStore.spec.ts b/src/Frontend/src/stores/PlatformModelStore.spec.ts
index ef4278f3dc..93d92a8502 100644
--- a/src/Frontend/src/stores/PlatformModelStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformModelStore.spec.ts
@@ -140,18 +140,19 @@ describe("PlatformModelStore", () => {
   test("maps transport and retention fields from configuration and remotes", async () => {
     getRoot.mockResolvedValue(rootResponse({ name: "Particular.ServiceControl", health: "healthy", version: "6.19.3" }));
     getConfiguration.mockResolvedValue({
-      json: () => Promise.resolve({
-        host: { instance_name: "Particular.ServiceControl" },
-        transport: {
-          transport_type: "RabbitMQ.QuorumConventionalRouting",
-          error_log_queue: "error.log",
-          error_queue: "error",
-          forward_error_messages: true,
-        },
-        data_retention: {
-          error_retention_period: "14.00:00:00",
-        },
-      }),
+      json: () =>
+        Promise.resolve({
+          host: { instance_name: "Particular.ServiceControl" },
+          transport: {
+            transport_type: "RabbitMQ.QuorumConventionalRouting",
+            error_log_queue: "error.log",
+            error_queue: "error",
+            forward_error_messages: true,
+          },
+          data_retention: {
+            error_retention_period: "14.00:00:00",
+          },
+        }),
     } as never);
     getRemoteInstances.mockResolvedValue([
       {

From 684ba4eb63e0463edf209417c56f41f1483cc7a3 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 17:18:42 +1000
Subject: [PATCH 64/67] display of label

---
 src/Frontend/src/views/PlatformHealthView.spec.ts | 6 +++---
 src/Frontend/src/views/PlatformHealthView.vue     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index 22df0b2c63..b743927b83 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -242,7 +242,7 @@ describe("PlatformHealthView", () => {
     expect(screen.getAllByText("ServicePulse").length).toBeGreaterThan(0);
     const user = userEvent.setup();
     await user.click(screen.getAllByRole("button", { name: /Healthy/i })[0]);
-    expect(screen.getByText("API:")).toBeInTheDocument();
+    expect(screen.getByText("API")).toBeInTheDocument();
     expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
   });
 
@@ -356,7 +356,7 @@ describe("PlatformHealthView", () => {
 
     expect(screen.getByText("Health issues")).toBeInTheDocument();
     expect(screen.getByText("Information")).toBeInTheDocument();
-    expect(screen.getAllByText("API:").length).toBeGreaterThan(0);
+    expect(screen.getAllByText("API").length).toBeGreaterThan(0);
     expect(screen.getByText("http://localhost:33334/api/")).toBeInTheDocument();
     expect(screen.getByText("Audit Message Ingestion: Audit ingestion failed")).toBeInTheDocument();
     expect(screen.getByText(`Reported at: ${currentReportedAt}`)).toBeInTheDocument();
@@ -405,7 +405,7 @@ describe("PlatformHealthView", () => {
 
     const user = userEvent.setup();
     await user.click(screen.getByRole("button", { name: /Healthy/i }));
-    expect(screen.getByText("API:")).toBeInTheDocument();
+    expect(screen.getByText("API")).toBeInTheDocument();
     expect(screen.getByText("http://localhost:33333/api/")).toBeInTheDocument();
 
     rows.mockRestore();
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index d7bb1f77f5..9e5c80e1ee 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -197,7 +197,7 @@ function toggleRow(row: (typeof store.rows)[number]) {
                           <table v-if="row.infoDetails.length > 0" class="details-table details-table-info">
                             <tbody>
                               <tr v-for="entry in infoEntries(row)" :key="`${entry.label}-${entry.value}`">
-                                <td class="details-table-key">{{ entry.label }}:</td>
+                                <td class="details-table-key">{{ entry.label }}</td>
                                 <td>{{ entry.value }}</td>
                               </tr>
                             </tbody>
@@ -398,7 +398,7 @@ tbody tr:last-child td {
 .details-table td.details-table-key {
   width: 224px;
   color: #4c5b5c;
-  font-weight: 500;
+  font-weight: 700;
   text-align: left;
   padding-left: 16px;
   padding-right: 1rem;

From 74331ada1575abc9b773540ab169518c6cb749de Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Thu, 3 Sep 2026 17:22:21 +1000
Subject: [PATCH 65/67] formatting

---
 .../src/stores/PlatformHealthStore.spec.ts    |  4 +--
 .../src/stores/PlatformHealthStore.ts         | 31 +++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index b8d751a732..302aaf30f0 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -49,11 +49,11 @@ describe("PlatformHealthStore", () => {
     expect(primaryRow.infoDetails).toContain("Error queue: error");
     expect(primaryRow.infoDetails).toContain("Error log queue: error.log");
     expect(primaryRow.infoDetails).toContain("Forward error messages: Yes");
-    expect(primaryRow.infoDetails).toContain("Error retention: 14.00:00:00");
+    expect(primaryRow.infoDetails).toContain("Error retention: 14 days");
 
     const auditRow = store.rows[1];
     expect(auditRow.infoDetails).toContain("API: http://Particular.ServiceControl.Audit/api/");
-    expect(auditRow.infoDetails).toContain("Audit retention: 7.00:00:00");
+    expect(auditRow.infoDetails).toContain("Audit retention: 7 days");
     expect(auditRow.infoDetails).not.toContain(expect.stringContaining("Transport"));
   });
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index cd0b929f7c..0238f15d31 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -201,11 +201,11 @@ function toRow(instance: PlatformInstance, latestVersion: string, upgradeLink: s
   }
 
   if (instance.errorRetentionPeriod) {
-    infoDetails.push(`Error retention: ${instance.errorRetentionPeriod}`);
+    infoDetails.push(`Error retention: ${formatTimeSpan(instance.errorRetentionPeriod)}`);
   }
 
   if (instance.auditRetentionPeriod) {
-    infoDetails.push(`Audit retention: ${instance.auditRetentionPeriod}`);
+    infoDetails.push(`Audit retention: ${formatTimeSpan(instance.auditRetentionPeriod)}`);
   }
 
   return {
@@ -375,3 +375,30 @@ function normalizeChecks(checks: CustomCheck[] | unknown) {
 function sameInstanceName(left: string, right: string) {
   return left.localeCompare(right, undefined, { sensitivity: "accent" }) === 0;
 }
+
+function formatTimeSpan(timeSpan: string): string {
+  const match = timeSpan.match(/^(?:(\d+)\.)?(\d{2}):(\d{2}):(\d{2})$/);
+  if (!match) {
+    return timeSpan;
+  }
+
+  const days = parseInt(match[1] ?? "0", 10);
+  const hours = parseInt(match[2], 10);
+  const minutes = parseInt(match[3], 10);
+
+  const parts: string[] = [];
+
+  if (days > 0) {
+    parts.push(`${days} ${days === 1 ? "day" : "days"}`);
+  }
+
+  if (hours > 0) {
+    parts.push(`${hours} ${hours === 1 ? "hour" : "hours"}`);
+  }
+
+  if (minutes > 0) {
+    parts.push(`${minutes} ${minutes === 1 ? "minute" : "minutes"}`);
+  }
+
+  return parts.length > 0 ? parts.join(", ") : "0 days";
+}

From 1e20e9dd9312610472773de30009491f5884661c Mon Sep 17 00:00:00 2001
From: Rhys Bevilaqua <rhys.bevilaqua@particular.net>
Date: Fri, 4 Sep 2026 08:58:04 +0800
Subject: [PATCH 66/67] Add a top margin in the details panel

---
 src/Frontend/src/views/PlatformHealthView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 9e5c80e1ee..923ef53c93 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -476,8 +476,8 @@ tbody tr:last-child td {
   color: #b53a31;
 }
 
-.details-row td {
-  padding-top: 0;
+.details-row > td {
+  padding-top: 1rem;
 }
 
 .details-cell {

From 04bd09b65826b0fcada27a75eebd30f5faea06e6 Mon Sep 17 00:00:00 2001
From: Jo Palac <jo.palac@particular.net>
Date: Fri, 4 Sep 2026 15:23:01 +1000
Subject: [PATCH 67/67] Changed text for SP when nothing to report

---
 docs/frontend/platform-health-page.md               | 2 +-
 src/Frontend/src/stores/PlatformHealthStore.spec.ts | 2 +-
 src/Frontend/src/stores/PlatformHealthStore.ts      | 2 +-
 src/Frontend/src/views/PlatformHealthView.spec.ts   | 4 ++--
 src/Frontend/src/views/PlatformHealthView.vue       | 5 -----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/docs/frontend/platform-health-page.md b/docs/frontend/platform-health-page.md
index 6b6c5953a1..3a3cfba6cc 100644
--- a/docs/frontend/platform-health-page.md
+++ b/docs/frontend/platform-health-page.md
@@ -39,7 +39,7 @@ Each row shows:
 - upgrade cue when a newer version is known
 - no upgrade cue when the page only knows that versions differ but does not know a newer target version
 
-Rows are always expandable via the health badge. Expanded content separates informational details such as `API: <url>` from `healthDetails` such as unavailability or degradation messages. The `ServicePulse` row expands to a neutral `No problems detected.` detail.
+Rows are always expandable via the health badge. Expanded content separates informational details such as `API: <url>` from `healthDetails` such as unavailability or degradation messages.
 
 See `docs/platform-topology.md` for the direct-access rule.
 
diff --git a/src/Frontend/src/stores/PlatformHealthStore.spec.ts b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
index 302aaf30f0..807f3860c4 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.spec.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.spec.ts
@@ -108,7 +108,7 @@ describe("PlatformHealthStore", () => {
     expect(store.rows[4].upgradeAvailable).toBe(true);
     expect(store.rows[4].latestVersion).toBe("2.10.2");
     expect(store.rows[4].infoDetails).toEqual([]);
-    expect(store.rows[4].healthDetails).toEqual(["No problems detected."]);
+    expect(store.rows[4].healthDetails).toEqual([]);
     expect(store.rows[2].healthDetails).toContain(`Reported at: ${currentReportedAt}`);
     expect(store.issueSummary).toContain("1 issue detected");
     expect(store.issueSummary).toContain("degraded Audit instance");
diff --git a/src/Frontend/src/stores/PlatformHealthStore.ts b/src/Frontend/src/stores/PlatformHealthStore.ts
index 0238f15d31..2440242fbb 100644
--- a/src/Frontend/src/stores/PlatformHealthStore.ts
+++ b/src/Frontend/src/stores/PlatformHealthStore.ts
@@ -233,7 +233,7 @@ function toServicePulseRow(servicePulse: ServicePulse, latestVersion: string, up
     latestVersion,
     upgradeLink,
     infoDetails: [],
-    healthDetails: ["No problems detected."],
+    healthDetails: [],
   };
 }
 
diff --git a/src/Frontend/src/views/PlatformHealthView.spec.ts b/src/Frontend/src/views/PlatformHealthView.spec.ts
index b743927b83..8a955e409e 100644
--- a/src/Frontend/src/views/PlatformHealthView.spec.ts
+++ b/src/Frontend/src/views/PlatformHealthView.spec.ts
@@ -483,7 +483,7 @@ describe("PlatformHealthView", () => {
     rows.mockRestore();
   });
 
-  test("shows no problems detected when expanding ServicePulse", async () => {
+  test("shows no additional information when expanding ServicePulse", async () => {
     const platformModelStore = usePlatformModelStore();
     platformModelStore.model = {
       primary: {
@@ -512,7 +512,7 @@ describe("PlatformHealthView", () => {
     expect(servicePulseButton).toBeDefined();
     await user.click(servicePulseButton!);
 
-    expect(screen.getByText("No problems detected.")).toBeInTheDocument();
+    expect(screen.getByText("No additional information.")).toBeInTheDocument();
   });
 
   test("shows the updated primary unavailable wording", async () => {
diff --git a/src/Frontend/src/views/PlatformHealthView.vue b/src/Frontend/src/views/PlatformHealthView.vue
index 923ef53c93..426dd71b67 100644
--- a/src/Frontend/src/views/PlatformHealthView.vue
+++ b/src/Frontend/src/views/PlatformHealthView.vue
@@ -111,10 +111,6 @@ function issuePanelClass(row: (typeof store.rows)[number]) {
   };
 }
 
-function showsNoProblems(row: (typeof store.rows)[number]) {
-  return row.type === "ServicePulse" && row.healthDetails.length === 1 && row.healthDetails[0] === "No problems detected.";
-}
-
 const healthLabel = computed(() => ({
   healthy: "Healthy",
   degraded: "Degraded",
@@ -202,7 +198,6 @@ function toggleRow(row: (typeof store.rows)[number]) {
                               </tr>
                             </tbody>
                           </table>
-                          <p v-else-if="showsNoProblems(row)" class="no-problems">No problems detected.</p>
                           <p v-else class="no-problems no-problems-muted">No additional information.</p>
                         </section>
                       </div>