diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 616b440..4878d07 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1181,12 +1181,12 @@ def build_pods_dashboard(): "(" " {share}" " * on(namespace) group_left(node)" - " ({share} >= bool on(namespace) group_left() (max by (namespace) ({share}) - 1e-9))" + " ({share} == bool on(namespace) group_left() (max by (namespace) ({share})))" ") * 100" ).format( share=( "(sum by (namespace,node) (kube_pod_info{pod!=\"\"}) " - "/ on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1))" + "/ ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1))" ) ), {"h": 8, "w": 24, "x": 0, "y": 42}, diff --git a/services/monitoring/dashboards/atlas-pods.json b/services/monitoring/dashboards/atlas-pods.json index 9f0ec0d..8416b55 100644 --- a/services/monitoring/dashboards/atlas-pods.json +++ b/services/monitoring/dashboards/atlas-pods.json @@ -508,7 +508,7 @@ }, "targets": [ { - "expr": "( (sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) * on(namespace) group_left(node) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) >= bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1))) - 1e-9))) * 100", + "expr": "( (sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) * on(namespace) group_left(node) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)))))) * 100", "refId": "A", "instant": true } diff --git a/services/monitoring/grafana-dashboard-pods.yaml b/services/monitoring/grafana-dashboard-pods.yaml index fcfb5d6..63cad9e 100644 --- a/services/monitoring/grafana-dashboard-pods.yaml +++ b/services/monitoring/grafana-dashboard-pods.yaml @@ -517,7 +517,7 @@ data: }, "targets": [ { - "expr": "( (sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) * on(namespace) group_left(node) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) >= bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / on(namespace) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1))) - 1e-9))) * 100", + "expr": "( (sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) * on(namespace) group_left(node) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\"}) / ignoring(node) clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1)))))) * 100", "refId": "A", "instant": true }