From 11cf2b87917da9eb4c8d95393d6161e401690997 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 4 Jun 2024 11:03:48 +0200 Subject: [PATCH] chore: update configuration/telemeter/metrics.json Signed-off-by: Simon Pasquier --- configuration/telemeter/metrics.json | 3 ++- crds/loki.grafana.com_alertingrules.libsonnet | 4 ++-- crds/loki.grafana.com_recordingrules.libsonnet | 4 ++-- resources/crds/observatorium-logs-crds-template.yaml | 8 ++++---- resources/services/telemeter-template.yaml | 6 ++++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configuration/telemeter/metrics.json b/configuration/telemeter/metrics.json index 9270b47f35..c491cefb58 100644 --- a/configuration/telemeter/metrics.json +++ b/configuration/telemeter/metrics.json @@ -74,6 +74,7 @@ "{__name__=\"cluster_version_capability\"}", "{__name__=\"cluster_version_payload\"}", "{__name__=\"cnv:vmi_status_running:count\"}", + "{__name__=\"cnv_abnormal\", reason=~\"memory_working_set_delta_from_request|memory_rss_delta_from_request\"}", "{__name__=\"code:apiserver_request_count:rate:sum\"}", "{__name__=\"code:apiserver_request_total:rate:sum\"}", "{__name__=\"console_url\"}", @@ -86,8 +87,8 @@ "{__name__=\"eo_es_misconfigured_memory_resources_info\"}", "{__name__=\"eo_es_redundancy_policy_info\"}", "{__name__=\"eo_es_storage_info\"}", - "{__name__=\"hypershift_cluster_cores\"}", "{__name__=\"hostedcluster:hypershift_cluster_vcpus:max\"}", + "{__name__=\"hypershift_cluster_cores\"}", "{__name__=\"imageregistry:imagestreamtags_count:sum\"}", "{__name__=\"imageregistry:operations_count:sum\"}", "{__name__=\"insightsclient_request_send_total\"}", diff --git a/crds/loki.grafana.com_alertingrules.libsonnet b/crds/loki.grafana.com_alertingrules.libsonnet index b3fa60fb7a..886472b498 100644 --- a/crds/loki.grafana.com_alertingrules.libsonnet +++ b/crds/loki.grafana.com_alertingrules.libsonnet @@ -7,11 +7,11 @@ }, creationTimestamp: null, labels: { - 'app.kubernetes.io/instance': 'loki-operator-v0.6.0', + 'app.kubernetes.io/instance': 'loki-operator-v0.6.1', 'app.kubernetes.io/managed-by': 'operator-lifecycle-manager', 'app.kubernetes.io/name': 'loki-operator', 'app.kubernetes.io/part-of': 'loki-operator', - 'app.kubernetes.io/version': '0.6.0', + 'app.kubernetes.io/version': '0.6.1', }, name: 'alertingrules.loki.grafana.com', }, diff --git a/crds/loki.grafana.com_recordingrules.libsonnet b/crds/loki.grafana.com_recordingrules.libsonnet index a9ba7ae7a6..a9f523f78b 100644 --- a/crds/loki.grafana.com_recordingrules.libsonnet +++ b/crds/loki.grafana.com_recordingrules.libsonnet @@ -7,11 +7,11 @@ }, creationTimestamp: null, labels: { - 'app.kubernetes.io/instance': 'loki-operator-v0.6.0', + 'app.kubernetes.io/instance': 'loki-operator-v0.6.1', 'app.kubernetes.io/managed-by': 'operator-lifecycle-manager', 'app.kubernetes.io/name': 'loki-operator', 'app.kubernetes.io/part-of': 'loki-operator', - 'app.kubernetes.io/version': '0.6.0', + 'app.kubernetes.io/version': '0.6.1', }, name: 'recordingrules.loki.grafana.com', }, diff --git a/resources/crds/observatorium-logs-crds-template.yaml b/resources/crds/observatorium-logs-crds-template.yaml index 18dd73d070..7c08b95678 100644 --- a/resources/crds/observatorium-logs-crds-template.yaml +++ b/resources/crds/observatorium-logs-crds-template.yaml @@ -10,11 +10,11 @@ objects: controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null labels: - app.kubernetes.io/instance: loki-operator-v0.6.0 + app.kubernetes.io/instance: loki-operator-v0.6.1 app.kubernetes.io/managed-by: operator-lifecycle-manager app.kubernetes.io/name: loki-operator app.kubernetes.io/part-of: loki-operator - app.kubernetes.io/version: 0.6.0 + app.kubernetes.io/version: 0.6.1 name: alertingrules.loki.grafana.com spec: group: loki.grafana.com @@ -356,11 +356,11 @@ objects: controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null labels: - app.kubernetes.io/instance: loki-operator-v0.6.0 + app.kubernetes.io/instance: loki-operator-v0.6.1 app.kubernetes.io/managed-by: operator-lifecycle-manager app.kubernetes.io/name: loki-operator app.kubernetes.io/part-of: loki-operator - app.kubernetes.io/version: 0.6.0 + app.kubernetes.io/version: 0.6.1 name: recordingrules.loki.grafana.com spec: group: loki.grafana.com diff --git a/resources/services/telemeter-template.yaml b/resources/services/telemeter-template.yaml index 092c92df06..7e33f8e031 100644 --- a/resources/services/telemeter-template.yaml +++ b/resources/services/telemeter-template.yaml @@ -168,6 +168,7 @@ objects: - --whitelist={__name__="cluster_version_capability"} - --whitelist={__name__="cluster_version_payload"} - --whitelist={__name__="cnv:vmi_status_running:count"} + - --whitelist={__name__="cnv_abnormal", reason=~"memory_working_set_delta_from_request|memory_rss_delta_from_request"} - --whitelist={__name__="code:apiserver_request_count:rate:sum"} - --whitelist={__name__="code:apiserver_request_total:rate:sum"} - --whitelist={__name__="console_url"} @@ -180,8 +181,8 @@ objects: - --whitelist={__name__="eo_es_misconfigured_memory_resources_info"} - --whitelist={__name__="eo_es_redundancy_policy_info"} - --whitelist={__name__="eo_es_storage_info"} - - --whitelist={__name__="hypershift_cluster_cores"} - --whitelist={__name__="hostedcluster:hypershift_cluster_vcpus:max"} + - --whitelist={__name__="hypershift_cluster_cores"} - --whitelist={__name__="imageregistry:imagestreamtags_count:sum"} - --whitelist={__name__="imageregistry:operations_count:sum"} - --whitelist={__name__="insightsclient_request_send_total"} @@ -444,6 +445,7 @@ objects: - --whitelist={__name__="cluster_version_capability"} - --whitelist={__name__="cluster_version_payload"} - --whitelist={__name__="cnv:vmi_status_running:count"} + - --whitelist={__name__="cnv_abnormal", reason=~"memory_working_set_delta_from_request|memory_rss_delta_from_request"} - --whitelist={__name__="code:apiserver_request_count:rate:sum"} - --whitelist={__name__="code:apiserver_request_total:rate:sum"} - --whitelist={__name__="console_url"} @@ -456,8 +458,8 @@ objects: - --whitelist={__name__="eo_es_misconfigured_memory_resources_info"} - --whitelist={__name__="eo_es_redundancy_policy_info"} - --whitelist={__name__="eo_es_storage_info"} - - --whitelist={__name__="hypershift_cluster_cores"} - --whitelist={__name__="hostedcluster:hypershift_cluster_vcpus:max"} + - --whitelist={__name__="hypershift_cluster_cores"} - --whitelist={__name__="imageregistry:imagestreamtags_count:sum"} - --whitelist={__name__="imageregistry:operations_count:sum"} - --whitelist={__name__="insightsclient_request_send_total"}