ROX-24055: Annotations for cluster upgrades

stackrox · May 6, 2024 · 825ca29 · 825ca29
1 parent 02f45d0
commit 825ca29
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
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
@@ -18,6 +18,17 @@
           "type": "dashboard"
         },
         "type": "dashboard"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "enable": true,
+        "expr": "count by(cluster) (count by (git_version, cluster) (label_replace(kubernetes_build_info{job!~\"kube-dns|coredns\"}, \"git_version\", \"$1\", \"git_version\", \"(v[0-9]*.[0-9]*).*\"))) > 1",
+        "iconColor": "purple",
+        "name": "Upgrade",
+        "textFormat": "Kubernetes Upgrade"
       }
     ]
   },

diff --git a/scripts/generate-federate-match.sh b/scripts/generate-federate-match.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 set -eou pipefail
-shopt -s inherit_errexit
+
+# only if not OSX
+if [[ $(uname) != "Darwin" ]]; then
+    shopt -s inherit_errexit
+fi
 
 function log() {
     echo "$@" >&2