Support hosts with mixed record_ids (#26)

This PR adds a workaround for the issue that different hosts use different record_ids for the same entities. In particular, it adds a new config boolean option disable_record_ids. This settings allows to disable the usage of record_ids, allowing the mixed setups with a trade-off to performance.
metricq · Feb 22, 2024 · d865359 · d865359
1 parent 33b607b
commit d865359
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/metricq_source_ipmi/source/main.py b/metricq_source_ipmi/source/main.py
@@ -127,9 +127,10 @@ async def try_fix_hosts(conf, hosts_to_fix):
         for metric_sufix, metric_data in conf['metrics'].items():
             for sensor in metric_data['sensors']:
                 try:
-                    conf['record_ids'].add(
-                        data[sensor][host]['record_id'],
-                    )
+                    if conf['record_ids'] is not None:
+                        conf['record_ids'].add(
+                            data[sensor][host]['record_id'],
+                        )
                 except KeyError:
                     conf['hosts'][host]['next_try'] = now + \
                         RETRY_INTERVALS[
@@ -302,7 +303,7 @@ async def create_conf_and_metrics(conf_part, default_interval):
         interval = conf_part.get('interval', default_interval)
         new_conf = {
             'metrics': {},
-            'record_ids': set(),
+            'record_ids': None if conf_part.get('disable_record_ids', False) else set(),
             'hosts': {},
             # 'active_hosts' serves for performance.
             # That not always an additional loop has to be made to check who is active.
@@ -364,9 +365,10 @@ async def create_conf_and_metrics(conf_part, default_interval):
             for host, host_name in zip(hosts, host_names):
                 for sensor in new_conf['metrics'][metric_sufix]['sensors']:
                     try:
-                        new_conf['record_ids'].add(
-                            queried_sensor_data[sensor][host]['record_id'],
-                        )
+                        if new_conf['record_ids'] is not None:
+                            new_conf['record_ids'].add(
+                                queried_sensor_data[sensor][host]['record_id'],
+                            )
                     except KeyError:
                         new_conf['hosts'][host]['status'] = Status.ERROR
                         if host in new_conf['active_hosts']:

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     version="0.1",
     author="TU Dresden",
     python_requires=">=3.10",
-    packages=["metricq_source_ipmi.source", "metricq_source_ipmi.plugin_hyc_tenant"],
+    packages=["metricq_source_ipmi.source", "metricq_source_ipmi.plugin_hyc_tenant", "metricq_source_ipmi.plugin_power_supply"],
     scripts=[],
     entry_points="""
       [console_scripts]