Change template status as labels in pve_guest_info

prometheus-pve · Jan 3, 2024 · 17c9577 · 17c9577
1 parent 6c0fae5
commit 17c9577
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,3 @@
+PVE_USER=prometheus@pve
+PVE_TOKEN_NAME=prompve-scraper
+PVE_TOKEN_VALUE=d0ba3361-daa3-4f88-aa91-747c0f8f626a
diff --git a/src/pve_exporter/collector/cluster.py b/src/pve_exporter/collector/cluster.py
@@ -203,17 +203,13 @@ def collect(self):  # pylint: disable=missing-docstring
                 'pve_storage_shared',
                 'Whether or not the storage is shared among cluster nodes',
                 labels=['id']),
-            'template': GaugeMetricFamily(
-                'pve_template',
-                'Whether or not the VM/CT is template',
-                labels=['id']),
         }
 
         info_metrics = {
             'guest': GaugeMetricFamily(
                 'pve_guest_info',
                 'VM/CT info',
-                labels=['id', 'node', 'name', 'type']),
+                labels=['id', 'node', 'name', 'type', 'template']),
             'storage': GaugeMetricFamily(
                 'pve_storage_info',
                 'Storage info',
@@ -222,11 +218,11 @@ def collect(self):  # pylint: disable=missing-docstring
 
         info_lookup = {
             'lxc': {
-                'labels': ['id', 'node', 'name', 'type'],
+                'labels': ['id', 'node', 'name', 'type', 'template'],
                 'gauge': info_metrics['guest'],
             },
             'qemu': {
-                'labels': ['id', 'node', 'name', 'type'],
+                'labels': ['id', 'node', 'name', 'type', 'template'],
                 'gauge': info_metrics['guest'],
             },
             'storage': {
@@ -239,7 +235,7 @@ def collect(self):  # pylint: disable=missing-docstring
             restype = resource['type']
 
             if restype in info_lookup:
-                label_values = [resource.get(key, '') for key in info_lookup[restype]['labels']]
+                label_values = [str(resource.get(key, '')) for key in info_lookup[restype]['labels']]
                 info_lookup[restype]['gauge'].add_metric(label_values, 1)
 
             label_values = [resource['id']]