[inventory] Remove HealthMonitor type but keep health check (#9899)

As per #9876, this patch
removes `health_monitor` from the sled agent inventory API and moves
`smf_services_in_maintenance` up one level.

There are still a few discussions going on in #9876, but what is changed
in this PR is not a controversial topic. I'll make further changes once
everything in #9876 has been agreed on.

```console
$ curl -H "api-version: 22.0.0"  http://[::1]:40000/inventory | jq
<...>
"smf_services_in_maintenance": {
    "ok": {
      "services": [
        {
          "fmri": "svc:/site/fake-service2:default",
          "zone": "global"
        },
        {
          "fmri": "svc:/site/fake-service:default",
          "zone": "global"
        }
      ],
      "errors": [],
      "time_of_status": "2026-02-23T06:23:56.683395426Z"
    }
  },
<...>
```

Author: karencfv

nexus/db-queries/src/db/datastore/inventory.rs

@@ -27,6 +27,7 @@ use diesel::sql_types::Nullable;
 use futures::FutureExt;
 use futures::future::BoxFuture;
 use iddqd::{IdOrdItem, IdOrdMap, id_upcast};
+use illumos_utils::svcs::SvcsInMaintenanceResult;
 use nexus_db_errors::ErrorHandler;
 use nexus_db_errors::public_error_from_diesel;
 use nexus_db_errors::public_error_from_diesel_lookup;
@@ -112,7 +113,6 @@ use sled_agent_types::inventory::BootPartitionDetails;
 use sled_agent_types::inventory::ConfigReconcilerInventory;
 use sled_agent_types::inventory::ConfigReconcilerInventoryResult;
 use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
-use sled_agent_types::inventory::HealthMonitorInventory;
 use sled_agent_types::inventory::ManifestNonBootInventory;
 use sled_agent_types::inventory::MupdateOverrideNonBootInventory;
 use sled_agent_types::inventory::OmicronSledConfig;
@@ -4297,7 +4297,7 @@ impl DataStore {
                 file_source_resolver,
                 // TODO-K[omicron#9516]: Actually query the DB when there is
                 // something there
-                health_monitor: HealthMonitorInventory::new(),
+                smf_services_in_maintenance: Ok(SvcsInMaintenanceResult::new()),
                 reference_measurements: last_reconciliation_measurements
                     .remove(&sled_id)
                     .unwrap_or_default(),

nexus/db-queries/src/db/datastore/physical_disk.rs

@@ -340,16 +340,16 @@ mod test {
     use crate::db::pub_test_utils::helpers::SledUpdateBuilder;
     use dropshot::PaginationOrder;
     use iddqd::IdOrdMap;
+    use illumos_utils::svcs::SvcsInMaintenanceResult;
     use nexus_db_lookup::LookupPath;
     use nexus_types::identity::Asset;
     use omicron_common::api::external::ByteCount;
     use omicron_common::disk::{DiskIdentity, DiskVariant};
     use omicron_test_utils::dev;
     use omicron_uuid_kinds::ZpoolUuid;
     use sled_agent_types::inventory::{
-        Baseboard, ConfigReconcilerInventoryStatus, HealthMonitorInventory,
-        Inventory, InventoryDisk, OmicronFileSourceResolverInventory,
-        SledCpuFamily, SledRole,
+        Baseboard, ConfigReconcilerInventoryStatus, Inventory, InventoryDisk,
+        OmicronFileSourceResolverInventory, SledCpuFamily, SledRole,
     };
     use std::num::NonZeroU32;
 
@@ -708,7 +708,9 @@ mod test {
                     last_reconciliation: None,
                     file_source_resolver:
                         OmicronFileSourceResolverInventory::new_fake(),
-                    health_monitor: HealthMonitorInventory::new(),
+                    smf_services_in_maintenance: Ok(
+                        SvcsInMaintenanceResult::new(),
+                    ),
                     reference_measurements: IdOrdMap::new(),
                 },
             )

nexus/inventory/src/builder.rs

@@ -675,7 +675,7 @@ impl CollectionBuilder {
             reconciler_status: inventory.reconciler_status,
             last_reconciliation: inventory.last_reconciliation,
             file_source_resolver: inventory.file_source_resolver,
-            health_monitor: inventory.health_monitor,
+            smf_services_in_maintenance: inventory.smf_services_in_maintenance,
             reference_measurements: inventory.reference_measurements,
         };
 

nexus/inventory/src/examples.rs

@@ -16,6 +16,7 @@ use gateway_client::types::SpComponentCaboose;
 use gateway_client::types::SpState;
 use gateway_types::rot::RotSlot;
 use iddqd::id_ord_map;
+use illumos_utils::svcs::SvcsInMaintenanceResult;
 use nexus_types::inventory::CabooseWhich;
 use nexus_types::inventory::InternalDnsGenerationStatus;
 use nexus_types::inventory::RotPage;
@@ -51,7 +52,6 @@ use sled_agent_types::inventory::BootPartitionDetails;
 use sled_agent_types::inventory::ConfigReconcilerInventory;
 use sled_agent_types::inventory::ConfigReconcilerInventoryResult;
 use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
-use sled_agent_types::inventory::HealthMonitorInventory;
 use sled_agent_types::inventory::HostPhase2DesiredSlots;
 use sled_agent_types::inventory::Inventory;
 use sled_agent_types::inventory::InventoryDataset;
@@ -1090,7 +1090,7 @@ pub fn sled_agent(
         // TODO-K: We'll want to have the functionality to add some services
         // here in a future PR. This will be more useful when we add this
         // information to the DB.
-        health_monitor: HealthMonitorInventory::new(),
+        smf_services_in_maintenance: Ok(SvcsInMaintenanceResult::new()),
         reference_measurements,
     }
 }

nexus/mgs-updates/src/test_util/host_phase_2_test_state.rs

@@ -198,6 +198,7 @@ mod api_impl {
     use dropshot::StreamingBody;
     use dropshot::TypedBody;
     use iddqd::IdOrdMap;
+    use illumos_utils::svcs::SvcsInMaintenanceResult;
     use omicron_common::api::external::Generation;
     use omicron_common::api::internal::nexus::DiskRuntimeState;
     use omicron_common::api::internal::nexus::SledVmmState;
@@ -241,7 +242,6 @@ mod api_impl {
     use sled_agent_types::inventory::BootPartitionDetails;
     use sled_agent_types::inventory::ConfigReconcilerInventory;
     use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
-    use sled_agent_types::inventory::HealthMonitorInventory;
     use sled_agent_types::inventory::HostPhase2DesiredContents;
     use sled_agent_types::inventory::HostPhase2DesiredSlots;
     use sled_agent_types::inventory::Inventory;
@@ -398,7 +398,7 @@ mod api_impl {
                         non_boot_status: IdOrdMap::new(),
                     },
                 },
-                health_monitor: HealthMonitorInventory::new(),
+                smf_services_in_maintenance: Ok(SvcsInMaintenanceResult::new()),
                 reference_measurements: IdOrdMap::new(),
             }))
         }

