well here's some turbo jank that vaguely works

Author: hawkw

Cargo.lock

@@ -17,6 +17,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 slog.workspace = true
+slog-error-chain.workspace = true
 typed-rng.workspace = true
 
 omicron-workspace-hack.workspace = true

nexus/fm/Cargo.toml

@@ -4,6 +4,7 @@
 
 //! Alert messages.
 
+use crate::ereport_analysis::Baseboard;
 use nexus_types::fm::AlertClass;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -16,7 +17,14 @@ pub trait Alert: Serialize + JsonSchema + std::fmt::Debug {
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct VpdIdentity {
-    pub part_number: Option<String>,
-    pub revision: Option<String>,
-    pub serial_number: Option<String>,
+    pub part_number: String,
+    pub revision: String,
+    pub serial_number: String,
+}
+
+impl From<Baseboard> for VpdIdentity {
+    fn from(baseboard: Baseboard) -> Self {
+        let Baseboard { part_number, serial_number, rev } = baseboard;
+        Self { part_number, revision: rev.to_string(), serial_number }
+    }
 }

nexus/fm/src/alert.rs

@@ -5,6 +5,7 @@
 //! Power shelf alerts.
 
 use super::{Alert, VpdIdentity};
+use chrono::{DateTime, Utc};
 use nexus_types::fm::AlertClass;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -15,6 +16,7 @@ pub enum PsuInserted {
     V0 {
         #[serde(flatten)]
         psc_psu: PscPsu,
+        time: DateTime<Utc>,
     },
 }
 
@@ -28,16 +30,17 @@ pub enum PsuRemoved {
     V0 {
         #[serde(flatten)]
         psc_psu: PscPsu,
+        time: DateTime<Utc>,
     },
 }
 
 impl Alert for PsuRemoved {
-    const CLASS: AlertClass = AlertClass::PsuInserted;
+    const CLASS: AlertClass = AlertClass::PsuRemoved;
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct PscPsu {
-    pub psc_id: VpdIdentity,
+    pub psc_id: Option<VpdIdentity>,
     pub psc_slot: u16,
     pub psu_id: PsuIdentity,
     pub psu_slot: Option<u16>,

nexus/fm/src/alert/power_shelf.rs

@@ -120,9 +120,9 @@ impl CaseBuilder {
         rng: rng::CaseBuilderRng,
     ) -> Self {
         let log = log.new(slog::o!(
-            "case_id" => format!("{:?}", case.id),
+            "case_id" => case.id.to_string(),
             "de" => case.de.to_string(),
-            "created_sitrep_id" => format!("{:?}", case.created_sitrep_id),
+            "created_sitrep_id" => case.created_sitrep_id.to_string(),
         ));
         Self { log, case, sitrep_id, rng }
     }
@@ -150,7 +150,7 @@ impl CaseBuilder {
         slog::info!(
             &self.log,
             "requested an alert";
-            "alert_id" => ?id,
+            "alert_id" => %id,
             "alert_class" => ?class,
         );
 
@@ -178,15 +178,15 @@ impl CaseBuilder {
                 slog::info!(
                     self.log,
                     "assigned ereport {} to case", report.id();
-                    "ereport_id" => ?report.id(),
+                    "ereport_id" => %report.id(),
                     "ereport_class" => ?report.class,
                 );
             }
             Err(_) => {
                 slog::warn!(
                     self.log,
                     "ereport {} already assigned to case", report.id();
-                    "ereport_id" => ?report.id(),
+                    "ereport_id" => %report.id(),
                     "ereport_class" => ?report.class,
                 );
             }