From e98a1519c51ed0b72392969f3698cfec2779d777 Mon Sep 17 00:00:00 2001 From: Philip Gough Date: Thu, 14 Nov 2024 11:42:35 +0000 Subject: [PATCH] telemeter bump and make generate (#706) --- jsonnetfile.lock.json | 4 ++-- .../observatorium-metrics-ruler-telemeter-template.yaml | 8 ++++---- resources/services/observatorium-metrics-template.yaml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 66da677b55..b58d384d8b 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -293,8 +293,8 @@ "subdir": "jsonnet/telemeter" } }, - "version": "0453f452b7ca677e3be10faa95bea714733b4830", - "sum": "0m1kvO0SH4YoldGek69nhBGMTPxYz3gYcyNhfrymAOE=" + "version": "700802fe29aba4ed602309f0c68222c4bedb08f5", + "sum": "53k2pqb4mjABCulTT/H5d7pQDiemIOO23gzfon7g9K4=" }, { "source": { diff --git a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml index 2de23aca58..e67d15b5c0 100755 --- a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml +++ b/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 --git a/resources/services/observatorium-metrics-template.yaml b/resources/services/observatorium-metrics-template.yaml index ec4b40a09b..318700fe1e 100644 --- a/resources/services/observatorium-metrics-template.yaml +++ b/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"