nexus/reconfigurator/planning/src/mgs_updates/test_helpers.rs

@@ -13,6 +13,7 @@ use gateway_client::types::SpState;
 use gateway_types::rot::RotSlot;
 use iddqd::IdOrdItem;
 use iddqd::IdOrdMap;
+use illumos_utils::svcs::SvcsInMaintenanceResult;
 use nexus_types::deployment::BlueprintArtifactVersion;
 use nexus_types::deployment::BlueprintHostPhase2DesiredContents;
 use nexus_types::deployment::ExpectedVersion;
@@ -39,7 +40,6 @@ use sled_agent_types::inventory::BootPartitionContents;
 use sled_agent_types::inventory::BootPartitionDetails;
 use sled_agent_types::inventory::ConfigReconcilerInventory;
 use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
-use sled_agent_types::inventory::HealthMonitorInventory;
 use sled_agent_types::inventory::HostPhase2DesiredSlots;
 use sled_agent_types::inventory::Inventory;
 use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
@@ -1371,7 +1371,9 @@ impl<'a> TestBoardCollectionBuilder<'a> {
                                 ConfigReconcilerInventoryStatus::NotYetRun,
                             file_source_resolver:
                                 OmicronFileSourceResolverInventory::new_fake(),
-                            health_monitor: HealthMonitorInventory::new(),
+                            smf_services_in_maintenance: Ok(
+                                SvcsInMaintenanceResult::new(),
+                            ),
                             reference_measurements: IdOrdMap::new(),
                         },
                     )

nexus/reconfigurator/planning/src/system.rs

@@ -12,6 +12,7 @@ use clickhouse_admin_types::keeper::ClickhouseKeeperClusterMembership;
 use gateway_client::types::RotState;
 use gateway_client::types::SpComponentCaboose;
 use gateway_client::types::SpState;
