diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 4d35525..eddcb16 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1192,20 +1192,20 @@ def build_pods_dashboard(): f"{share_expr} == bool on(namespace) group_left() " f"(max by (namespace) ({share_expr}))" ) + nonzero_expr = f"{share_expr} > bool 0" panels.append( table_panel( 10, - "Namespace Plurality by Node v18", + "Namespace Plurality by Node v19", ( f"{share_expr} * on(namespace,node) group_left() " - f"({mask_expr})" + f"({mask_expr}) * on(namespace,node) group_left() ({nonzero_expr})" ), {"h": 8, "w": 24, "x": 0, "y": 42}, unit="percent", transformations=[ {"id": "labelsToFields", "options": {}}, {"id": "organize", "options": {"excludeByName": {"Time": True}}}, - {"id": "filterByValue", "options": {"match": "Value", "operator": "gt", "value": 0}}, {"id": "sortBy", "options": {"fields": ["node", "Value"], "order": "asc"}}, ], instant=True, diff --git a/services/monitoring/dashboards/atlas-pods.json b/services/monitoring/dashboards/atlas-pods.json index 3e935f0..8c5bf94 100644 --- a/services/monitoring/dashboards/atlas-pods.json +++ b/services/monitoring/dashboards/atlas-pods.json @@ -498,7 +498,7 @@ { "id": 10, "type": "table", - "title": "Namespace Plurality by Node v18", + "title": "Namespace Plurality by Node v19", "datasource": { "type": "prometheus", "uid": "atlas-vm" @@ -511,7 +511,7 @@ }, "targets": [ { - "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))))", + "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)))) * 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 0)", "refId": "A", "instant": true } @@ -540,14 +540,6 @@ } } }, - { - "id": "filterByValue", - "options": { - "match": "Value", - "operator": "gt", - "value": 0 - } - }, { "id": "sortBy", "options": { diff --git a/services/monitoring/grafana-dashboard-pods.yaml b/services/monitoring/grafana-dashboard-pods.yaml index 5cf7b00..520b6b5 100644 --- a/services/monitoring/grafana-dashboard-pods.yaml +++ b/services/monitoring/grafana-dashboard-pods.yaml @@ -507,7 +507,7 @@ data: { "id": 10, "type": "table", - "title": "Namespace Plurality by Node v18", + "title": "Namespace Plurality by Node v19", "datasource": { "type": "prometheus", "uid": "atlas-vm" @@ -520,7 +520,7 @@ data: }, "targets": [ { - "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))))", + "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)))) * 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 0)", "refId": "A", "instant": true } @@ -549,14 +549,6 @@ data: } } }, - { - "id": "filterByValue", - "options": { - "match": "Value", - "operator": "gt", - "value": 0 - } - }, { "id": "sortBy", "options": {