Merge pull request #2254 from simonpasquier/OCPBUGS-18326

OCPBUGS-18326: add Console cap annotation to dashboards
openshift · Feb 7, 2024 · dbcfed9 · dbcfed9
2 parents 65aa146 + d84f0f3
commit dbcfed9
Show file tree

Hide file tree

Showing 2 changed files with 194 additions and 18 deletions.
diff --git a/jsonnet/components/dashboards.libsonnet b/jsonnet/components/dashboards.libsonnet
@@ -144,26 +144,58 @@ function(params)
     consoleDashboardDefinitions: {
       apiVersion: 'v1',
       kind: 'ConfigMapList',
-      items: std.filterMap(
-        // etcd dashboard is deployed by cluster-etcd-operator
-        // PR: https://github.com/openshift/cluster-etcd-operator/pull/837
-        function(d) d.metadata.name != 'grafana-dashboard-etcd',
+      items: std.flatMap(
         function(d)
-          d {
-            metadata+: {
-              namespace: 'openshift-config-managed',
-              labels+: {
-                'console.openshift.io/dashboard': 'true',
-              } + if std.count(odcDashboards, d.metadata.name) > 0 then {
-                'console.openshift.io/odc-dashboard': 'true',
-              } else {},
+          local name = d.metadata.name;
+          if std.startsWith(name, 'grafana-') then
+            [
+              // Strip the "grafana-" from all dashboard configmaps.
+              d {
+                metadata+: {
+                  name: if std.startsWith(name, 'grafana-') then std.substr(name, std.length('grafana-'), std.length(name)) else name,
+                },
+              },
+              // Tell CVO to remove the old dashboard configmaps prefixed by "grafana-".
+              // It can be removed after OCP 4.16 branch is cut.
+              // See https://issues.redhat.com/browse/OCPBUGS-18326.
+              {
+                apiVersion: 'v1',
+                kind: 'ConfigMap',
+                metadata: {
+                  name: name,
+                  namespace: d.metadata.namespace,
+                  annotations: {
+                    'release.openshift.io/delete': 'true',
+                  },
+                },
+              },
+            ]
+          else
+            [d],
+        std.filterMap(
+          // etcd dashboard is deployed by cluster-etcd-operator
+          // PR: https://github.com/openshift/cluster-etcd-operator/pull/837
+          function(d) d.metadata.name != 'grafana-dashboard-etcd',
+          function(d)
+            d {
+              metadata+: {
+                namespace: 'openshift-config-managed',
+                annotations+: {
+                  'capability.openshift.io/name': 'Console',
+                },
+                labels+: {
+                  'console.openshift.io/dashboard': 'true',
+                } + if std.count(odcDashboards, d.metadata.name) > 0 then {
+                  'console.openshift.io/odc-dashboard': 'true',
+                } else {},
+              },
             },
-          },
-        // Openshift Console cannot show chart with both stacked and unstacked metrics,
-        // so charts with metrics such as request/quota/limit show all metrics in
-        // an unstacked way to avoid confusion.
-        // please refer to: https://issues.redhat.com/browse/OCPBUGS-5353
-        nodeRoleTemplate(unstackDashboards(glib.dashboardDefinitions.items)),
+          // Openshift Console cannot show chart with both stacked and unstacked metrics,
+          // so charts with metrics such as request/quota/limit show all metrics in
+          // an unstacked way to avoid confusion.
+          // please refer to: https://issues.redhat.com/browse/OCPBUGS-5353
+          nodeRoleTemplate(unstackDashboards(glib.dashboardDefinitions.items)),
+        ),
       ),
     },
   }
diff --git a/manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml b/manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
@@ -1865,12 +1865,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-cluster-total
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-cluster-total
   namespace: openshift-config-managed
 ---
@@ -4863,12 +4875,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-k8s-resources-cluster
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-cluster
   namespace: openshift-config-managed
 ---
@@ -7570,13 +7594,25 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
     console.openshift.io/odc-dashboard: "true"
+  name: dashboard-k8s-resources-namespace
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-namespace
   namespace: openshift-config-managed
 ---
@@ -8582,12 +8618,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-k8s-resources-node
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-node
   namespace: openshift-config-managed
 ---
@@ -10484,13 +10532,25 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
     console.openshift.io/odc-dashboard: "true"
+  name: dashboard-k8s-resources-pod
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-pod
   namespace: openshift-config-managed
 ---
@@ -12449,13 +12509,25 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
     console.openshift.io/odc-dashboard: "true"
+  name: dashboard-k8s-resources-workload
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-workload
   namespace: openshift-config-managed
 ---
@@ -14567,13 +14639,25 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
     console.openshift.io/odc-dashboard: "true"
+  name: dashboard-k8s-resources-workloads-namespace
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-k8s-resources-workloads-namespace
   namespace: openshift-config-managed
 ---
@@ -16025,12 +16109,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-namespace-by-pod
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-namespace-by-pod
   namespace: openshift-config-managed
 ---
@@ -17080,12 +17176,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-node-cluster-rsrc-use
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-node-cluster-rsrc-use
   namespace: openshift-config-managed
 ---
@@ -18189,12 +18297,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-node-rsrc-use
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-node-rsrc-use
   namespace: openshift-config-managed
 ---
@@ -19410,12 +19530,24 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-pod-total
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-pod-total
   namespace: openshift-config-managed
 ---
@@ -20654,11 +20786,23 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
+    capability.openshift.io/name: Console
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   labels:
     app.kubernetes.io/part-of: openshift-monitoring
     console.openshift.io/dashboard: "true"
+  name: dashboard-prometheus
+  namespace: openshift-config-managed
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
   name: grafana-dashboard-prometheus
   namespace: openshift-config-managed