From 3096e0d7de449b35fd849b4db4fea78c8783c0b4 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Sun, 12 Apr 2026 18:50:25 -0300 Subject: [PATCH] monitoring(overview): tighten climate labels and drop duplicate temp line --- scripts/dashboards_render_atlas.py | 33 ++++++-------- .../monitoring/dashboards/atlas-overview.json | 43 ++++++------------- .../grafana-dashboard-overview.yaml | 43 ++++++------------- 3 files changed, 39 insertions(+), 80 deletions(-) diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index cc34fbf1..0d698fb6 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1387,7 +1387,7 @@ def build_overview(): links=link_to("atlas-power"), description="Per-UPS live snapshot: current draw, discharge, and charging/discharging status.", orientation="horizontal", - wide_layout=False, + wide_layout=True, ) ) panels.append( @@ -1417,16 +1417,16 @@ def build_overview(): decimals=2, text_mode="name_and_value", targets=[ - {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "°C", "instant": True}, - {"refId": "B", "expr": CLIMATE_TEMP_FAHRENHEIT_MAX, "legendFormat": "°F", "instant": True}, - {"refId": "C", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "RH%", "instant": True}, - {"refId": "D", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "VPD", "instant": True}, + {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "Temp °C", "instant": True}, + {"refId": "B", "expr": CLIMATE_TEMP_FAHRENHEIT_MAX, "legendFormat": "Temp °F", "instant": True}, + {"refId": "C", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "Humidity", "instant": True}, + {"refId": "D", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Pressure", "instant": True}, ], field_overrides=[ - {"matcher": {"id": "byName", "options": "°C"}, "properties": [{"id": "unit", "value": "celsius"}]}, - {"matcher": {"id": "byName", "options": "°F"}, "properties": [{"id": "unit", "value": "fahrenheit"}]}, - {"matcher": {"id": "byName", "options": "RH%"}, "properties": [{"id": "unit", "value": "percent"}]}, - {"matcher": {"id": "byName", "options": "VPD"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]}, + {"matcher": {"id": "byName", "options": "Temp °C"}, "properties": [{"id": "unit", "value": "celsius"}]}, + {"matcher": {"id": "byName", "options": "Temp °F"}, "properties": [{"id": "unit", "value": "fahrenheit"}]}, + {"matcher": {"id": "byName", "options": "Humidity"}, "properties": [{"id": "unit", "value": "percent"}]}, + {"matcher": {"id": "byName", "options": "Pressure"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]}, ], links=link_to("atlas-power"), description="Current tent values on one row: temperature (C/F), humidity (RH), and pressure proxy (VPD).", @@ -1443,17 +1443,10 @@ def build_overview(): unit="celsius", targets=[ {"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "C"}, - {"refId": "B", "expr": CLIMATE_TEMP_FAHRENHEIT_SERIES, "legendFormat": "F"}, - {"refId": "C", "expr": CLIMATE_HUMIDITY_SERIES, "legendFormat": "RH"}, - {"refId": "D", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "VPD"}, + {"refId": "B", "expr": CLIMATE_HUMIDITY_SERIES, "legendFormat": "RH"}, + {"refId": "C", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "P"}, ], field_overrides=[ - { - "matcher": {"id": "byName", "options": "F"}, - "properties": [ - {"id": "unit", "value": "fahrenheit"}, - ], - }, { "matcher": {"id": "byName", "options": "RH"}, "properties": [ @@ -1462,7 +1455,7 @@ def build_overview(): ], }, { - "matcher": {"id": "byName", "options": "VPD"}, + "matcher": {"id": "byName", "options": "P"}, "properties": [ {"id": "unit", "value": "suffix:kPa"}, {"id": "custom.axisPlacement", "value": "right"}, @@ -1473,7 +1466,7 @@ def build_overview(): legend_display="list", legend_placement="bottom", links=link_to("atlas-power"), - description="Temperature scales on left axis, humidity and VPD on right axis.", + description="Temperature on left axis, humidity and pressure on right axis.", ) ) panels.append( diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index 450d6417..36358fd7 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -1283,7 +1283,7 @@ }, "textMode": "name_and_value", "orientation": "horizontal", - "wideLayout": false + "wideLayout": true }, "links": [ { @@ -1366,25 +1366,25 @@ { "refId": "A", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) or on() vector(0)", - "legendFormat": "\u00b0C", + "legendFormat": "Temp \u00b0C", "instant": true }, { "refId": "B", "expr": "max((max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) * 9 / 5 + 32) or on() vector(0)", - "legendFormat": "\u00b0F", + "legendFormat": "Temp \u00b0F", "instant": true }, { "refId": "C", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent)) or on() vector(0)", - "legendFormat": "RH%", + "legendFormat": "Humidity", "instant": true }, { "refId": "D", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa)) or on() vector(0)", - "legendFormat": "VPD", + "legendFormat": "Pressure", "instant": true } ], @@ -1417,7 +1417,7 @@ { "matcher": { "id": "byName", - "options": "\u00b0C" + "options": "Temp \u00b0C" }, "properties": [ { @@ -1429,7 +1429,7 @@ { "matcher": { "id": "byName", - "options": "\u00b0F" + "options": "Temp \u00b0F" }, "properties": [ { @@ -1441,7 +1441,7 @@ { "matcher": { "id": "byName", - "options": "RH%" + "options": "Humidity" }, "properties": [ { @@ -1453,7 +1453,7 @@ { "matcher": { "id": "byName", - "options": "VPD" + "options": "Pressure" }, "properties": [ { @@ -1510,18 +1510,13 @@ }, { "refId": "B", - "expr": "(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) * 9 / 5 + 32", - "legendFormat": "F" - }, - { - "refId": "C", "expr": "max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent)", "legendFormat": "RH" }, { - "refId": "D", + "refId": "C", "expr": "max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa)", - "legendFormat": "VPD" + "legendFormat": "P" } ], "fieldConfig": { @@ -1529,18 +1524,6 @@ "unit": "celsius" }, "overrides": [ - { - "matcher": { - "id": "byName", - "options": "F" - }, - "properties": [ - { - "id": "unit", - "value": "fahrenheit" - } - ] - }, { "matcher": { "id": "byName", @@ -1560,7 +1543,7 @@ { "matcher": { "id": "byName", - "options": "VPD" + "options": "P" }, "properties": [ { @@ -1595,7 +1578,7 @@ "targetBlank": true } ], - "description": "Temperature scales on left axis, humidity and VPD on right axis." + "description": "Temperature on left axis, humidity and pressure on right axis." }, { "id": 140, diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index 1d6e22cf..1aa6f1a4 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -1292,7 +1292,7 @@ data: }, "textMode": "name_and_value", "orientation": "horizontal", - "wideLayout": false + "wideLayout": true }, "links": [ { @@ -1375,25 +1375,25 @@ data: { "refId": "A", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) or on() vector(0)", - "legendFormat": "\u00b0C", + "legendFormat": "Temp \u00b0C", "instant": true }, { "refId": "B", "expr": "max((max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) * 9 / 5 + 32) or on() vector(0)", - "legendFormat": "\u00b0F", + "legendFormat": "Temp \u00b0F", "instant": true }, { "refId": "C", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent)) or on() vector(0)", - "legendFormat": "RH%", + "legendFormat": "Humidity", "instant": true }, { "refId": "D", "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa)) or on() vector(0)", - "legendFormat": "VPD", + "legendFormat": "Pressure", "instant": true } ], @@ -1426,7 +1426,7 @@ data: { "matcher": { "id": "byName", - "options": "\u00b0C" + "options": "Temp \u00b0C" }, "properties": [ { @@ -1438,7 +1438,7 @@ data: { "matcher": { "id": "byName", - "options": "\u00b0F" + "options": "Temp \u00b0F" }, "properties": [ { @@ -1450,7 +1450,7 @@ data: { "matcher": { "id": "byName", - "options": "RH%" + "options": "Humidity" }, "properties": [ { @@ -1462,7 +1462,7 @@ data: { "matcher": { "id": "byName", - "options": "VPD" + "options": "Pressure" }, "properties": [ { @@ -1519,18 +1519,13 @@ data: }, { "refId": "B", - "expr": "(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius)) * 9 / 5 + 32", - "legendFormat": "F" - }, - { - "refId": "C", "expr": "max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent)", "legendFormat": "RH" }, { - "refId": "D", + "refId": "C", "expr": "max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa)", - "legendFormat": "VPD" + "legendFormat": "P" } ], "fieldConfig": { @@ -1538,18 +1533,6 @@ data: "unit": "celsius" }, "overrides": [ - { - "matcher": { - "id": "byName", - "options": "F" - }, - "properties": [ - { - "id": "unit", - "value": "fahrenheit" - } - ] - }, { "matcher": { "id": "byName", @@ -1569,7 +1552,7 @@ data: { "matcher": { "id": "byName", - "options": "VPD" + "options": "P" }, "properties": [ { @@ -1604,7 +1587,7 @@ data: "targetBlank": true } ], - "description": "Temperature scales on left axis, humidity and VPD on right axis." + "description": "Temperature on left axis, humidity and pressure on right axis." }, { "id": 140,