Tolerate newer metrics yaml file

Signed-off-by: Andreas Maier <[email protected]>
zhmcclient · Nov 9, 2023 · 9a235da · 9a235da
1 parent eb8f87d
commit 9a235da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -32,6 +32,10 @@ Released: not yet
 
 **Enhancements:**
 
+* Tolerated when unknown 'resource' types are specified in the metrics.yaml
+  file, because one possible reason for that is that a newer metrics.yaml file
+  is being used. (issue #379)
+
 **Cleanup:**
 
 **Known issues:**

diff --git a/zhmc_prometheus_exporter/zhmc_prometheus_exporter.py b/zhmc_prometheus_exporter/zhmc_prometheus_exporter.py
@@ -673,12 +673,11 @@ def create_metrics_context(session, yaml_metric_groups, hmc_version):
                         continue  # skip this LPAR
                     resources[metric_group].append(lpar)
         else:
-            new_exc = ImproperExit(
-                "Invalid 'resource' item in resource metric group {} in "
-                "metrics file: {}".
-                format(metric_group, resource_path))
-            new_exc.__cause__ = None  # pylint: disable=invalid-name
-            raise new_exc
+            logprint(logging.ERROR, PRINT_ALWAYS,
+                     "Ignoring invalid 'resource' item {rp!r} in resource "
+                     "metric group {mg!r} in metrics file (Is the metrics file "
+                     "newer than the exporter program?)".
+                     format(rp=resource_path, mg=metric_group))
 
     return context, resources