hardware and monitoring

bundles/hardware/metadata.py

@@ -24,12 +24,12 @@ defaults = {
                         'name_override': "cpu_frequency",
                         'data_format': "influx",
                     }),
-                    repo.libs.hashable.hashable({
+                    # repo.libs.hashable.hashable({
-                        'commands': ["/bin/bash -c 'expr $(cat /sys/class/thermal/thermal_zone0/temp) / 1000'"],
+                    #     'commands': ["/bin/bash -c 'expr $(cat /sys/class/thermal/thermal_zone0/temp) / 1000'"],
-                        'name_override': "cpu_temperature",
+                    #     'name_override': "cpu_temperature",
-                        'data_format': "value",
+                    #     'data_format': "value",
-                        'data_type': "integer",
+                    #     'data_type': "integer",
-                    }),
+                    # }),
                 },
             },
         },

bundles/system/metadata.py

@@ -0,0 +1,5 @@
+defaults = {
+    'system': {
+        'architecture': 'amd64',
+    },
+}

bundles/telegraf/items.py

@@ -2,8 +2,6 @@ import tomlkit
 import json
 from bundlewrap.metadata import MetadataJSONEncoder
 
-arch = node.metadata.get('vm/architecture', 'amd64')
-
 files = {
     '/etc/telegraf/telegraf.conf': {
         'content': tomlkit.dumps(
@@ -19,7 +17,7 @@ files = {
     },
     '/usr/local/share/icinga/plugins/procio': {
         'content_type': 'download',
-        'source': f'https://dl.sublimity.de/telegraf-procio/telegraf-procio-{arch}-latest',
+        'source': f"https://dl.sublimity.de/telegraf-procio/telegraf-procio-{node.metadata.get('system/architecture')}-latest",
         'mode': '0755',
     },
 }

data/grafana/rows/health.py

@@ -20,25 +20,25 @@
         'display_name': '__field.labels.cpu',
         'min': 0,
     },
-    'temperature': {
+    # 'temperature': {
-        'stacked': False,
+    #     'stacked': False,
-        'queries': {
+    #     'queries': {
-            'cpu_temperature': {
+    #         'cpu_temperature': {
-                'filters': {
+    #             'filters': {
-                    '_measurement': 'cpu_temperature',
+    #                 '_measurement': 'cpu_temperature',
-                    '_field': [
+    #                 '_field': [
-                        'value',
+    #                     'value',
-                    ],
+    #                 ],
-                },
+    #             },
-                'function': 'mean',
+    #             'function': 'mean',
-            },
+    #         },
-        },
+    #     },
-        'legend': {
+    #     'legend': {
-            'displayMode': 'hidden',
+    #         'displayMode': 'hidden',
-        },
+    #     },
-        'tooltip': 'multi',
+    #     'tooltip': 'multi',
-        'unit': 'degrees',
+    #     'unit': 'degrees',
-    },
+    # },
     'sensors': {
         'stacked': False,
         'queries': {

data/grafana/rows/proc_io.py

@@ -10,7 +10,7 @@
                     ],
                 },
                 'function': 'derivative',
-                'minimum': 1,
+                'minimum': 1024,
             },
         },
         'unit': 'bytes',

groups/all.py

@@ -1,6 +1,7 @@
 {
     'bundles': [
         'sudo',
+        'system',
         'users',
         'zsh',
     ],