bstein/titan-iac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monitoring: clean overview power and gate panels

Browse Source
This commit is contained in:
jenkins 2026-05-16 06:38:34 -03:00
parent c18b43c294
commit 86034e0aac
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/dashboards_render_atlas.py
View File

@ -730,11 +730,11 @@ ANANKE_UPS_DRAW_WATTS_TETHYS = (
f'* ananke_ups_power_nominal_watts{{{ANANKE_UPS_TETHYS_SELECTOR}}}) / 100) or on() vector(0)'
)
ANANKE_UPS_DRAW_WATTS_DB_SERIES = (
f'((ananke_ups_load_percent{{{ANANKE_UPS_DB_SELECTOR}}} '
f'max((ananke_ups_load_percent{{{ANANKE_UPS_DB_SELECTOR}}} '
f'* ananke_ups_power_nominal_watts{{{ANANKE_UPS_DB_SELECTOR}}}) / 100)'
)
ANANKE_UPS_DRAW_WATTS_TETHYS_SERIES = (
f'((ananke_ups_load_percent{{{ANANKE_UPS_TETHYS_SELECTOR}}} '
f'max((ananke_ups_load_percent{{{ANANKE_UPS_TETHYS_SELECTOR}}} '
f'* ananke_ups_power_nominal_watts{{{ANANKE_UPS_TETHYS_SELECTOR}}}) / 100)'
)
ANANKE_UPS_RUNTIME_BY_SOURCE = f"ananke_ups_runtime_seconds{{{ANANKE_SELECTOR}}}"
@ -1932,7 +1932,7 @@ def build_overview():
"drawStyle": "line",
"lineInterpolation": "linear",
"lineWidth": 2,
"fillOpacity": 18,
"fillOpacity": 0,
"showPoints": "never",
"spanNulls": True,
}
@ -2225,7 +2225,7 @@ 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.",
)
)
panels[-1]["options"]["legend"] = {"displayMode": "hidden", "placement": "bottom"}
panels[-1]["options"]["legend"] = {"displayMode": "list", "placement": "bottom"}
panels[-1]["options"]["mergeValues"] = False
panels[-1]["options"]["showValue"] = "auto"
for panel_id, title, metric, x_pos, description in [

6
scripts/tests/test_dashboards_render_atlas.py
View File

@ -82,7 +82,8 @@ def test_overview_uses_readable_quality_power_and_gitops_panels():
assert panels_by_title["UPS History (Power Draw)"]["options"]["legend"]["placement"] == "bottom"
assert panels_by_title["UPS History (Power Draw)"]["options"]["legend"]["displayMode"] == "list"
assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["drawStyle"] == "line"
assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["fillOpacity"] == 18
assert panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["defaults"]["custom"]["fillOpacity"] == 0
assert all(target["expr"].startswith("max(") for target in panels_by_title["UPS History (Power Draw)"]["targets"])
ups_overrides = panels_by_title["UPS History (Power Draw)"]["fieldConfig"]["overrides"]
ups_override_by_name = {override["matcher"]["options"]: override for override in ups_overrides}
assert ups_override_by_name["Pyrphoros"]["properties"] == [
@ -119,7 +120,8 @@ def test_overview_uses_readable_quality_power_and_gitops_panels():
gitops_expr = panels_by_title["GitOps Health"]["targets"][0]["expr"]
assert "Kustomizations 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"]["legend"]["displayMode"] == "list"
assert panels_by_title["Gate Checks Passing by Suite"]["options"]["legend"]["placement"] == "bottom"
assert panels_by_title["Gate Checks Passing by Suite"]["options"]["mergeValues"] is False
assert panels_by_title["Gate Checks Passing by Suite"]["options"]["showValue"] == "auto"
assert "rowHeight" not in panels_by_title["Gate Checks Passing by Suite"]["options"]

8
services/monitoring/dashboards/atlas-overview.json
View File

@ -1285,12 +1285,12 @@
"targets": [
{
"refId": "A",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"legendFormat": "Pyrphoros"
},
{
"refId": "B",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"legendFormat": "Statera"
}
],
@ -1301,7 +1301,7 @@
"drawStyle": "line",
"lineInterpolation": "linear",
"lineWidth": 2,
"fillOpacity": 18,
"fillOpacity": 0,
"showPoints": "never",
"spanNulls": true
}
@ -2781,7 +2781,7 @@
"mergeValues": false,
"showValue": "auto",
"legend": {
"displayMode": "hidden",
"displayMode": "list",
"placement": "bottom"
},
"tooltip": {

4
services/monitoring/dashboards/atlas-power.json
View File

@ -238,12 +238,12 @@
"targets": [
{
"refId": "A",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"legendFormat": "Pyrphoros"
},
{
"refId": "B",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"legendFormat": "Statera"
}
],

8
services/monitoring/grafana-dashboard-overview.yaml
View File

@ -1294,12 +1294,12 @@ data:
"targets": [
{
"refId": "A",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"legendFormat": "Pyrphoros"
},
{
"refId": "B",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"legendFormat": "Statera"
}
],
@ -1310,7 +1310,7 @@ data:
"drawStyle": "line",
"lineInterpolation": "linear",
"lineWidth": 2,
"fillOpacity": 18,
"fillOpacity": 0,
"showPoints": "never",
"spanNulls": true
}
@ -2790,7 +2790,7 @@ data:
"mergeValues": false,
"showValue": "auto",
"legend": {
"displayMode": "hidden",
"displayMode": "list",
"placement": "bottom"
},
"tooltip": {

4
services/monitoring/grafana-dashboard-power.yaml
View File

@ -247,12 +247,12 @@ data:
"targets": [
{
"refId": "A",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Pyrphoros\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Pyrphoros\"}) / 100)",
"legendFormat": "Pyrphoros"
},
{
"refId": "B",
"expr": "((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"expr": "max((ananke_ups_load_percent{job=\"ananke-power\",source=\"Statera\"} * ananke_ups_power_nominal_watts{job=\"ananke-power\",source=\"Statera\"}) / 100)",
"legendFormat": "Statera"
}
],