ROX-24055: Annotations for cluster upgrades

stackrox · May 7, 2024 · cb58b71 · cb58b71
1 parent 229cc85
commit cb58b71
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml
diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml
diff --git a/resources/grafana/sources/rhacs-cluster-overview.json b/resources/grafana/sources/rhacs-cluster-overview.json
@@ -25,10 +25,21 @@
           "uid": "PBFA97CFB590B2093"
         },
         "enable": true,
-        "expr": "count (count by (git_version) (label_replace(kubernetes_build_info{job!~\"kube-dns|coredns\"}, \"git_version\", \"$1\", \"git_version\", \"(v[0-9]*.[0-9]*).*\"))) > 1",
         "iconColor": "purple",
-        "name": "Upgrade",
+        "expr": "count (count by (git_version) (label_replace(kubernetes_build_info{job!~\"kube-dns|coredns\"}, \"git_version\", \"$1\", \"git_version\", \"(v[0-9]*.[0-9]*).*\"))) > 1",
+        "name": "Kubernetes Upgrade",
         "textFormat": "Kubernetes Upgrade"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "enable": true,
+        "iconColor": "purple",
+        "expr": "count (count by (gitVersion) (openshift_apiserver_build_info)) > 1",
+        "name": "Openshift Upgrade",
+        "textFormat": "Openshift Upgrade"
       }
     ]
   },

diff --git a/resources/prometheus/federation-config-base.yaml b/resources/prometheus/federation-config-base.yaml
@@ -3,3 +3,4 @@
 match[]:
   # This is an example.
   - up{job!~"central|scanner"}
+  - openshift_apiserver_build_info
diff --git a/resources/prometheus/federation-config.yaml b/resources/prometheus/federation-config.yaml