diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 4a1f9290..b7687d13 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1526,6 +1526,7 @@ def jenkins_weather_statlist_panel( limit=12, title_size=12, value_size=12, + merge_for_global_sort=False, links=None, description=None, ): @@ -1603,8 +1604,14 @@ def jenkins_weather_statlist_panel( "textMode": "name_and_value", "text": {"titleSize": title_size, "valueSize": value_size}, }, - "transformations": [{"id": "sortBy", "options": {"fields": ["Value"], "order": sort_order}}], + "transformations": [], } + if merge_for_global_sort: + # Merge per-status query frames so sortBy orders all rows globally. + panel["transformations"].append({"id": "merge", "options": {}}) + panel["transformations"].append( + {"id": "sortBy", "options": {"fields": ["Value"], "order": sort_order}} + ) if limit: panel["transformations"].append({"id": "limit", "options": {"limit": limit}}) if links: @@ -2206,6 +2213,7 @@ def build_overview(): limit=None, title_size=11, value_size=11, + merge_for_global_sort=True, links=link_to("atlas-jobs"), description=( "Top 6 most recent Jenkins successes by age (newest first). " @@ -2226,6 +2234,7 @@ def build_overview(): limit=None, title_size=11, value_size=11, + merge_for_global_sort=True, links=link_to("atlas-jobs"), description=( "Top 6 most recent Jenkins failures by age (newest first). " diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index c64dcdd1..62586dde 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -2417,6 +2417,10 @@ } }, "transformations": [ + { + "id": "merge", + "options": {} + }, { "id": "sortBy", "options": { @@ -2572,6 +2576,10 @@ } }, "transformations": [ + { + "id": "merge", + "options": {} + }, { "id": "sortBy", "options": { diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index 7a3c1db6..9fd8263f 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -2426,6 +2426,10 @@ data: } }, "transformations": [ + { + "id": "merge", + "options": {} + }, { "id": "sortBy", "options": { @@ -2581,6 +2585,10 @@ data: } }, "transformations": [ + { + "id": "merge", + "options": {} + }, { "id": "sortBy", "options": {