feat: add supervisor_id property and include supervisor_id in PC metr…

…ics message
ENRG-tr · Dec 27, 2024 · 008a3d9 · 008a3d9
1 parent 01301a8
commit 008a3d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/enrgdaq/daq/base.py b/src/enrgdaq/daq/base.py
@@ -189,6 +189,10 @@ def __del__(self):
         self._logger.info("DAQ job is being deleted")
         self._has_been_freed = True
 
+    @property
+    def supervisor_id(self):
+        return self.info.supervisor_config.supervisor_id
+
     def free(self):
         if self._has_been_freed:
             return

diff --git a/src/enrgdaq/daq/jobs/pc_metrics.py b/src/enrgdaq/daq/jobs/pc_metrics.py
@@ -65,6 +65,7 @@ def _poll_metrics(self):
         if PCMetric.DISK in self.config.metrics_to_store:
             data[PCMetric.DISK] = psutil.disk_usage("/").percent
 
+        data = {k.value: v for k, v in data.items()}
         self._send_store_message(data)
 
     def _send_store_message(self, data: dict):
@@ -73,6 +74,7 @@ def _send_store_message(self, data: dict):
         self._put_message_out(
             DAQJobMessageStoreTabular(
                 store_config=self.config.store_config,
+                tag=self._supervisor_config.supervisor_id,
                 keys=keys,
                 data=[values],
             )