[inventory] Add svcs in maintenance to DB

dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout

@@ -1608,6 +1608,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 32d8d836-4d8a-4e54-8fa9-f31d79c42646 (role = Gimlet, serial serial2)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:103::1]:12345
@@ -1744,6 +1747,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 89d02b1b-478c-401a-8e28-7a26f74fa41b (role = Gimlet, serial serial0)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:101::1]:12345
@@ -1973,6 +1979,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 KEEPER MEMBERSHIP
     no membership retrieved
 

dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout

@@ -323,6 +323,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 (role = Gimlet, serial serial0)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:101::1]:12345
@@ -450,6 +453,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled d81c6a84-79b8-4958-ae41-ea46c9b19763 (role = Gimlet, serial serial2)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:103::1]:12345
@@ -566,6 +572,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 KEEPER MEMBERSHIP
     no membership retrieved
 

dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout

@@ -711,6 +711,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 (role = Gimlet, serial serial0)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:101::1]:12345
@@ -886,6 +889,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled d81c6a84-79b8-4958-ae41-ea46c9b19763 (role = Gimlet, serial serial2)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:103::1]:12345
@@ -1061,6 +1067,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 KEEPER MEMBERSHIP
     no membership retrieved
 

dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout

@@ -698,6 +698,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 (role = Gimlet, serial serial0)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:101::1]:12345
@@ -873,6 +876,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled d81c6a84-79b8-4958-ae41-ea46c9b19763 (role = Gimlet, serial serial2)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:103::1]:12345
@@ -1048,6 +1054,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 KEEPER MEMBERSHIP
     no membership retrieved
 

dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout

@@ -682,6 +682,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 (role = Gimlet, serial serial0)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:101::1]:12345
@@ -857,6 +860,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 sled d81c6a84-79b8-4958-ae41-ea46c9b19763 (role = Gimlet, serial serial2)
     found at:    <REDACTED_TIMESTAMP> from fake sled agent
     address:     [fd00:1122:3344:103::1]:12345
@@ -1032,6 +1038,9 @@ LEDGERED SLED CONFIG
         (measurement set is empty)
     reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
 
+HEALTH MONITOR
+    no data on SMF services in maintenance has been collected
+
 KEEPER MEMBERSHIP
     no membership retrieved
 

illumos-utils/src/svcs.rs

@@ -19,7 +19,6 @@ use serde::Deserialize;
 use serde::Serialize;
 use slog::Logger;
 use slog::{error, info};
-use std::fmt::Display;
 #[cfg(target_os = "illumos")]
 use tokio::process::Command;
 