+use illumos_utils::svcs::SvcsInMaintenanceResult;
 use indexmap::IndexMap;
 use ipnet::Ipv6Net;
 use ipnet::Ipv6Subnets;
@@ -61,7 +62,6 @@ use omicron_uuid_kinds::ZpoolUuid;
 use sled_agent_types::inventory::Baseboard;
 use sled_agent_types::inventory::ConfigReconcilerInventory;
 use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
-use sled_agent_types::inventory::HealthMonitorInventory;
 use sled_agent_types::inventory::Inventory;
 use sled_agent_types::inventory::InventoryDataset;
 use sled_agent_types::inventory::InventoryDisk;
@@ -1471,7 +1471,7 @@ impl Sled {
                 // XXX: return something more reasonable here?
                 file_source_resolver:
                     OmicronFileSourceResolverInventory::new_fake(),
-                health_monitor: HealthMonitorInventory::new(),
+                smf_services_in_maintenance: Ok(SvcsInMaintenanceResult::new()),
                 reference_measurements: iddqd::IdOrdMap::new(),
             }
         };
@@ -1651,7 +1651,7 @@ impl Sled {
             reconciler_status: inv_sled_agent.reconciler_status.clone(),
             last_reconciliation: inv_sled_agent.last_reconciliation.clone(),
             file_source_resolver: inv_sled_agent.file_source_resolver.clone(),
-            health_monitor: HealthMonitorInventory::new(),
+            smf_services_in_maintenance: Ok(SvcsInMaintenanceResult::new()),
             reference_measurements: inv_sled_agent
                 .reference_measurements
                 .clone(),

nexus/types/src/inventory.rs

@@ -21,6 +21,7 @@ pub use gateway_types::rot::RotSlot;
 use iddqd::IdOrdItem;
 use iddqd::IdOrdMap;
 use iddqd::id_upcast;
+use illumos_utils::svcs::SvcsInMaintenanceResult;
 use omicron_common::api::external::ByteCount;
 pub use omicron_common::api::internal::shared::NetworkInterface;
 pub use omicron_common::api::internal::shared::NetworkInterfaceKind;
@@ -38,7 +39,6 @@ use serde_with::serde_as;
 use sled_agent_types_versions::latest::inventory::ConfigReconcilerInventory;
 use sled_agent_types_versions::latest::inventory::ConfigReconcilerInventoryResult;
 use sled_agent_types_versions::latest::inventory::ConfigReconcilerInventoryStatus;
-use sled_agent_types_versions::latest::inventory::HealthMonitorInventory;
 use sled_agent_types_versions::latest::inventory::InventoryDataset;
 use sled_agent_types_versions::latest::inventory::InventoryDisk;
 use sled_agent_types_versions::latest::inventory::InventoryZpool;
@@ -643,7 +643,7 @@ pub struct SledAgent {
     pub reconciler_status: ConfigReconcilerInventoryStatus,
     pub last_reconciliation: Option<ConfigReconcilerInventory>,
     pub file_source_resolver: OmicronFileSourceResolverInventory,
-    pub health_monitor: HealthMonitorInventory,
+    pub smf_services_in_maintenance: Result<SvcsInMaintenanceResult, String>,
     pub reference_measurements: IdOrdMap<SingleMeasurementInventory>,
 }
 

nexus/types/src/inventory/display.rs

@@ -619,7 +619,7 @@ fn display_sleds(
             reconciler_status,
             last_reconciliation,
             file_source_resolver,
-            health_monitor,
+            smf_services_in_maintenance,
             reference_measurements,
         } = sled;
 
@@ -900,10 +900,10 @@ fn display_sleds(
         // TODO-K[omicron#9516]: This is temporarily hidden until we add the
         // health monitor types to the DB. Once those have been integrated,
         // we'll show health monitor status when everything is healthy as well.
-        if !health_monitor.is_empty() {
+        if !matches!(smf_services_in_maintenance, Ok(svcs) if svcs.is_empty()) {
             writeln!(indented, "HEALTH MONITOR")?;
             let mut indent2 = IndentWriter::new("  ", &mut indented);
-            match &health_monitor.smf_services_in_maintenance {
+            match smf_services_in_maintenance {
                 Ok(svcs) => {
                     if !svcs.is_empty() {
                         if let Some(time_of_status) = &svcs.time_of_status {