From d629fc38781c70c19988949cc80fc21c32a79311 Mon Sep 17 00:00:00 2001
From: Ludovic Cleroux <ludydoo@gmail.com>
Date: Tue, 18 Jun 2024 09:36:43 +0200
Subject: [PATCH] ROX-24822: Fix acs-cs annotations

---
 .../generated/dashboards/rhacs-central-slo-configmap.yaml     | 4 ++--
 .../generated/dashboards/rhacs-central-slo-dashboard.yaml     | 4 ++--
 .../dashboards/rhacs-cluster-overview-configmap.yaml          | 4 ++--
 .../dashboards/rhacs-cluster-overview-dashboard.yaml          | 4 ++--
 resources/grafana/sources/rhacs-central-slo.json              | 4 ++--
 resources/grafana/sources/rhacs-cluster-overview.json         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml
index 01962278..199a9808 100644
--- a/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml
+++ b/resources/grafana/generated/dashboards/rhacs-central-slo-configmap.yaml
@@ -37,7 +37,7 @@ data:
             },
             "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"
           },
@@ -48,7 +48,7 @@ data:
             },
             "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/generated/dashboards/rhacs-central-slo-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-central-slo-dashboard.yaml
index ff27bad0..f5649166 100644
--- a/resources/grafana/generated/dashboards/rhacs-central-slo-dashboard.yaml
+++ b/resources/grafana/generated/dashboards/rhacs-central-slo-dashboard.yaml
@@ -37,7 +37,7 @@ spec:
             },
             "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"
           },
@@ -48,7 +48,7 @@ spec:
             },
             "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/generated/dashboards/rhacs-cluster-overview-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml
index bfa11a11..06c2a961 100644
--- a/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml
+++ b/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml
@@ -37,7 +37,7 @@ data:
             },
             "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"
           },
@@ -48,7 +48,7 @@ data:
             },
             "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/generated/dashboards/rhacs-cluster-overview-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml
index 6ea35bf0..7c28452d 100644
--- a/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml
+++ b/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml
@@ -37,7 +37,7 @@ spec:
             },
             "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"
           },
@@ -48,7 +48,7 @@ spec:
             },
             "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-central-slo.json b/resources/grafana/sources/rhacs-central-slo.json
index caa3c5a3..d2a77378 100644
--- 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
index 8969a623..ca0e6c24 100644
--- 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"
       }