revert invalid change

Signed-off-by: Thibault Mange <[email protected]>
rhobs · Sep 27, 2024 · 6456d31 · 6456d31
1 parent b9f53b7
commit 6456d31
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml
@@ -37,7 +37,7 @@ objects:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: id_version_ebs_account_internal:cluster_subscribed
               - expr: |
-                  0 * (max by (_id,host_type) (topk by (_id) (1, label_replace(label_replace(label_replace(label_replace(label_replace(label_replace(cluster:virt_platform_nodes:sum, "host_type", "$1", "type", "(aws|ibm_.*|ovirt|none|rhev|gcp|openstack|hyperv|vmware|nutanix)"), "host_type", "virt-unknown", "host_type", ""), "host_type", "kvm-unknown", "type", "kvm"), "host_type", "xen-unknown", "type", "xen.*"), "host_type", "metal", "host_type", "none"), "host_type", "ibm-$1", "host_type", "ibm[_-](power|systemz).*"))) or on(_id) label_replace(max by (_id) (cluster_version{type="current"}), "host_type", "", "host_type", ""))
+                  0 * (max by (_id,host_type) (topk by (_id) (1, label_replace(label_replace(label_replace(label_replace(label_replace(label_replace(cluster:virt_platform_nodes:sum, "host_type", "$1", "type", "(aws|ibm_.*|ovirt|none|rhev|gcp|openstack|hyperv|vmware|nutanix.*)"), "host_type", "virt-unknown", "host_type", ""), "host_type", "kvm-unknown", "type", "kvm"), "host_type", "xen-unknown", "type", "xen.*"), "host_type", "metal", "host_type", "none"), "host_type", "ibm-$1", "host_type", "ibm[_-](power|systemz).*"))) or on(_id) label_replace(max by (_id) (cluster_version{type="current"}), "host_type", "", "host_type", ""))
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: id_primary_host_type
@@ -124,6 +124,23 @@ objects:
                 labels:
                   tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
                 record: cluster:usage:workload:capacity_virtual_cpu_hours
+              - expr: |
+                  group by(_id, tenant_id) (cluster:capacity_cpu_cores:sum{label_node_openshift_io_os_id="rhcos"}) * 0
+                labels:
+                  tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
+                record: cluster:cpu_capacity_cores:_id
+              - expr: |
+                  # worker amd64
+                  (sum by (_id, tenant_id) (cluster:capacity_cpu_cores:sum{label_node_openshift_io_os_id="rhcos",label_node_role_kubernetes_io!="master",label_node_role_kubernetes_io!="infra",label_kubernetes_io_arch="amd64"}) / 2.0 or cluster:cpu_capacity_cores:_id) +
+                  # worker non-amd64
+                  (sum by (_id, tenant_id) (cluster:capacity_cpu_cores:sum{label_node_openshift_io_os_id="rhcos",label_node_role_kubernetes_io!="master",label_node_role_kubernetes_io!="infra",label_kubernetes_io_arch!="amd64"}) or cluster:cpu_capacity_cores:_id) +
+                  # schedulable control plane amd64
+                  (sum by (_id, tenant_id) (cluster:capacity_cpu_cores:sum{label_node_openshift_io_os_id="rhcos",label_node_role_kubernetes_io="master",label_kubernetes_io_arch="amd64"}) * on(_id, tenant_id) group by(_id, tenant_id) (cluster_master_schedulable == 1) / 2.0 or cluster:cpu_capacity_cores:_id) +
+                  # schedulable control plane non-amd64
+                  (sum by (_id, tenant_id) (cluster:capacity_cpu_cores:sum{label_node_openshift_io_os_id="rhcos",label_node_role_kubernetes_io="master",label_kubernetes_io_arch!="amd64"}) * on(_id, tenant_id) group by(_id, tenant_id) (cluster_master_schedulable == 1) or cluster:cpu_capacity_cores:_id)
+                labels:
+                  tenant_id: FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
+                record: cluster:capacity_effective_cpu_cores
   kind: ConfigMap
   metadata:
     creationTimestamp: null