From 3b3bdeecab7d9c464304771de4f6c2676cb2f4e2 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 19 May 2021 18:46:22 +0200 Subject: [PATCH] bundles/pacman: add lm_sensors to telegraf, add dashboard row --- bundles/grafana/dashboard-rows/sensors.py | 226 ++++++++++++++++++++++ bundles/grafana/items.py | 9 +- bundles/pacman/items.py | 1 + bundles/pacman/metadata.py | 11 ++ 4 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 bundles/grafana/dashboard-rows/sensors.py create mode 100644 bundles/pacman/metadata.py diff --git a/bundles/grafana/dashboard-rows/sensors.py b/bundles/grafana/dashboard-rows/sensors.py new file mode 100644 index 0000000..24186c2 --- /dev/null +++ b/bundles/grafana/dashboard-rows/sensors.py @@ -0,0 +1,226 @@ +def dashboard_row_sensors(panel_id, node): + return { + 'title': 'sensors', + 'collapse': False, + 'editable': False, + 'height': '200px', + 'panels': [ + { + 'aliasColors': {}, + 'bars': False, + 'dashLength': 10, + 'dashes': False, + 'datasource': None, + 'fieldConfig': { + 'defaults': { + 'displayName': '${__field.labels.feature}' + }, + 'overrides': [] + }, + 'fill': 1, + 'fillGradient': 0, + 'hiddenSeries': False, + 'id': next(panel_id), + 'legend': { + 'alignAsTable': False, + 'avg': False, + 'current': False, + 'max': False, + 'min': False, + 'rightSide': False, + 'show': True, + 'total': False, + 'values': False + }, + 'lines': True, + 'linewidth': 1, + 'NonePointMode': 'None', + 'options': { + 'alertThreshold': True + }, + 'percentage': False, + 'pluginVersion': '7.5.5', + 'pointradius': 2, + 'points': False, + 'renderer': 'flot', + 'seriesOverrides': [], + 'spaceLength': 10, + 'span': 8, + 'stack': False, + 'steppedLine': False, + 'targets': [ + { + 'groupBy': [ + {'type': 'time', 'params': ['$__interval']}, + {'type': 'fill', 'params': ['linear']}, + ], + 'orderByTime': "ASC", + 'policy': "default", + 'query': f"""from(bucket: "telegraf") + |> range(start: v.timeRangeStart, stop: v.timeRangeStop) + |> filter(fn: (r) => + r["_measurement"] == "sensors" and + r["chip"] == "coretemp-isa-0000" and + r["_field"] == "temp_input" and + r["host"] == "{node.name}" + ) + |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false) + |> derivative(unit: 1s) + |> yield(name: "in")""", + 'resultFormat': 'time_series', + 'select': [[ + {'type': 'field', 'params': ['value']}, + {'type': 'mean', 'params': []}, + ]], + "tags": [] + }, + ], + 'thresholds': [], + 'timeRegions': [], + 'title': 'CPU Temperature', + 'tooltip': { + 'shared': True, + 'sort': 0, + 'value_type': 'individual' + }, + 'type': 'graph', + 'xaxis': { + 'buckets': None, + 'mode': 'time', + 'name': None, + 'show': True, + 'values': [] + }, + 'yaxes': [ + { + 'format': 'celsius', + 'label': None, + 'logBase': 1, + 'max': None, + 'min': 0, + 'show': True, + }, + { + 'format': 'short', + 'label': None, + 'logBase': 1, + 'max': None, + 'min': None, + 'show': False, + } + ], + 'yaxis': { + 'align': False, + 'alignLevel': None + } + }, + { + 'aliasColors': {}, + 'bars': False, + 'dashLength': 10, + 'dashes': False, + 'datasource': None, + 'fieldConfig': { + 'defaults': { + 'displayName': '${__field.labels.feature}' + }, + 'overrides': [] + }, + 'fill': 1, + 'fillGradient': 0, + 'hiddenSeries': False, + 'id': next(panel_id), + 'legend': { + 'alignAsTable': False, + 'avg': False, + 'current': False, + 'max': False, + 'min': False, + 'rightSide': False, + 'show': True, + 'total': False, + 'values': False + }, + 'lines': True, + 'linewidth': 1, + 'NonePointMode': 'None', + 'options': { + 'alertThreshold': True + }, + 'percentage': False, + 'pluginVersion': '7.5.5', + 'pointradius': 2, + 'points': False, + 'renderer': 'flot', + 'seriesOverrides': [], + 'spaceLength': 10, + 'span': 4, + 'stack': False, + 'steppedLine': False, + 'targets': [ + { + 'groupBy': [ + {'type': 'time', 'params': ['$__interval']}, + {'type': 'fill', 'params': ['linear']}, + ], + 'orderByTime': "ASC", + 'policy': "default", + 'query': f"""from(bucket: "telegraf") + |> range(start: v.timeRangeStart, stop: v.timeRangeStop) + |> filter(fn: (r) => + r["_measurement"] == "sensors" and + r["_field"] == "fan_input" and + r["host"] == "{node.name}" + ) + |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false) + |> derivative(unit: 1s) + |> yield(name: "in")""", + 'resultFormat': 'time_series', + 'select': [[ + {'type': 'field', 'params': ['value']}, + {'type': 'mean', 'params': []}, + ]], + "tags": [] + }, + ], + 'thresholds': [], + 'timeRegions': [], + 'title': 'Fan speed', + 'tooltip': { + 'shared': True, + 'sort': 0, + 'value_type': 'individual' + }, + 'type': 'graph', + 'xaxis': { + 'buckets': None, + 'mode': 'time', + 'name': None, + 'show': True, + 'values': [] + }, + 'yaxes': [ + { + 'format': 'rotrpm', + 'label': None, + 'logBase': 1, + 'max': None, + 'min': 0, + 'show': True, + }, + { + 'format': 'short', + 'label': None, + 'logBase': 1, + 'max': None, + 'min': None, + 'show': False, + } + ], + 'yaxis': { + 'align': False, + 'alignLevel': None + } + }, + ], + } diff --git a/bundles/grafana/items.py b/bundles/grafana/items.py index 6857627..ed98eb3 100644 --- a/bundles/grafana/items.py +++ b/bundles/grafana/items.py @@ -98,11 +98,16 @@ for rnode in repo.nodes: dashboard_row_cpu(panel_id, rnode), dashboard_row_ip_traffic(panel_id, rnode), dashboard_row_memory(panel_id, rnode), - dashboard_row_disk_space(panel_id, rnode), - dashboard_row_disk_iops(panel_id, rnode), ], } + if rnode.has_bundle('pacman'): + dashboard['rows'].append(dashboard_row_sensors(panel_id, rnode)) + dashboard['tags'].add('lm_sensors') + + dashboard['rows'].append(dashboard_row_disk_space(panel_id, rnode)) + dashboard['rows'].append(dashboard_row_disk_iops(panel_id, rnode)) + if rnode.has_bundle('nginx'): dashboard['rows'].append(dashboard_row_nginx(panel_id, rnode)) dashboard['tags'].add('nginx') diff --git a/bundles/pacman/items.py b/bundles/pacman/items.py index 24c98f0..9afd850 100644 --- a/bundles/pacman/items.py +++ b/bundles/pacman/items.py @@ -16,6 +16,7 @@ pkg_pacman = { 'vim': {}, 'wpa_supplicant': {}, 'wpa_actiond': {}, + 'lm_sensors': {}, } for pkg, config in node.metadata.get('pacman/packages', {}).items(): diff --git a/bundles/pacman/metadata.py b/bundles/pacman/metadata.py new file mode 100644 index 0000000..f69d895 --- /dev/null +++ b/bundles/pacman/metadata.py @@ -0,0 +1,11 @@ +defaults = { + 'telegraf': { + 'input_plugins': { + 'builtin': { + 'sensors': [{ + 'timeout': '2s', + }], + }, + }, + }, +}