diff --git a/bundles/hardware/metadata.py b/bundles/hardware/metadata.py index d4a9887..63d6436 100644 --- a/bundles/hardware/metadata.py +++ b/bundles/hardware/metadata.py @@ -24,12 +24,12 @@ defaults = { 'name_override': "cpu_frequency", 'data_format': "influx", }), - repo.libs.hashable.hashable({ - 'commands': ["/bin/bash -c 'expr $(cat /sys/class/thermal/thermal_zone0/temp) / 1000'"], - 'name_override': "cpu_temperature", - 'data_format': "value", - 'data_type': "integer", - }), + # repo.libs.hashable.hashable({ + # 'commands': ["/bin/bash -c 'expr $(cat /sys/class/thermal/thermal_zone0/temp) / 1000'"], + # 'name_override': "cpu_temperature", + # 'data_format': "value", + # 'data_type': "integer", + # }), }, }, }, diff --git a/bundles/system/metadata.py b/bundles/system/metadata.py new file mode 100644 index 0000000..f467926 --- /dev/null +++ b/bundles/system/metadata.py @@ -0,0 +1,5 @@ +defaults = { + 'system': { + 'architecture': 'amd64', + }, +} diff --git a/bundles/telegraf/items.py b/bundles/telegraf/items.py index 05c8614..3088ff6 100644 --- a/bundles/telegraf/items.py +++ b/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', }, } diff --git a/data/grafana/rows/health.py b/data/grafana/rows/health.py index 81953d5..101ed9b 100644 --- a/data/grafana/rows/health.py +++ b/data/grafana/rows/health.py @@ -20,25 +20,25 @@ 'display_name': '__field.labels.cpu', 'min': 0, }, - 'temperature': { - 'stacked': False, - 'queries': { - 'cpu_temperature': { - 'filters': { - '_measurement': 'cpu_temperature', - '_field': [ - 'value', - ], - }, - 'function': 'mean', - }, - }, - 'legend': { - 'displayMode': 'hidden', - }, - 'tooltip': 'multi', - 'unit': 'degrees', - }, + # 'temperature': { + # 'stacked': False, + # 'queries': { + # 'cpu_temperature': { + # 'filters': { + # '_measurement': 'cpu_temperature', + # '_field': [ + # 'value', + # ], + # }, + # 'function': 'mean', + # }, + # }, + # 'legend': { + # 'displayMode': 'hidden', + # }, + # 'tooltip': 'multi', + # 'unit': 'degrees', + # }, 'sensors': { 'stacked': False, 'queries': { diff --git a/data/grafana/rows/proc_io.py b/data/grafana/rows/proc_io.py index 5be5fc7..44c799d 100644 --- a/data/grafana/rows/proc_io.py +++ b/data/grafana/rows/proc_io.py @@ -10,7 +10,7 @@ ], }, 'function': 'derivative', - 'minimum': 1, + 'minimum': 1024, }, }, 'unit': 'bytes', diff --git a/groups/all.py b/groups/all.py index 89a8eda..a0ff062 100644 --- a/groups/all.py +++ b/groups/all.py @@ -1,6 +1,7 @@ { 'bundles': [ 'sudo', + 'system', 'users', 'zsh', ],