@@ -199,8 +198,8 @@ impl From<String> for SvcState {
 #[serde(rename_all = "snake_case")]
 /// Information about an SMF service that is enabled but not running
 pub struct SvcInMaintenance {
-    fmri: String,
-    zone: String,
+    pub fmri: String,
+    pub zone: String,
 }
 
 impl SvcInMaintenance {
@@ -210,14 +209,6 @@ impl SvcInMaintenance {
     }
 }
 
-impl Display for SvcInMaintenance {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let SvcInMaintenance { fmri, zone } = self;
-
-        writeln!(f, "FMRI: {} zone: {}", fmri, zone)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

nexus/db-model/Cargo.toml

@@ -21,6 +21,7 @@ derive-where.workspace = true
 diesel = { workspace = true, features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 hex.workspace = true
 iddqd.workspace = true
+illumos-utils.workspace = true
 ipnetwork.workspace = true
 itertools.workspace = true
 macaddr.workspace = true

nexus/db-model/src/inventory.rs

@@ -9,6 +9,7 @@ use crate::Generation;
 use crate::PhysicalDiskKind;
 use crate::omicron_zone_config::{self, OmicronZoneNic};
 use crate::sled_cpu_family::SledCpuFamily;
+use crate::to_db_typed_uuid;
 use crate::typed_uuid::DbTypedUuid;
 use crate::{
     ByteCount, MacAddr, Name, ServiceKind, SqlU8, SqlU16, SqlU32,
@@ -27,12 +28,16 @@ use diesel::pg::Pg;
 use diesel::serialize::ToSql;
 use diesel::{serialize, sql_types};
 use iddqd::IdOrdMap;
+use illumos_utils::svcs::SvcInMaintenance;
 use ipnetwork::IpNetwork;
 use nexus_db_schema::schema::inv_zone_manifest_non_boot;
 use nexus_db_schema::schema::inv_zone_manifest_zone;
 use nexus_db_schema::schema::{
     hw_baseboard_id, inv_caboose, inv_clickhouse_keeper_membership,
     inv_cockroachdb_status, inv_collection, inv_collection_error, inv_dataset,
+    inv_health_monitor_svc_in_maintenance,
+    inv_health_monitor_svc_in_maintenance_error,
+    inv_health_monitor_svc_in_maintenance_service,
     inv_host_phase_1_active_slot, inv_host_phase_1_flash_hash,
     inv_internal_dns, inv_last_reconciliation_dataset_result,
     inv_last_reconciliation_disk_result, inv_last_reconciliation_measurements,
@@ -63,6 +68,7 @@ use omicron_common::update::OmicronInstallManifestSource;
 use omicron_common::zpool_name::ZpoolName;
 use omicron_uuid_kinds::DatasetKind;
 use omicron_uuid_kinds::DatasetUuid;
+use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::InternalZpoolKind;
 use omicron_uuid_kinds::MupdateKind;
 use omicron_uuid_kinds::MupdateOverrideKind;
@@ -72,6 +78,8 @@ use omicron_uuid_kinds::OmicronSledConfigUuid;
 use omicron_uuid_kinds::PhysicalDiskUuid;
 use omicron_uuid_kinds::SledKind;
 use omicron_uuid_kinds::SledUuid;
+use omicron_uuid_kinds::SvcInMaintenanceKind;
+use omicron_uuid_kinds::SvcInMaintenanceUuid;
 use omicron_uuid_kinds::ZpoolKind;
 use omicron_uuid_kinds::{CollectionKind, OmicronZoneKind};
 use omicron_uuid_kinds::{CollectionUuid, OmicronZoneUuid};
@@ -1016,6 +1024,103 @@ impl_enum_type!(
     Idle => b"idle"
 );
 
+#[derive(Queryable, Clone, Debug, Selectable, Insertable)]
+#[diesel(table_name = inv_health_monitor_svc_in_maintenance)]
+pub struct InvSvcInMaintenance {
+    pub inv_collection_id: DbTypedUuid<CollectionKind>,
+    pub sled_id: DbTypedUuid<SledKind>,
+    pub id: DbTypedUuid<SvcInMaintenanceKind>,
+    pub svcs_cmd_error: Option<String>,
+    // TODO-K: This might change to not nullable with omicron#9615
+    pub time_of_status: Option<DateTime<Utc>>,
+}
+
+impl InvSvcInMaintenance {
+    pub fn new(
+        inv_collection_id: CollectionUuid,
+        sled_id: SledUuid,
+        svcs_cmd_error: Option<String>,
+        time_of_status: Option<DateTime<Utc>>,
+    ) -> Self {
+        // This ID is only used as a primary key, it's fine to generate it here.
+        let id = to_db_typed_uuid(SvcInMaintenanceUuid::from_untyped_uuid(
+            Uuid::new_v4(),
+        ));
+
+        Self {
+            inv_collection_id: inv_collection_id.into(),
+            sled_id: sled_id.into(),
+            id,
+            svcs_cmd_error,
+            time_of_status,
+        }
+    }
+}
+
+#[derive(Queryable, Clone, Debug, Selectable, Insertable)]
+#[diesel(table_name = inv_health_monitor_svc_in_maintenance_service)]
+pub struct InvSvcInMaintenanceService {
+    pub inv_collection_id: DbTypedUuid<CollectionKind>,
+    pub sled_id: DbTypedUuid<SledKind>,
+    // TODO-K: Change the UUID kind?
+    pub id: DbTypedUuid<SvcInMaintenanceKind>,
+    pub fmri: String,
+    pub zone: String,
+}
+
+impl InvSvcInMaintenanceService {
+    pub fn new(
+        inv_collection_id: CollectionUuid,
+        sled_id: SledUuid,
+        svc: SvcInMaintenance,
+    ) -> Self {
+        let SvcInMaintenance { fmri, zone } = svc;
+
+        // This ID is only used as a primary key, it's fine to generate it here.
+        let id = to_db_typed_uuid(SvcInMaintenanceUuid::from_untyped_uuid(
+            Uuid::new_v4(),
+        ));
+
+        Self {
+            inv_collection_id: inv_collection_id.into(),
+            sled_id: sled_id.into(),
+            id,
+            fmri,
+            zone,
+        }
+    }
+}
+
+#[derive(Queryable, Clone, Debug, Selectable, Insertable)]
+#[diesel(table_name = inv_health_monitor_svc_in_maintenance_error)]
+pub struct InvSvcInMaintenanceError {
+    pub inv_collection_id: DbTypedUuid<CollectionKind>,
+    pub sled_id: DbTypedUuid<SledKind>,
+    // TODO-K: Change the UUID kind?
+    pub id: DbTypedUuid<SvcInMaintenanceKind>,
+    pub error_message: String,
+}
+
+impl InvSvcInMaintenanceError {
+    pub fn new(
+        inv_collection_id: CollectionUuid,
+        sled_id: SledUuid,
+        error_message: String,
+    ) -> Self {
+        // This ID is only used as a primary key, it's fine to generate it here.
+        let id = to_db_typed_uuid(SvcInMaintenanceUuid::from_untyped_uuid(
+            Uuid::new_v4(),
+        ));
+
+        Self {
+            inv_collection_id: inv_collection_id.into(),
+            sled_id: sled_id.into(),
+            id,
+            error_message,
+        }
+    }
+}
+
 /// See [`sled_agent_types::inventory::ConfigReconcilerInventory`].
 #[derive(Queryable, Clone, Debug, Selectable, Insertable)]
 #[diesel(table_name = inv_sled_config_reconciler)]

nexus/db-model/src/schema_versions.rs

@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-pub const SCHEMA_VERSION: Version = Version::new(222, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(223, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
+        KnownVersion::new(223, "health-monitor-svcs-in-maintenance"),
         KnownVersion::new(222, "audit-log-credential-id"),
         KnownVersion::new(221, "audit-log-auth-method-enum"),
         KnownVersion::new(220, "multicast-implicit-lifecycle"),