Restore namespace plurality panel data

scripts/dashboards_render_atlas.py

@@ -1203,23 +1203,23 @@ def build_pods_dashboard():
     )
     score_expr = f"{share_expr} + on(node) group_left() ({rank_expr})"
     mask_expr = (
-        f"{score_expr} == bool on(namespace) group_left() "
+        f"{share_expr} == bool on(namespace) group_left() "
-        f"(max by (namespace) ({score_expr}))"
+        f"(max by (namespace) ({share_expr}))"
     )
-    nonzero_expr = f"{share_expr} > bool 0"
     panels.append(
         table_panel(
             10,
-            "Namespace Plurality by Node v23",
+            "Namespace Plurality by Node v24",
             (
                 f"{share_expr} * on(namespace,node) group_left() "
-                f"({mask_expr}) * on(namespace,node) group_left() ({nonzero_expr})"
+                f"({mask_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"},

services/monitoring/dashboards/atlas-pods.json

@@ -507,7 +507,7 @@
     {
       "id": 10,
       "type": "table",
-      "title": "Namespace Plurality by Node v23",
+      "title": "Namespace Plurality by Node v24",
       "datasource": {
         "type": "prometheus",
         "uid": "atlas-vm"
@@ -520,7 +520,7 @@
       },
       "targets": [
         {
-          "expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1e-6 * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 1e-6 * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 1e-6 * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 1e-6 * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 1e-6 * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 1e-6 * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 1e-6 * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 1e-6 * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 1e-6 * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 1e-6 * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 1e-6 * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 1e-6 * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 1e-6 * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 1e-6 * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 1e-6 * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 1e-6 * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 1e-6 * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 1e-6 * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 1e-6 * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 1e-6 * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 1e-6 * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 1e-6 * 22)) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1e-6 * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 1e-6 * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 1e-6 * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 1e-6 * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 1e-6 * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 1e-6 * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 1e-6 * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 1e-6 * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 1e-6 * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 1e-6 * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 1e-6 * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 1e-6 * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 1e-6 * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 1e-6 * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 1e-6 * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 1e-6 * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 1e-6 * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 1e-6 * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 1e-6 * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 1e-6 * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 1e-6 * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 1e-6 * 22))))) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) > bool 0)",
+          "expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100))))",
           "refId": "A",
           "instant": true,
           "format": "table"
@@ -558,6 +558,14 @@
             }
           }
         },
+        {
+          "id": "filterByValue",
+          "options": {
+            "match": "Value",
+            "operator": "gt",
+            "value": 0
+          }
+        },
         {
           "id": "sortBy",
           "options": {

services/monitoring/grafana-dashboard-pods.yaml

@@ -516,7 +516,7 @@ data:
         {
           "id": 10,
           "type": "table",
-          "title": "Namespace Plurality by Node v23",
+          "title": "Namespace Plurality by Node v24",
           "datasource": {
             "type": "prometheus",
             "uid": "atlas-vm"
@@ -529,7 +529,7 @@ data:
           },
           "targets": [
             {
-              "expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1e-6 * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 1e-6 * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 1e-6 * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 1e-6 * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 1e-6 * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 1e-6 * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 1e-6 * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 1e-6 * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 1e-6 * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 1e-6 * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 1e-6 * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 1e-6 * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 1e-6 * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 1e-6 * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 1e-6 * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 1e-6 * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 1e-6 * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 1e-6 * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 1e-6 * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 1e-6 * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 1e-6 * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 1e-6 * 22)) == bool on(namespace) group_left() (max by (namespace) ((sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) + on(node) group_left() ((sum by (node) (kube_node_info{node=\"titan-0a\"}) * 1e-6 * 1) + (sum by (node) (kube_node_info{node=\"titan-0b\"}) * 1e-6 * 2) + (sum by (node) (kube_node_info{node=\"titan-0c\"}) * 1e-6 * 3) + (sum by (node) (kube_node_info{node=\"titan-db\"}) * 1e-6 * 4) + (sum by (node) (kube_node_info{node=\"titan-04\"}) * 1e-6 * 5) + (sum by (node) (kube_node_info{node=\"titan-05\"}) * 1e-6 * 6) + (sum by (node) (kube_node_info{node=\"titan-06\"}) * 1e-6 * 7) + (sum by (node) (kube_node_info{node=\"titan-07\"}) * 1e-6 * 8) + (sum by (node) (kube_node_info{node=\"titan-08\"}) * 1e-6 * 9) + (sum by (node) (kube_node_info{node=\"titan-09\"}) * 1e-6 * 10) + (sum by (node) (kube_node_info{node=\"titan-10\"}) * 1e-6 * 11) + (sum by (node) (kube_node_info{node=\"titan-11\"}) * 1e-6 * 12) + (sum by (node) (kube_node_info{node=\"titan-12\"}) * 1e-6 * 13) + (sum by (node) (kube_node_info{node=\"titan-13\"}) * 1e-6 * 14) + (sum by (node) (kube_node_info{node=\"titan-14\"}) * 1e-6 * 15) + (sum by (node) (kube_node_info{node=\"titan-15\"}) * 1e-6 * 16) + (sum by (node) (kube_node_info{node=\"titan-16\"}) * 1e-6 * 17) + (sum by (node) (kube_node_info{node=\"titan-17\"}) * 1e-6 * 18) + (sum by (node) (kube_node_info{node=\"titan-18\"}) * 1e-6 * 19) + (sum by (node) (kube_node_info{node=\"titan-19\"}) * 1e-6 * 20) + (sum by (node) (kube_node_info{node=\"titan-22\"}) * 1e-6 * 21) + (sum by (node) (kube_node_info{node=\"titan-24\"}) * 1e-6 * 22))))) * on(namespace,node) group_left() ((sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100) > bool 0)",
+              "expr": "(sum by (namespace,node) (kube_pod_info{pod!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / 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!=\"\" , node!=\"\"}) / on(namespace) group_left() clamp_min(sum by (namespace) (kube_pod_info{pod!=\"\"}), 1) * 100))))",
               "refId": "A",
               "instant": true,
               "format": "table"
@@ -567,6 +567,14 @@ data:
                 }
               }
             },
+            {
+              "id": "filterByValue",
+              "options": {
+                "match": "Value",
+                "operator": "gt",
+                "value": 0
+              }
+            },
             {
               "id": "sortBy",
               "options": {