Merge pull request #243 from stackrox/master

sync: master to stage
stackrox · May 11, 2024 · 4a5b965 · 4a5b965
2 parents 2b7d9ec + 97f63bd
commit 4a5b965
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 43 deletions.
diff --git a/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml
diff --git a/resources/grafana/generated/dashboards/rhacs-central-slo-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-central-slo-dashboard.yaml
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-central-slo.json b/resources/grafana/sources/rhacs-central-slo.json
@@ -18,6 +18,28 @@
           "type": "dashboard"
         },
         "type": "dashboard"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "enable": true,
+        "iconColor": "purple",
+        "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": "red",
+        "expr": "count (count by (gitVersion) (openshift_apiserver_build_info)) > 1",
+        "name": "OpenShift Upgrade",
+        "textFormat": "OpenShift Upgrade"
       }
     ]
   },

diff --git a/resources/grafana/sources/rhacs-cluster-overview.json b/resources/grafana/sources/rhacs-cluster-overview.json
@@ -18,6 +18,28 @@
           "type": "dashboard"
         },
         "type": "dashboard"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "enable": true,
+        "iconColor": "purple",
+        "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": "red",
+        "expr": "count (count by (gitVersion) (openshift_apiserver_build_info)) > 1",
+        "name": "OpenShift Upgrade",
+        "textFormat": "OpenShift Upgrade"
       }
     ]
   },

diff --git a/resources/index.json b/resources/index.json
@@ -4,10 +4,9 @@
     "prometheus": {
       "pod_monitors": [
         "prometheus/pod_monitors/prometheus-self-metrics.yaml",
-        "prometheus/pod_monitors/rhacs-central-metrics.yaml",
         "prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml",
         "prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml",
-        "prometheus/pod_monitors/rhacs-scanner-metrics.yaml"
+        "prometheus/pod_monitors/rhacs-tenant-metrics.yaml"
       ],
       "rules": [
         "prometheus/billing-rules.yaml",

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
diff --git a/resources/prometheus/pod_monitors/rhacs-scanner-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-scanner-metrics.yaml
diff --git a/...s/pod_monitors/rhacs-central-metrics.yaml → ...us/pod_monitors/rhacs-tenant-metrics.yaml b/...s/pod_monitors/rhacs-central-metrics.yaml → ...us/pod_monitors/rhacs-tenant-metrics.yaml
@@ -1,13 +1,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: rhacs-central-metrics
+  name: rhacs-tenant-metrics
   labels:
     app: rhacs
 spec:
   selector:
     matchLabels:
-      app: "central"
+      app.kubernetes.io/name: stackrox
   namespaceSelector:
     any: true
   podMetricsEndpoints:

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