From aa935984a88c9500cee71eba693b0622365ef4b9 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 13 Apr 2026 05:42:03 -0300 Subject: [PATCH] monitoring: equalize split ups card heights and row spacing --- scripts/dashboards_render_atlas.py | 38 ++++++++-------- .../monitoring/dashboards/atlas-overview.json | 44 +++++++++---------- .../grafana-dashboard-overview.yaml | 44 +++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 6043a79a..3ceba49e 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1839,10 +1839,10 @@ def build_overview(): canvas_two_metric_row_panel( 40, f"{ANANKE_UPS_DB_NAME} UPS Current", - {"h": 2, "w": 6, "x": 0, "y": 7}, - metric_size=24, - metric_top=8, - metric_height=34, + {"h": 3, "w": 6, "x": 0, "y": 7}, + metric_size=30, + metric_top=10, + metric_height=42, targets=[ {"refId": "A", "expr": ANANKE_UPS_DRAW_WATTS_DB, "legendFormat": "Draw", "instant": True}, {"refId": "B", "expr": ANANKE_UPS_RUNTIME_DB, "legendFormat": "Runtime", "instant": True}, @@ -1858,7 +1858,7 @@ def build_overview(): canvas_two_metric_row_panel( 144, f"{ANANKE_UPS_TETHYS_NAME} UPS Current", - {"h": 3, "w": 6, "x": 0, "y": 9}, + {"h": 3, "w": 6, "x": 0, "y": 10}, metric_size=30, targets=[ {"refId": "A", "expr": ANANKE_UPS_DRAW_WATTS_TETHYS, "legendFormat": "Draw", "instant": True}, @@ -1876,7 +1876,7 @@ def build_overview(): 41, "UPS History (Power Draw)", None, - {"h": 5, "w": 6, "x": 6, "y": 7}, + {"h": 6, "w": 6, "x": 6, "y": 7}, unit="watt", targets=[ {"refId": "A", "expr": ANANKE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": ANANKE_UPS_DB_NAME}, @@ -1892,7 +1892,7 @@ def build_overview(): canvas_two_metric_row_panel( 42, "Current Enclosure Temperature", - {"h": 3, "w": 6, "x": 0, "y": 12}, + {"h": 3, "w": 6, "x": 0, "y": 13}, metric_size=30, targets=[ {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "°C", "instant": True}, @@ -1909,7 +1909,7 @@ def build_overview(): canvas_two_metric_row_panel( 143, "Current Enclosure Climate", - {"h": 3, "w": 6, "x": 0, "y": 15}, + {"h": 3, "w": 6, "x": 0, "y": 16}, metric_size=30, targets=[ {"refId": "A", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "%RH", "instant": True}, @@ -1926,7 +1926,7 @@ def build_overview(): 43, "Enclosure Climate History", None, - {"h": 6, "w": 6, "x": 6, "y": 12}, + {"h": 6, "w": 6, "x": 6, "y": 13}, unit="none", targets=[ {"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "C"}, @@ -2026,7 +2026,7 @@ def build_overview(): 140, "Fan Activity", CLIMATE_FAN_CURRENT_ROW_EXPR, - {"h": 6, "w": 6, "x": 12, "y": 12}, + {"h": 6, "w": 6, "x": 12, "y": 13}, unit="none", decimals=0, text_mode="name_and_value", @@ -2056,7 +2056,7 @@ def build_overview(): 141, "Fan History (0-10)", None, - {"h": 6, "w": 6, "x": 18, "y": 12}, + {"h": 6, "w": 6, "x": 18, "y": 13}, unit="none", max_value=10, targets=[ @@ -2092,7 +2092,7 @@ def build_overview(): "type": "timeseries", "title": "Ariadne Attempts / Failures", "datasource": PROM_DS, - "gridPos": {"h": 5, "w": 6, "x": 12, "y": 7}, + "gridPos": {"h": 6, "w": 6, "x": 12, "y": 7}, "targets": [ {"expr": ARIADNE_TASK_ATTEMPTS_SERIES, "refId": "A", "legendFormat": "Attempts"}, {"expr": ARIADNE_TASK_FAILURES_SERIES, "refId": "B", "legendFormat": "Failures"}, @@ -2125,7 +2125,7 @@ def build_overview(): 46, "Platform Test Success Rate", None, - {"h": 5, "w": 6, "x": 18, "y": 7}, + {"h": 6, "w": 6, "x": 18, "y": 7}, unit="percent", targets=PLATFORM_TEST_SUCCESS_RATE_SUITE_TARGETS, legend_display="table", @@ -2236,7 +2236,7 @@ def build_overview(): 30, "Mail Sent (1d)", 'max(postmark_outbound_sent{window="1d"})', - {"h": 2, "w": 4, "x": 0, "y": 18}, + {"h": 2, "w": 4, "x": 0, "y": 19}, unit="none", links=link_to("atlas-mail"), ) @@ -2247,7 +2247,7 @@ def build_overview(): "type": "stat", "title": "Mail Bounces (1d)", "datasource": PROM_DS, - "gridPos": {"h": 2, "w": 4, "x": 8, "y": 18}, + "gridPos": {"h": 2, "w": 4, "x": 8, "y": 19}, "targets": [ { "expr": 'max(postmark_outbound_bounce_rate{window="1d"})', @@ -2293,7 +2293,7 @@ def build_overview(): 32, "Mail Success Rate (1d)", 'clamp_min(100 - max(postmark_outbound_bounce_rate{window="1d"}), 0)', - {"h": 2, "w": 4, "x": 4, "y": 18}, + {"h": 2, "w": 4, "x": 4, "y": 19}, unit="percent", thresholds=mail_success_thresholds, decimals=1, @@ -2305,7 +2305,7 @@ def build_overview(): 33, "Mail Limit Used (30d)", "max(postmark_sending_limit_used_percent)", - {"h": 2, "w": 4, "x": 12, "y": 18}, + {"h": 2, "w": 4, "x": 12, "y": 19}, unit="percent", thresholds=mail_limit_thresholds, decimals=1, @@ -2317,7 +2317,7 @@ def build_overview(): 34, "Postgres Connections Used", POSTGRES_CONN_USED, - {"h": 2, "w": 4, "x": 16, "y": 18}, + {"h": 2, "w": 4, "x": 16, "y": 19}, decimals=0, text_mode="name_and_value", legend="{{conn}}", @@ -2329,7 +2329,7 @@ def build_overview(): 35, "Postgres Hottest Connections", POSTGRES_CONN_HOTTEST, - {"h": 2, "w": 4, "x": 20, "y": 18}, + {"h": 2, "w": 4, "x": 20, "y": 19}, unit="none", decimals=0, text_mode="name_and_value", diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index d7f6703a..4ab3fc61 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -1079,7 +1079,7 @@ "uid": "atlas-vm" }, "gridPos": { - "h": 2, + "h": 3, "w": 6, "x": 0, "y": 7 @@ -1163,9 +1163,9 @@ }, "placement": { "left": 12, - "top": 8, + "top": 10, "width": 146, - "height": 34 + "height": 42 }, "background": { "color": { @@ -1180,7 +1180,7 @@ "config": { "align": "center", "valign": "middle", - "size": 24, + "size": 30, "color": { "field": "Draw", "fixed": "text" @@ -1202,9 +1202,9 @@ }, "placement": { "left": 168, - "top": 8, + "top": 10, "width": 146, - "height": 34 + "height": 42 }, "background": { "color": { @@ -1219,7 +1219,7 @@ "config": { "align": "center", "valign": "middle", - "size": 24, + "size": 30, "color": { "field": "Runtime", "fixed": "text" @@ -1265,7 +1265,7 @@ "h": 3, "w": 6, "x": 0, - "y": 9 + "y": 10 }, "targets": [ { @@ -1445,7 +1445,7 @@ "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 6, "y": 7 @@ -1502,7 +1502,7 @@ "h": 3, "w": 6, "x": 0, - "y": 12 + "y": 13 }, "targets": [ { @@ -1685,7 +1685,7 @@ "h": 3, "w": 6, "x": 0, - "y": 15 + "y": 16 }, "targets": [ { @@ -1868,7 +1868,7 @@ "h": 6, "w": 6, "x": 6, - "y": 12 + "y": 13 }, "targets": [ { @@ -2175,7 +2175,7 @@ "h": 6, "w": 6, "x": 12, - "y": 12 + "y": 13 }, "targets": [ { @@ -2300,7 +2300,7 @@ "h": 6, "w": 6, "x": 18, - "y": 12 + "y": 13 }, "targets": [ { @@ -2445,7 +2445,7 @@ "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 12, "y": 7 @@ -2525,7 +2525,7 @@ "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 18, "y": 7 @@ -3242,7 +3242,7 @@ "h": 2, "w": 4, "x": 0, - "y": 18 + "y": 19 }, "targets": [ { @@ -3309,7 +3309,7 @@ "h": 2, "w": 4, "x": 8, - "y": 18 + "y": 19 }, "targets": [ { @@ -3414,7 +3414,7 @@ "h": 2, "w": 4, "x": 4, - "y": 18 + "y": 19 }, "targets": [ { @@ -3490,7 +3490,7 @@ "h": 2, "w": 4, "x": 12, - "y": 18 + "y": 19 }, "targets": [ { @@ -3566,7 +3566,7 @@ "h": 2, "w": 4, "x": 16, - "y": 18 + "y": 19 }, "targets": [ { @@ -3629,7 +3629,7 @@ "h": 2, "w": 4, "x": 20, - "y": 18 + "y": 19 }, "targets": [ { diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index c82cda24..0c9f1fbf 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -1088,7 +1088,7 @@ data: "uid": "atlas-vm" }, "gridPos": { - "h": 2, + "h": 3, "w": 6, "x": 0, "y": 7 @@ -1172,9 +1172,9 @@ data: }, "placement": { "left": 12, - "top": 8, + "top": 10, "width": 146, - "height": 34 + "height": 42 }, "background": { "color": { @@ -1189,7 +1189,7 @@ data: "config": { "align": "center", "valign": "middle", - "size": 24, + "size": 30, "color": { "field": "Draw", "fixed": "text" @@ -1211,9 +1211,9 @@ data: }, "placement": { "left": 168, - "top": 8, + "top": 10, "width": 146, - "height": 34 + "height": 42 }, "background": { "color": { @@ -1228,7 +1228,7 @@ data: "config": { "align": "center", "valign": "middle", - "size": 24, + "size": 30, "color": { "field": "Runtime", "fixed": "text" @@ -1274,7 +1274,7 @@ data: "h": 3, "w": 6, "x": 0, - "y": 9 + "y": 10 }, "targets": [ { @@ -1454,7 +1454,7 @@ data: "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 6, "y": 7 @@ -1511,7 +1511,7 @@ data: "h": 3, "w": 6, "x": 0, - "y": 12 + "y": 13 }, "targets": [ { @@ -1694,7 +1694,7 @@ data: "h": 3, "w": 6, "x": 0, - "y": 15 + "y": 16 }, "targets": [ { @@ -1877,7 +1877,7 @@ data: "h": 6, "w": 6, "x": 6, - "y": 12 + "y": 13 }, "targets": [ { @@ -2184,7 +2184,7 @@ data: "h": 6, "w": 6, "x": 12, - "y": 12 + "y": 13 }, "targets": [ { @@ -2309,7 +2309,7 @@ data: "h": 6, "w": 6, "x": 18, - "y": 12 + "y": 13 }, "targets": [ { @@ -2454,7 +2454,7 @@ data: "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 12, "y": 7 @@ -2534,7 +2534,7 @@ data: "uid": "atlas-vm" }, "gridPos": { - "h": 5, + "h": 6, "w": 6, "x": 18, "y": 7 @@ -3251,7 +3251,7 @@ data: "h": 2, "w": 4, "x": 0, - "y": 18 + "y": 19 }, "targets": [ { @@ -3318,7 +3318,7 @@ data: "h": 2, "w": 4, "x": 8, - "y": 18 + "y": 19 }, "targets": [ { @@ -3423,7 +3423,7 @@ data: "h": 2, "w": 4, "x": 4, - "y": 18 + "y": 19 }, "targets": [ { @@ -3499,7 +3499,7 @@ data: "h": 2, "w": 4, "x": 12, - "y": 18 + "y": 19 }, "targets": [ { @@ -3575,7 +3575,7 @@ data: "h": 2, "w": 4, "x": 16, - "y": 18 + "y": 19 }, "targets": [ { @@ -3638,7 +3638,7 @@ data: "h": 2, "w": 4, "x": 20, - "y": 18 + "y": 19 }, "targets": [ {