Merge pull request #245 from stackrox/ROX-24822-fix-acscs-annotations

ROX-24822: Fix acs-cs annotations
stackrox · Jun 18, 2024 · 60458f2 · 60458f2
2 parents ab1c241 + d629fc3
commit 60458f2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 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
@@ -26,7 +26,7 @@
         },
         "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",
+        "expr": "count (count by (git_version) (label_replace(count_over_time(kubernetes_build_info{job!~\"kube-dns|coredns\"}[${__interval}]), \"git_version\", \"$1\", \"git_version\", \"(v[0-9]*.[0-9]*).*\"))) > 1",
         "name": "Kubernetes Upgrade",
         "textFormat": "Kubernetes Upgrade"
       },
@@ -37,7 +37,7 @@
         },
         "enable": true,
         "iconColor": "red",
-        "expr": "count (count by (gitVersion) (openshift_apiserver_build_info)) > 1",
+        "expr": "count (count by (gitVersion) (count_over_time (openshift_apiserver_build_info[${__interval}]))) > 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
@@ -26,7 +26,7 @@
         },
         "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",
+        "expr": "count (count by (git_version) (label_replace(count_over_time(kubernetes_build_info{job!~\"kube-dns|coredns\"}[${__interval}]), \"git_version\", \"$1\", \"git_version\", \"(v[0-9]*.[0-9]*).*\"))) > 1",
         "name": "Kubernetes Upgrade",
         "textFormat": "Kubernetes Upgrade"
       },
@@ -37,7 +37,7 @@
         },
         "enable": true,
         "iconColor": "red",
-        "expr": "count (count by (gitVersion) (openshift_apiserver_build_info)) > 1",
+        "expr": "count (count by (gitVersion) (count_over_time (openshift_apiserver_build_info[${__interval}]))) > 1",
         "name": "OpenShift Upgrade",
         "textFormat": "OpenShift Upgrade"
       }