monitoring: refine overview timeline readability

This commit is contained in:
jenkins 2026-05-16 05:18:53 -03:00
parent 5d01b3a60d
commit 5eef2e9ba3
4 changed files with 111 additions and 26 deletions

View File

@ -1835,9 +1835,12 @@ def build_overview():
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{"color": dark_blue, "value": None}, {"color": dark_blue, "value": None},
{"color": dark_green, "value": 3}, {"color": "semi-dark-blue", "value": 1},
{"color": dark_yellow, "value": 6}, {"color": dark_green, "value": 2},
{"color": dark_orange, "value": 8}, {"color": "semi-dark-green", "value": 4},
{"color": dark_yellow, "value": 5},
{"color": dark_orange, "value": 7},
{"color": "semi-dark-red", "value": 9},
{"color": dark_red, "value": 10}, {"color": dark_red, "value": 10},
], ],
} }
@ -1914,9 +1917,24 @@ def build_overview():
{"refId": "A", "expr": ANANKE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": ANANKE_UPS_DB_NAME}, {"refId": "A", "expr": ANANKE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": ANANKE_UPS_DB_NAME},
{"refId": "B", "expr": ANANKE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": ANANKE_UPS_TETHYS_NAME}, {"refId": "B", "expr": ANANKE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": ANANKE_UPS_TETHYS_NAME},
], ],
field_overrides=fixed_color_overrides( field_overrides=[
{ANANKE_UPS_DB_NAME: dark_blue, ANANKE_UPS_TETHYS_NAME: dark_yellow} {
), "matcher": {"id": "byName", "options": ANANKE_UPS_DB_NAME},
"properties": [
{"id": "color", "value": {"mode": "fixed", "fixedColor": dark_blue}},
{"id": "custom.barAlignment", "value": -1},
{"id": "custom.barWidthFactor", "value": 0.42},
],
},
{
"matcher": {"id": "byName", "options": ANANKE_UPS_TETHYS_NAME},
"properties": [
{"id": "color", "value": {"mode": "fixed", "fixedColor": dark_yellow}},
{"id": "custom.barAlignment", "value": 1},
{"id": "custom.barWidthFactor", "value": 0.42},
],
},
],
legend_display="table", legend_display="table",
legend_placement="right", legend_placement="right",
links=overview_link("atlas-power"), links=overview_link("atlas-power"),
@ -2211,6 +2229,8 @@ def build_overview():
description="Percent of current gate dimensions passing per suite over time. There are seven gate dimensions, so 85.7% means one gate is failing.", description="Percent of current gate dimensions passing per suite over time. There are seven gate dimensions, so 85.7% means one gate is failing.",
) )
) )
panels[-1]["options"]["legend"] = {"displayMode": "hidden", "placement": "bottom"}
panels[-1]["options"]["rowHeight"] = 0.95
for panel_id, title, metric, x_pos, description in [ for panel_id, title, metric, x_pos, description in [
( (
142, 142,

View File

@ -82,22 +82,27 @@ def test_overview_uses_readable_quality_power_and_gitops_panels():
assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["drawStyle"] == "bars" assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["drawStyle"] == "bars"
assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["barWidthFactor"] == 0.72 assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["barWidthFactor"] == 0.72
ups_overrides = panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["overrides"] ups_overrides = panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["overrides"]
assert any( ups_override_by_name = {override["matcher"]["options"]: override for override in ups_overrides}
override["matcher"]["options"] == "Pyrphoros" assert ups_override_by_name["Pyrphoros"]["properties"] == [
and override["properties"][0]["value"] == {"mode": "fixed", "fixedColor": "dark-blue"} {"id": "color", "value": {"mode": "fixed", "fixedColor": "dark-blue"}},
for override in ups_overrides {"id": "custom.barAlignment", "value": -1},
) {"id": "custom.barWidthFactor", "value": 0.42},
assert any( ]
override["matcher"]["options"] == "Statera" assert ups_override_by_name["Statera"]["properties"] == [
and override["properties"][0]["value"] == {"mode": "fixed", "fixedColor": "dark-yellow"} {"id": "color", "value": {"mode": "fixed", "fixedColor": "dark-yellow"}},
for override in ups_overrides {"id": "custom.barAlignment", "value": 1},
) {"id": "custom.barWidthFactor", "value": 0.42},
]
assert panels_by_title["Ariadne Run Volume"]["fieldConfig"]["defaults"]["custom"]["drawStyle"] == "bars" assert panels_by_title["Ariadne Run Volume"]["fieldConfig"]["defaults"]["custom"]["drawStyle"] == "bars"
assert "Fan History (0-10)" not in panels_by_title assert "Fan History (0-10)" not in panels_by_title
assert panels_by_title["Fan Intensity History"]["type"] == "state-timeline" assert panels_by_title["Fan Intensity History"]["type"] == "state-timeline"
assert panels_by_title["Fan Intensity History"]["gridPos"] == {"h": 6, "w": 6, "x": 9, "y": 13} assert panels_by_title["Fan Intensity History"]["gridPos"] == {"h": 6, "w": 6, "x": 9, "y": 13}
assert panels_by_title["Fan Intensity History"]["fieldConfig"]["defaults"]["max"] == 10 assert panels_by_title["Fan Intensity History"]["fieldConfig"]["defaults"]["max"] == 10
assert panels_by_title["Fan Intensity History"]["targets"][0]["legendFormat"] == "{{fan}}" assert panels_by_title["Fan Intensity History"]["targets"][0]["legendFormat"] == "{{fan}}"
fan_steps = panels_by_title["Fan Intensity History"]["fieldConfig"]["defaults"]["thresholds"]["steps"]
assert {"color": "semi-dark-blue", "value": 1} in fan_steps
assert {"color": "semi-dark-green", "value": 4} in fan_steps
assert {"color": "semi-dark-red", "value": 9} in fan_steps
assert panels_by_title["Flux Source"]["type"] == "stat" assert panels_by_title["Flux Source"]["type"] == "stat"
assert panels_by_title["Flux Source"]["gridPos"] == {"h": 2, "w": 3, "x": 21, "y": 7} assert panels_by_title["Flux Source"]["gridPos"] == {"h": 2, "w": 3, "x": 21, "y": 7}
@ -110,6 +115,8 @@ def test_overview_uses_readable_quality_power_and_gitops_panels():
gitops_expr = panels_by_title["GitOps Health"]["targets"][0]["expr"] gitops_expr = panels_by_title["GitOps Health"]["targets"][0]["expr"]
assert "Kustomizations Not Suspended" in gitops_expr assert "Kustomizations Not Suspended" in gitops_expr
assert "HelmReleases Not Suspended" in gitops_expr assert "HelmReleases Not Suspended" in gitops_expr
assert panels_by_title["Gate Checks Passing by Suite"]["options"]["legend"]["displayMode"] == "hidden"
assert panels_by_title["Gate Checks Passing by Suite"]["options"]["rowHeight"] == 0.95
pvc_backup_expr = panels_by_title["PVC Backup Health / Age"]["targets"][0]["expr"] pvc_backup_expr = panels_by_title["PVC Backup Health / Age"]["targets"][0]["expr"]
assert "backup-telemetry-missing" in pvc_backup_expr assert "backup-telemetry-missing" in pvc_backup_expr

View File

@ -1321,6 +1321,14 @@
"mode": "fixed", "mode": "fixed",
"fixedColor": "dark-blue" "fixedColor": "dark-blue"
} }
},
{
"id": "custom.barAlignment",
"value": -1
},
{
"id": "custom.barWidthFactor",
"value": 0.42
} }
] ]
}, },
@ -1336,6 +1344,14 @@
"mode": "fixed", "mode": "fixed",
"fixedColor": "dark-yellow" "fixedColor": "dark-yellow"
} }
},
{
"id": "custom.barAlignment",
"value": 1
},
{
"id": "custom.barWidthFactor",
"value": 0.42
} }
] ]
} }
@ -1896,17 +1912,29 @@
"color": "dark-blue", "color": "dark-blue",
"value": null "value": null
}, },
{
"color": "semi-dark-blue",
"value": 1
},
{ {
"color": "dark-green", "color": "dark-green",
"value": 3 "value": 2
},
{
"color": "semi-dark-green",
"value": 4
}, },
{ {
"color": "dark-yellow", "color": "dark-yellow",
"value": 6 "value": 5
}, },
{ {
"color": "dark-orange", "color": "dark-orange",
"value": 8 "value": 7
},
{
"color": "semi-dark-red",
"value": 9
}, },
{ {
"color": "dark-red", "color": "dark-red",
@ -2759,13 +2787,14 @@
"mergeValues": true, "mergeValues": true,
"showValue": "never", "showValue": "never",
"legend": { "legend": {
"displayMode": "list", "displayMode": "hidden",
"placement": "bottom" "placement": "bottom"
}, },
"tooltip": { "tooltip": {
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} },
"rowHeight": 0.95
}, },
"links": [ "links": [
{ {

View File

@ -1330,6 +1330,14 @@ data:
"mode": "fixed", "mode": "fixed",
"fixedColor": "dark-blue" "fixedColor": "dark-blue"
} }
},
{
"id": "custom.barAlignment",
"value": -1
},
{
"id": "custom.barWidthFactor",
"value": 0.42
} }
] ]
}, },
@ -1345,6 +1353,14 @@ data:
"mode": "fixed", "mode": "fixed",
"fixedColor": "dark-yellow" "fixedColor": "dark-yellow"
} }
},
{
"id": "custom.barAlignment",
"value": 1
},
{
"id": "custom.barWidthFactor",
"value": 0.42
} }
] ]
} }
@ -1905,17 +1921,29 @@ data:
"color": "dark-blue", "color": "dark-blue",
"value": null "value": null
}, },
{
"color": "semi-dark-blue",
"value": 1
},
{ {
"color": "dark-green", "color": "dark-green",
"value": 3 "value": 2
},
{
"color": "semi-dark-green",
"value": 4
}, },
{ {
"color": "dark-yellow", "color": "dark-yellow",
"value": 6 "value": 5
}, },
{ {
"color": "dark-orange", "color": "dark-orange",
"value": 8 "value": 7
},
{
"color": "semi-dark-red",
"value": 9
}, },
{ {
"color": "dark-red", "color": "dark-red",
@ -2768,13 +2796,14 @@ data:
"mergeValues": true, "mergeValues": true,
"showValue": "never", "showValue": "never",
"legend": { "legend": {
"displayMode": "list", "displayMode": "hidden",
"placement": "bottom" "placement": "bottom"
}, },
"tooltip": { "tooltip": {
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} },
"rowHeight": 0.95
}, },
"links": [ "links": [
{ {