chore(bors): merge pull request openebs#708

708: feat(eventing): add node name to nvme path events r=tiagolobocastro a=datacore-vvarakantham Adding node name in the NvmePathFail and NvmePathSuspect events. Co-authored-by: Vandana Varakantham <[email protected]>
dsharma-dc · Jan 8, 2024 · 1aec7c0 · 1aec7c0
2 parents 9d3c484 + aa48fec
commit 1aec7c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/control-plane/agents/src/bin/ha/node/detector.rs b/control-plane/agents/src/bin/ha/node/detector.rs
@@ -393,8 +393,8 @@ impl NvmePathCache {
 
 impl Event for PathRecord {
     fn event(&self, action: EventAction) -> EventMessage {
-        let event_source =
-            EventSource::new("".to_string()).with_nvme_path_data(&self.nqn, &self.path);
+        let event_source = EventSource::new(self.reporter.node_name().to_string())
+            .with_nvme_path_data(&self.nqn, &self.path);
         EventMessage {
             category: EventCategory::NvmePath as i32,
             action: action as i32,

diff --git a/control-plane/agents/src/bin/ha/node/reporter.rs b/control-plane/agents/src/bin/ha/node/reporter.rs
@@ -124,6 +124,11 @@ impl PathReporter {
             self.channel.send(nqn).ok();
         }
     }
+
+    /// Get node name.
+    pub fn node_name(&self) -> &str {
+        &self.node_name
+    }
 }
 
 #[derive(Debug)]

diff --git a/deployer/src/infra/agents/ha/node.rs b/deployer/src/infra/agents/ha/node.rs
@@ -36,6 +36,10 @@ impl ComponentAction for HaNodeAgent {
             let jaeger_config = format!("jaeger.{}:6831", cfg.get_name());
             spec = spec.with_args(vec!["--jaeger", &jaeger_config])
         };
+        if options.eventing {
+            let nats_server_url = "nats://nats:4222";
+            spec = spec.with_args(vec!["--events-url", nats_server_url]);
+        };
 
         Ok(cfg.add_container_spec(spec))
     }