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

Fix namespace plurality table query

Browse Source
This commit is contained in:
Brad Stein 2025-12-13 17:29:55 -03:00
parent 3e0a84b074
commit 134a4ad001
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/dashboards_render_atlas.py
View File

@ -1181,21 +1181,20 @@ def build_pods_dashboard():
)
share_expr = (
'(sum by (namespace,node) (kube_pod_info{pod=~".+"}) '
'/ on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod=~".+"}), 1) * 100)'
'(sum by (namespace,node) (kube_pod_info{pod!=""}) '
'/ on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=""}), 1) * 100)'
)
rank_expr = " + ".join(
f"(sum by (node) (kube_node_info{{node=\"{node}\"}}) * {idx})"
for idx, node in enumerate(CONTROL_ALL + WORKER_NODES, start=1)
mask_expr = (
f"{share_expr} == bool on(namespace) group_left() "
f"(max by (namespace) ({share_expr}))"
)
score_expr = f"(({share_expr}) * 1000) + on(node) group_left() ({rank_expr})"
panels.append(
table_panel(
10,
"Namespace Plurality by Node v11",
"Namespace Plurality by Node v16",
(
f"topk by (namespace) (1, {score_expr}) "
f"* on(namespace,node) group_left() ({share_expr})"
f"{share_expr} * on(namespace,node) group_left() "
f"({mask_expr})"
),
{"h": 8, "w": 24, "x": 0, "y": 42},
unit="percent",

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

@ -495,7 +495,7 @@
{
"id": 10,
"type": "table",
"title": "Namespace Plurality by Node v11",
"title": "Namespace Plurality by Node v16",
"datasource": {
"type": "prometheus",
"uid": "atlas-vm"
@ -508,7 +508,7 @@
},
"targets": [
{
"expr": "topk by (namespace) (1, (((sum by (namespace,node) (kube_pod_info{pod=~\".+\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod=~\".+\"}), 1) * 100)) * 1000) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 22))) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod=~\".+\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod=~\".+\"}), 1) * 100))",
"expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100))))",
"refId": "A",
"instant": true
}

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

@ -504,7 +504,7 @@ data:
{
"id": 10,
"type": "table",
"title": "Namespace Plurality by Node v11",
"title": "Namespace Plurality by Node v16",
"datasource": {
"type": "prometheus",
"uid": "atlas-vm"
@ -517,7 +517,7 @@ data:
},
"targets": [
{
"expr": "topk by (namespace) (1, (((sum by (namespace,node) (kube_pod_info{pod=~\".+\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod=~\".+\"}), 1) * 100)) * 1000) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 22))) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod=~\".+\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod=~\".+\"}), 1) * 100))",
"expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100))))",
"refId": "A",
"instant": true
}