From 18666d5aec4010f3091a8aa075633c0b7155f183 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 13 Apr 2026 11:52:24 -0300 Subject: [PATCH] monitoring(jenkins): improve weather panel readability and layout --- scripts/dashboards_render_atlas.py | 21 +++++++++--------- .../monitoring/dashboards/atlas-jobs.json | 14 +++++++----- .../monitoring/dashboards/atlas-overview.json | 22 +++++++++++-------- .../monitoring/grafana-dashboard-jobs.yaml | 14 +++++++----- .../grafana-dashboard-overview.yaml | 22 +++++++++++-------- 5 files changed, 55 insertions(+), 38 deletions(-) diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 346d9bd2..e13b2700 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1579,11 +1579,12 @@ def jenkins_weather_statlist_panel( "options": { "colorMode": "value", "graphMode": "none", - "justifyMode": "auto", + "justifyMode": "left", "orientation": "horizontal", "wideLayout": True, "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": False}, - "textMode": "name_value", + "textMode": "name_and_value", + "text": {"titleSize": 12, "valueSize": 12}, }, "transformations": [{"id": "sortBy", "options": {"fields": ["Value"], "order": sort_order}}], } @@ -2102,7 +2103,7 @@ def build_overview(): 44, "One-off Job Pods (age hours)", ONEOFF_JOB_POD_AGE_HOURS, - {"h": 5, "w": 8, "x": 0, "y": 32}, + {"h": 5, "w": 6, "x": 0, "y": 32}, unit="h", instant=True, legend="{{namespace}}/{{pod}}", @@ -2180,11 +2181,11 @@ def build_overview(): 142, "Jenkins Build Weather (last run h, newest first)", JENKINS_BUILD_WEATHER_LAST_RUN_AGE_HOURS, - {"h": 5, "w": 8, "x": 8, "y": 32}, + {"h": 5, "w": 12, "x": 6, "y": 32}, unit="h", - decimals=2, + decimals=1, sort_order="asc", - limit=8, + limit=12, links=link_to("atlas-jobs"), description=( "Jenkins homepage-style list from Ariadne with weather icons and status-colored job names. " @@ -2197,7 +2198,7 @@ def build_overview(): 47, "PVC Backup Health / Age", PVC_BACKUP_AGE_HOURS_BY_PVC, - {"h": 5, "w": 8, "x": 16, "y": 32}, + {"h": 5, "w": 6, "x": 18, "y": 32}, unit="h", instant=True, legend="{{namespace}}/{{pvc}}", @@ -3833,9 +3834,9 @@ def build_jobs_dashboard(): 24, "Jenkins Build Weather (last run h, newest first)", JENKINS_BUILD_WEATHER_LAST_RUN_AGE_HOURS, - {"h": 8, "w": 24, "x": 0, "y": 44}, + {"h": 9, "w": 24, "x": 0, "y": 44}, unit="h", - decimals=2, + decimals=1, sort_order="asc", limit=20, description=( @@ -3848,7 +3849,7 @@ def build_jobs_dashboard(): 27, "Jenkins Workspace PV Age (h, detached only)", JENKINS_WORKSPACE_PV_STALE_AGE_HOURS, - {"h": 10, "w": 24, "x": 0, "y": 52}, + {"h": 10, "w": 24, "x": 0, "y": 53}, unit="h", instant=True, legend="{{name}} -> {{persistentvolume}}", diff --git a/services/monitoring/dashboards/atlas-jobs.json b/services/monitoring/dashboards/atlas-jobs.json index 75341ca7..0f6014c5 100644 --- a/services/monitoring/dashboards/atlas-jobs.json +++ b/services/monitoring/dashboards/atlas-jobs.json @@ -1543,7 +1543,7 @@ "uid": "atlas-vm" }, "gridPos": { - "h": 8, + "h": 9, "w": 24, "x": 0, "y": 44 @@ -1577,7 +1577,7 @@ "fieldConfig": { "defaults": { "unit": "h", - "decimals": 2, + "decimals": 1, "min": 0, "links": [ { @@ -1653,7 +1653,7 @@ "options": { "colorMode": "value", "graphMode": "none", - "justifyMode": "auto", + "justifyMode": "left", "orientation": "horizontal", "wideLayout": true, "reduceOptions": { @@ -1663,7 +1663,11 @@ "fields": "", "values": false }, - "textMode": "name_value" + "textMode": "name_and_value", + "text": { + "titleSize": 12, + "valueSize": 12 + } }, "transformations": [ { @@ -1696,7 +1700,7 @@ "h": 10, "w": 24, "x": 0, - "y": 52 + "y": 53 }, "targets": [ { diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index bc317f01..beef56e0 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -2010,7 +2010,7 @@ }, "gridPos": { "h": 5, - "w": 8, + "w": 6, "x": 0, "y": 32 }, @@ -2288,8 +2288,8 @@ }, "gridPos": { "h": 5, - "w": 8, - "x": 8, + "w": 12, + "x": 6, "y": 32 }, "targets": [ @@ -2321,7 +2321,7 @@ "fieldConfig": { "defaults": { "unit": "h", - "decimals": 2, + "decimals": 1, "min": 0, "links": [ { @@ -2397,7 +2397,7 @@ "options": { "colorMode": "value", "graphMode": "none", - "justifyMode": "auto", + "justifyMode": "left", "orientation": "horizontal", "wideLayout": true, "reduceOptions": { @@ -2407,7 +2407,11 @@ "fields": "", "values": false }, - "textMode": "name_value" + "textMode": "name_and_value", + "text": { + "titleSize": 12, + "valueSize": 12 + } }, "transformations": [ { @@ -2422,7 +2426,7 @@ { "id": "limit", "options": { - "limit": 8 + "limit": 12 } } ], @@ -2445,8 +2449,8 @@ }, "gridPos": { "h": 5, - "w": 8, - "x": 16, + "w": 6, + "x": 18, "y": 32 }, "targets": [ diff --git a/services/monitoring/grafana-dashboard-jobs.yaml b/services/monitoring/grafana-dashboard-jobs.yaml index ee8a8035..023d918e 100644 --- a/services/monitoring/grafana-dashboard-jobs.yaml +++ b/services/monitoring/grafana-dashboard-jobs.yaml @@ -1552,7 +1552,7 @@ data: "uid": "atlas-vm" }, "gridPos": { - "h": 8, + "h": 9, "w": 24, "x": 0, "y": 44 @@ -1586,7 +1586,7 @@ data: "fieldConfig": { "defaults": { "unit": "h", - "decimals": 2, + "decimals": 1, "min": 0, "links": [ { @@ -1662,7 +1662,7 @@ data: "options": { "colorMode": "value", "graphMode": "none", - "justifyMode": "auto", + "justifyMode": "left", "orientation": "horizontal", "wideLayout": true, "reduceOptions": { @@ -1672,7 +1672,11 @@ data: "fields": "", "values": false }, - "textMode": "name_value" + "textMode": "name_and_value", + "text": { + "titleSize": 12, + "valueSize": 12 + } }, "transformations": [ { @@ -1705,7 +1709,7 @@ data: "h": 10, "w": 24, "x": 0, - "y": 52 + "y": 53 }, "targets": [ { diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index cabcf01d..e29ae46a 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -2019,7 +2019,7 @@ data: }, "gridPos": { "h": 5, - "w": 8, + "w": 6, "x": 0, "y": 32 }, @@ -2297,8 +2297,8 @@ data: }, "gridPos": { "h": 5, - "w": 8, - "x": 8, + "w": 12, + "x": 6, "y": 32 }, "targets": [ @@ -2330,7 +2330,7 @@ data: "fieldConfig": { "defaults": { "unit": "h", - "decimals": 2, + "decimals": 1, "min": 0, "links": [ { @@ -2406,7 +2406,7 @@ data: "options": { "colorMode": "value", "graphMode": "none", - "justifyMode": "auto", + "justifyMode": "left", "orientation": "horizontal", "wideLayout": true, "reduceOptions": { @@ -2416,7 +2416,11 @@ data: "fields": "", "values": false }, - "textMode": "name_value" + "textMode": "name_and_value", + "text": { + "titleSize": 12, + "valueSize": 12 + } }, "transformations": [ { @@ -2431,7 +2435,7 @@ data: { "id": "limit", "options": { - "limit": 8 + "limit": 12 } } ], @@ -2454,8 +2458,8 @@ data: }, "gridPos": { "h": 5, - "w": 8, - "x": 16, + "w": 6, + "x": 18, "y": 32 }, "targets": [