[wip] rectifier? i hardly knew 'er

nexus/db-model/src/alert_class.rs

@@ -29,6 +29,8 @@ impl_enum_type!(
     TestFooBaz => b"test.foo.baz"
     TestQuuxBar => b"test.quux.bar"
     TestQuuxBarBaz => b"test.quux.bar.baz"
+    PsuInserted => b"hardware.power_shelf.psu.insert"
+    PsuRemoved => b"hardware.power_shelf.psu.remove"
 );
 
 impl AlertClass {
@@ -62,6 +64,8 @@ impl From<nexus_types::alert::AlertClass> for AlertClass {
             In::TestFooBaz => Self::TestFooBaz,
             In::TestQuuxBar => Self::TestQuuxBar,
             In::TestQuuxBarBaz => Self::TestQuuxBarBaz,
+            In::PsuInserted => Self::PsuInserted,
+            In::PsuRemoved => Self::PsuRemoved,
         }
     }
 }
@@ -75,6 +79,8 @@ impl From<AlertClass> for nexus_types::alert::AlertClass {
             AlertClass::TestFooBaz => Self::TestFooBaz,
             AlertClass::TestQuuxBar => Self::TestQuuxBar,
             AlertClass::TestQuuxBarBaz => Self::TestQuuxBarBaz,
+            AlertClass::PsuInserted => Self::PsuInserted,
+            AlertClass::PsuRemoved => Self::PsuRemoved,
         }
     }
 }

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(272, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(273, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ pub 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(273, "psu-presence-alert-classes"),
         KnownVersion::new(272, "ereporter-restart-order-v2"),
         KnownVersion::new(271, "inv-fmd"),
         KnownVersion::new(270, "fm-alert-resource-deletion"),

nexus/fm/Cargo.toml

@@ -29,6 +29,7 @@ pq-sys = "*"
 rand.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+strum.workspace = true
 slog.workspace = true
 slog-error-chain.workspace = true
 thiserror.workspace = true

nexus/fm/src/analysis_input.rs

@@ -41,7 +41,7 @@ pub struct Input {
     inv: Arc<inventory::Collection>,
     /// Ereports which are new and should be input to analysis in the next
     /// sitrep.
-    new_ereports: IdOrdMap<fm::Ereport>,
+    new_ereports: IdOrdMap<Arc<fm::Ereport>>,
     open_cases: IdOrdMap<fm::Case>,
     closed_cases_copied_forward: IdOrdMap<fm::Case>,
     ereporter_restarts: IdOrdMap<EreporterRestart>,
@@ -63,7 +63,7 @@ impl Input {
         &self.inv
     }
 
-    pub fn new_ereports(&self) -> &IdOrdMap<fm::Ereport> {
+    pub fn new_ereports(&self) -> &IdOrdMap<Arc<fm::Ereport>> {
         &self.new_ereports
     }
 
@@ -151,7 +151,7 @@ pub struct Builder {
     in_service_disks: Arc<IdOrdMap<InServiceDisk>>,
     /// Ereports which are new and should be input to analysis in the next
     /// sitrep.
-    new_ereports: IdOrdMap<fm::Ereport>,
+    new_ereports: IdOrdMap<Arc<fm::Ereport>>,
 
     /// The IDs of any ereports which have been included in the parent sitrep,
     /// but which have *not* yet been marked as seen in the database.
@@ -196,7 +196,7 @@ impl Builder {
                 }
             }
 
-            Some(ereport)
+            Some(Arc::new(ereport))
         }))
     }
 

nexus/fm/src/diagnosis/mod.rs

@@ -7,12 +7,12 @@
 //! Each submodule defines one diagnosis engine (DE). `analyze` dispatches to
 //! each engine in turn; engines are deterministic and idempotent per RFD 603.
 
-use crate::SitrepBuilder;
-
 mod physical_disk;
+mod power_shelf;
 
 pub fn analyze(builder: &mut SitrepBuilder<'_>) -> anyhow::Result<()> {
     physical_disk::analyze(builder)?;
+    power_shelf::analyze(builder)?;
     Ok(())
 }
 
@@ -33,5 +33,5 @@ pub fn analyze(builder: &mut SitrepBuilder<'_>) -> anyhow::Result<()> {
 /// (`class LIKE 'ereport.cpu.amd.%'`) or a `known_ereport_class` lookup
 /// table joined into the query. Revisit this if the list grows that large.
 pub fn known_ereport_classes() -> &'static [&'static str] {
-    &[]
+    &[power_shelf::PSU_INSERT_EREPORT, power_shelf::PSU_REMOVE_EREPORT]
 }