diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 58bb4d24dd6..0883ed86daf 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -303,8 +303,8 @@ "subdir": "jsonnet/telemeter" } }, - "version": "36999a33bdeb42c6f25d099985c98f346f83c1f3", - "sum": "uXGo7tcHOkLNS53J0o64vhrNl+dc1SYY4hkrBoxitz8=" + "version": "76213272326b432a504dd59db593b94890541342", + "sum": "h+pIb5Vnc+Dcpu1awzb9HLTHa+Hv1q6OAoIqbgxgHsk=" }, { "source": { diff --git a/resources/services/observatorium-metrics-template.yaml b/resources/services/observatorium-metrics-template.yaml index 777440bbb96..6a4e75a2dc3 100644 --- a/resources/services/observatorium-metrics-template.yaml +++ b/resources/services/observatorium-metrics-template.yaml @@ -2331,7 +2331,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)"), "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"