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

Revert "monitoring(network): organize Traefik traffic lanes"

Browse Source 
This reverts commit eeec8b72dc885950dd116d6dc2ad6574c1cbe6b1.
This commit is contained in:
jenkins 2026-08-05 12:06:23 -03:00
parent eeec8b72dc
commit 9b8a29022d
4 changed files with 50 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/dashboards_render_atlas.py
View File

@ -3786,34 +3786,28 @@ def build_network_dashboard():
transformations=[{"id": "labelsToFields", "options": {}}], transformations=[{"id": "labelsToFields", "options": {}}],
) )
) )
traffic_thresholds = {
"mode": "absolute",
"steps": [{"color": "blue", "value": None}],
}
panels.append( panels.append(
bargauge_panel( timeseries_panel(
11, 11,
"Traefik Routers (req/s)", "Traefik Routers (req/s)",
f"topk(10, {TRAEFIK_ROUTER_EXPR})", f"topk(10, {TRAEFIK_ROUTER_EXPR})",
{"h": 9, "w": 12, "x": 0, "y": 25}, {"h": 9, "w": 12, "x": 0, "y": 25},
unit="req/s", unit="req/s",
legend="{{router}}", legend="{{router}}",
instant=True, legend_display="table",
thresholds=traffic_thresholds, legend_placement="right",
description="Current five-minute request rate, with one vertically aligned lane per router.",
) )
) )
panels.append( panels.append(
bargauge_panel( timeseries_panel(
12, 12,
"Traefik Entrypoints (req/s)", "Traefik Entrypoints (req/s)",
'sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m]))', 'sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m]))',
{"h": 9, "w": 12, "x": 12, "y": 25}, {"h": 9, "w": 12, "x": 12, "y": 25},
unit="req/s", unit="req/s",
legend="{{entrypoint}}", legend="{{entrypoint}}",
instant=True, legend_display="table",
thresholds=traffic_thresholds, legend_placement="right",
description="Current five-minute request rate, with one vertically aligned lane per entrypoint.",
) )
) )
return { return {

17
scripts/tests/test_dashboards_render_atlas.py
View File

@ -52,23 +52,6 @@ def test_node_filter_and_expr_helpers():
assert "node_memory_MemAvailable_bytes" in mem_expr assert "node_memory_MemAvailable_bytes" in mem_expr
def test_network_routes_render_as_vertical_lanes():
mod = load_module()
dashboard = mod.build_network_dashboard()
panels_by_title = {panel["title"]: panel for panel in dashboard["panels"]}
for title, label in (
("Traefik Routers (req/s)", "{{router}}"),
("Traefik Entrypoints (req/s)", "{{entrypoint}}"),
):
panel = panels_by_title[title]
assert panel["type"] == "bargauge"
assert panel["options"]["orientation"] == "horizontal"
assert panel["targets"][0]["instant"] is True
assert panel["targets"][0]["legendFormat"] == label
assert "one vertically aligned lane" in panel["description"]
def test_overview_availability_panel_uses_recorded_365d_rollup(): def test_overview_availability_panel_uses_recorded_365d_rollup():
mod = load_module() mod = load_module()
dashboard = mod.build_overview() dashboard = mod.build_overview()

102
services/monitoring/dashboards/atlas-network.json
View File

@ -579,7 +579,7 @@
}, },
{ {
"id": 11, "id": 11,
"type": "bargauge", "type": "timeseries",
"title": "Traefik Routers (req/s)", "title": "Traefik Routers (req/s)",
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
@ -593,59 +593,30 @@
}, },
"targets": [ "targets": [
{ {
"expr": "sort_desc(topk(10, sum by (router) (rate(traefik_router_requests_total[5m]))))", "expr": "topk(10, sum by (router) (rate(traefik_router_requests_total[5m])))",
"refId": "A", "refId": "A",
"legendFormat": "{{router}}", "legendFormat": "{{router}}"
"instant": true
} }
], ],
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "unit": "req/s"
"mode": "thresholds"
},
"unit": "req/s",
"min": 0,
"max": null,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "dark-blue",
"value": null
}
]
}
}, },
"overrides": [] "overrides": []
}, },
"options": { "options": {
"displayMode": "basic", "legend": {
"orientation": "horizontal", "displayMode": "table",
"reduceOptions": { "placement": "right"
"calcs": [ },
"lastNotNull" "tooltip": {
], "mode": "multi"
"fields": "",
"values": false
} }
}, }
"description": "Current five-minute request rate, with one vertically aligned lane per router.",
"transformations": [
{
"id": "sortBy",
"options": {
"fields": [
"Value"
],
"order": "desc"
}
}
]
}, },
{ {
"id": 12, "id": 12,
"type": "bargauge", "type": "timeseries",
"title": "Traefik Entrypoints (req/s)", "title": "Traefik Entrypoints (req/s)",
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
@ -659,55 +630,26 @@
}, },
"targets": [ "targets": [
{ {
"expr": "sort_desc(sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m])))", "expr": "sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m]))",
"refId": "A", "refId": "A",
"legendFormat": "{{entrypoint}}", "legendFormat": "{{entrypoint}}"
"instant": true
} }
], ],
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "unit": "req/s"
"mode": "thresholds"
},
"unit": "req/s",
"min": 0,
"max": null,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "dark-blue",
"value": null
}
]
}
}, },
"overrides": [] "overrides": []
}, },
"options": { "options": {
"displayMode": "basic", "legend": {
"orientation": "horizontal", "displayMode": "table",
"reduceOptions": { "placement": "right"
"calcs": [ },
"lastNotNull" "tooltip": {
], "mode": "multi"
"fields": "",
"values": false
} }
}, }
"description": "Current five-minute request rate, with one vertically aligned lane per entrypoint.",
"transformations": [
{
"id": "sortBy",
"options": {
"fields": [
"Value"
],
"order": "desc"
}
}
]
} }
], ],
"time": { "time": {

102
services/monitoring/grafana-dashboard-network.yaml
View File

@ -588,7 +588,7 @@ data:
}, },
{ {
"id": 11, "id": 11,
"type": "bargauge", "type": "timeseries",
"title": "Traefik Routers (req/s)", "title": "Traefik Routers (req/s)",
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
@ -602,59 +602,30 @@ data:
}, },
"targets": [ "targets": [
{ {
"expr": "sort_desc(topk(10, sum by (router) (rate(traefik_router_requests_total[5m]))))", "expr": "topk(10, sum by (router) (rate(traefik_router_requests_total[5m])))",
"refId": "A", "refId": "A",
"legendFormat": "{{router}}", "legendFormat": "{{router}}"
"instant": true
} }
], ],
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "unit": "req/s"
"mode": "thresholds"
},
"unit": "req/s",
"min": 0,
"max": null,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "dark-blue",
"value": null
}
]
}
}, },
"overrides": [] "overrides": []
}, },
"options": { "options": {
"displayMode": "basic", "legend": {
"orientation": "horizontal", "displayMode": "table",
"reduceOptions": { "placement": "right"
"calcs": [ },
"lastNotNull" "tooltip": {
], "mode": "multi"
"fields": "",
"values": false
} }
}, }
"description": "Current five-minute request rate, with one vertically aligned lane per router.",
"transformations": [
{
"id": "sortBy",
"options": {
"fields": [
"Value"
],
"order": "desc"
}
}
]
}, },
{ {
"id": 12, "id": 12,
"type": "bargauge", "type": "timeseries",
"title": "Traefik Entrypoints (req/s)", "title": "Traefik Entrypoints (req/s)",
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
@ -668,55 +639,26 @@ data:
}, },
"targets": [ "targets": [
{ {
"expr": "sort_desc(sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m])))", "expr": "sum by (entrypoint) (rate(traefik_entrypoint_requests_total[5m]))",
"refId": "A", "refId": "A",
"legendFormat": "{{entrypoint}}", "legendFormat": "{{entrypoint}}"
"instant": true
} }
], ],
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "unit": "req/s"
"mode": "thresholds"
},
"unit": "req/s",
"min": 0,
"max": null,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "dark-blue",
"value": null
}
]
}
}, },
"overrides": [] "overrides": []
}, },
"options": { "options": {
"displayMode": "basic", "legend": {
"orientation": "horizontal", "displayMode": "table",
"reduceOptions": { "placement": "right"
"calcs": [ },
"lastNotNull" "tooltip": {
], "mode": "multi"
"fields": "",
"values": false
} }
}, }
"description": "Current five-minute request rate, with one vertically aligned lane per entrypoint.",
"transformations": [
{
"id": "sortBy",
"options": {
"fields": [
"Value"
],
"order": "desc"
}
}
]
} }
], ],
"time": { "time": {