diff --git a/grafana-central/dashboards/Station/lcu.json b/grafana-central/dashboards/Station/lcu.json
index 2c0fa4778a03fcc4f4a306ad21fb90a12898e8aa..f6c6a688d9f441e00eac4b39108620e7fa0ef57f 100644
--- a/grafana-central/dashboards/Station/lcu.json
+++ b/grafana-central/dashboards/Station/lcu.json
@@ -24,8 +24,8 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 6,
- "iteration": 1655474443382,
+ "id": 21,
+ "iteration": 1655716827719,
"links": [
{
"asDropdown": true,
@@ -815,160 +815,355 @@
"type": "gauge"
},
{
- "datasource": {
- "type": "prometheus",
- "uid": "prometheus"
+ "collapsed": true,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 19
},
- "description": "",
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "custom": {
- "axisLabel": "",
- "axisPlacement": "auto",
- "barAlignment": 0,
- "drawStyle": "line",
- "fillOpacity": 0,
- "gradientMode": "none",
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "lineInterpolation": "linear",
- "lineWidth": 1,
- "pointSize": 5,
- "scaleDistribution": {
- "type": "linear"
- },
- "showPoints": "auto",
- "spanNulls": false,
- "stacking": {
- "group": "A",
- "mode": "none"
- },
- "thresholdsStyle": {
- "mode": "line"
- }
+ "id": 82,
+ "panels": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
},
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
+ "description": "Temperature as reported by the CPU.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "custom": {
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "line"
+ }
},
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 45
+ },
+ {
+ "color": "red",
+ "value": 60
+ }
+ ]
+ },
+ "unit": "celsius"
+ },
+ "overrides": [
{
- "color": "yellow",
- "value": 45
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "max"
+ },
+ "properties": [
+ {
+ "id": "custom.fillBelowTo",
+ "value": "min 10m"
+ },
+ {
+ "id": "custom.lineWidth",
+ "value": 0
+ },
+ {
+ "id": "custom.showPoints",
+ "value": "never"
+ }
+ ]
},
{
- "color": "red",
- "value": 60
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "min"
+ },
+ "properties": [
+ {
+ "id": "custom.lineWidth",
+ "value": 0
+ },
+ {
+ "id": "custom.showPoints",
+ "value": "never"
+ }
+ ]
}
]
},
- "unit": "celsius"
- },
- "overrides": [
- {
- "matcher": {
- "id": "byFrameRefID",
- "options": "max"
+ "gridPos": {
+ "h": 8,
+ "w": 6,
+ "x": 0,
+ "y": 20
+ },
+ "id": 80,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "hidden",
+ "placement": "bottom"
},
- "properties": [
- {
- "id": "custom.fillBelowTo",
- "value": "min 10m"
+ "tooltip": {
+ "mode": "multi",
+ "sort": "desc"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
},
- {
- "id": "custom.lineWidth",
- "value": 0
+ "editorMode": "code",
+ "expr": "avg_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\", chip=\"platform_coretemp_0\", sensor=\"temp1\"}[10m])",
+ "legendFormat": "average 10m",
+ "range": true,
+ "refId": "avg"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
},
- {
- "id": "custom.showPoints",
- "value": "never"
- }
- ]
- },
- {
- "matcher": {
- "id": "byFrameRefID",
- "options": "min"
+ "editorMode": "code",
+ "expr": "max(max_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\",chip=\"platform_coretemp_0\"}[10m]))",
+ "hide": false,
+ "legendFormat": "max 10m",
+ "range": true,
+ "refId": "max"
},
- "properties": [
- {
- "id": "custom.lineWidth",
- "value": 0
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
},
- {
- "id": "custom.showPoints",
- "value": "never"
- }
- ]
- }
- ]
- },
- "gridPos": {
- "h": 6,
- "w": 6,
- "x": 18,
- "y": 13
- },
- "id": 80,
- "options": {
- "legend": {
- "calcs": [],
- "displayMode": "hidden",
- "placement": "bottom"
+ "editorMode": "code",
+ "expr": "min_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\", chip=\"platform_coretemp_0\", sensor=\"temp1\"}[10m])",
+ "hide": false,
+ "legendFormat": "min 10m",
+ "range": true,
+ "refId": "min"
+ }
+ ],
+ "title": "LCU Temperature",
+ "type": "timeseries"
},
- "tooltip": {
- "mode": "multi",
- "sort": "desc"
- }
- },
- "targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
- "editorMode": "code",
- "expr": "avg_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\", chip=\"platform_coretemp_0\", sensor=\"temp1\"}[10m])",
- "legendFormat": "average 10m",
- "range": true,
- "refId": "avg"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "prometheus"
+ "description": "Power draw as reported by the LCU itself.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "watt"
+ },
+ "overrides": []
},
- "editorMode": "code",
- "expr": "max(max_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\",chip=\"platform_coretemp_0\"}[10m]))",
- "hide": false,
- "legendFormat": "max 10m",
- "range": true,
- "refId": "max"
+ "gridPos": {
+ "h": 8,
+ "w": 7,
+ "x": 6,
+ "y": 20
+ },
+ "id": 84,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "hidden",
+ "placement": "bottom"
+ },
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
+ },
+ "expr": "node_hwmon_power_average_watt{instance=\"${station}.astron.nl:9090\"}",
+ "refId": "A"
+ }
+ ],
+ "title": "Power Consumption",
+ "type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
- "editorMode": "code",
- "expr": "min_over_time(node_hwmon_temp_celsius{instance=\"${station}.astron.nl:9090\", chip=\"platform_coretemp_0\", sensor=\"temp1\"}[10m])",
- "hide": false,
- "legendFormat": "min 10m",
- "range": true,
- "refId": "min"
+ "description": "Average CPU usage across all cores.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "axisSoftMax": 1,
+ "axisSoftMin": 0,
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 100,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 0,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "normal"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "percentunit"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 7,
+ "x": 13,
+ "y": 20
+ },
+ "id": 85,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "hidden",
+ "placement": "bottom"
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "desc"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "prometheus"
+ },
+ "editorMode": "code",
+ "expr": "avg by(mode) (rate(node_cpu_seconds_total{host=\"$station\",mode!=\"idle\"}[5m]))",
+ "legendFormat": "{{mode}}",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "CPU Usage",
+ "type": "timeseries"
}
],
- "title": "LCU Temperature",
- "type": "timeseries"
+ "title": "LCU Temperature & Power",
+ "type": "row"
},
{
"collapsed": true,
@@ -980,7 +1175,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 19
+ "y": 20
},
"id": 75,
"panels": [
@@ -1030,8 +1225,7 @@
"mode": "absolute",
"steps": [
{
- "color": "red",
- "value": null
+ "color": "red"
},
{
"color": "#EAB839",
@@ -1142,8 +1336,7 @@
"mode": "absolute",
"steps": [
{
- "color": "red",
- "value": null
+ "color": "red"
},
{
"color": "#EAB839",
@@ -1253,8 +1446,7 @@
"mode": "absolute",
"steps": [
{
- "color": "red",
- "value": null
+ "color": "red"
},
{
"color": "#EAB839",
@@ -1346,7 +1538,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 20
+ "y": 21
},
"id": 68,
"panels": [
@@ -1684,7 +1876,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 21
+ "y": 22
},
"id": 77,
"panels": [
@@ -1800,7 +1992,7 @@
"list": [
{
"current": {
- "selected": true,
+ "selected": false,
"text": "dop496",
"value": "dop496"
},
@@ -1829,13 +2021,13 @@
]
},
"time": {
- "from": "now-15m",
+ "from": "now-5m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "LCU",
"uid": "lcu",
- "version": 3,
+ "version": 5,
"weekStart": ""
}