telemeter bump and make generate (#706)

Author: philipgough

Diff for: jsonnetfile.lock.json

@@ -293,8 +293,8 @@
           "subdir": "jsonnet/telemeter"
         }
       },
-      "version": "0453f452b7ca677e3be10faa95bea714733b4830",
-      "sum": "0m1kvO0SH4YoldGek69nhBGMTPxYz3gYcyNhfrymAOE="
+      "version": "700802fe29aba4ed602309f0c68222c4bedb08f5",
+      "sum": "53k2pqb4mjABCulTT/H5d7pQDiemIOO23gzfon7g9K4="
     },
     {
       "source": {

Diff for: resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml

@@ -115,17 +115,17 @@ objects:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: acm_top500_mcs:acm_managed_cluster_info
               - expr: |
-                  max by(_id) (sum_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m]) / scalar(count_over_time(vector(1)[1h:5m])))
+                  max by(_id) (sum_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(steps:count1h)
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: cluster:usage:workload:capacity_physical_cpu_hours
               - expr: |
-                  max by(_id) (count_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(count_over_time(vector(1)[1h:5m]))
+                  max by(_id) (count_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(steps:count1h)
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: cluster:usage:workload:capacity_physical_instance_hours
               - expr: |
-                  sum(sum_over_time(cluster:capacity_cpu_cores:sum{label_node_role_kubernetes_io = ''}[1h:5m])) by (_id) / scalar(count_over_time(vector(1)[1h:5m]))
+                  sum by(_id) (sum_over_time(cluster:capacity_cpu_cores:sum{label_node_role_kubernetes_io = ''}[1h:5m])) / scalar(steps:count1h)
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: cluster:usage:workload:capacity_virtual_cpu_hours
@@ -162,7 +162,7 @@ objects:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: acm_capacity_effective_cpu_cores
               - expr: |
-                  max by(_id)(sum_over_time(hostedcluster:hypershift_cluster_vcpus:max[1h:5m])) / scalar(count_over_time(vector(1)[1h:5m]))
+                  max by(_id) (sum_over_time(hostedcluster:hypershift_cluster_vcpus:max[1h:5m])) / scalar(steps:count1h)
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: hostedcluster:hypershift_cluster_vcpus:vcpu_hours

Diff for: resources/services/observatorium-metrics-template.yaml

@@ -2131,17 +2131,17 @@ objects:
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "acm_top500_mcs:acm_managed_cluster_info"
         - "expr": |
-            max by(_id) (sum_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m]) / scalar(count_over_time(vector(1)[1h:5m])))
+            max by(_id) (sum_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(steps:count1h)
           "labels":
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "cluster:usage:workload:capacity_physical_cpu_hours"
         - "expr": |
-            max by(_id) (count_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(count_over_time(vector(1)[1h:5m]))
+            max by(_id) (count_over_time(cluster:usage:workload:capacity_physical_cpu_cores:max:5m[1h:5m])) / scalar(steps:count1h)
           "labels":
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "cluster:usage:workload:capacity_physical_instance_hours"
         - "expr": |
-            sum(sum_over_time(cluster:capacity_cpu_cores:sum{label_node_role_kubernetes_io = ''}[1h:5m])) by (_id) / scalar(count_over_time(vector(1)[1h:5m]))
+            sum by(_id) (sum_over_time(cluster:capacity_cpu_cores:sum{label_node_role_kubernetes_io = ''}[1h:5m])) / scalar(steps:count1h)
           "labels":
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "cluster:usage:workload:capacity_virtual_cpu_hours"
@@ -2178,7 +2178,7 @@ objects:
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "acm_capacity_effective_cpu_cores"
         - "expr": |
-            max by(_id)(sum_over_time(hostedcluster:hypershift_cluster_vcpus:max[1h:5m])) / scalar(count_over_time(vector(1)[1h:5m]))
+            max by(_id) (sum_over_time(hostedcluster:hypershift_cluster_vcpus:max[1h:5m])) / scalar(steps:count1h)
           "labels":
             "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
           "record": "hostedcluster:hypershift_cluster_vcpus:vcpu_hours"