From 0d917c726d655a42ee7aab4402046c99e2f15bf9 Mon Sep 17 00:00:00 2001 From: Mulham Raee Date: Wed, 11 Sep 2024 18:18:06 +0200 Subject: [PATCH] Add hypershift nodepool metrics to telemeter whitelist --- configuration/telemeter/metrics.json | 2 ++ 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 | 4 ++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/configuration/telemeter/metrics.json b/configuration/telemeter/metrics.json index e5e8a73359..4c9329f7bb 100644 --- a/configuration/telemeter/metrics.json +++ b/configuration/telemeter/metrics.json @@ -164,6 +164,8 @@ "{__name__=\"os_image_url_override:sum\"}", "{__name__=\"platform:hypershift_hostedclusters:max\"}", "{__name__=\"platform:hypershift_nodepools:max\"}", + "{__name__=\"cluster_name:hypershift_nodepools_size:sum\"}", + "{__name__=\"cluster_name:hypershift_nodepools_available_replicas:sum\"}", "{__name__=\"pod:eo_es_shards_total:max\"}", "{__name__=\"profile:cluster_monitoring_operator_collection_profile:max\"}", "{__name__=\"rhacs:telemetry:rox_central_info\"}", diff --git a/crds/loki.grafana.com_alertingrules.libsonnet b/crds/loki.grafana.com_alertingrules.libsonnet index 886472b498..e494e69270 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.1', + 'app.kubernetes.io/instance': 'loki-operator-v0.6.2', '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.1', + 'app.kubernetes.io/version': '0.6.2', }, name: 'alertingrules.loki.grafana.com', }, diff --git a/crds/loki.grafana.com_recordingrules.libsonnet b/crds/loki.grafana.com_recordingrules.libsonnet index a9f523f78b..5b0a37246d 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.1', + 'app.kubernetes.io/instance': 'loki-operator-v0.6.2', '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.1', + 'app.kubernetes.io/version': '0.6.2', }, name: 'recordingrules.loki.grafana.com', }, diff --git a/resources/crds/observatorium-logs-crds-template.yaml b/resources/crds/observatorium-logs-crds-template.yaml index 7c08b95678..35118aac58 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.1 + app.kubernetes.io/instance: loki-operator-v0.6.2 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.1 + app.kubernetes.io/version: 0.6.2 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.1 + app.kubernetes.io/instance: loki-operator-v0.6.2 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.1 + app.kubernetes.io/version: 0.6.2 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 28cb0eb72e..de206fd823 100644 --- a/resources/services/telemeter-template.yaml +++ b/resources/services/telemeter-template.yaml @@ -258,6 +258,8 @@ objects: - --whitelist={__name__="os_image_url_override:sum"} - --whitelist={__name__="platform:hypershift_hostedclusters:max"} - --whitelist={__name__="platform:hypershift_nodepools:max"} + - --whitelist={__name__="cluster_name:hypershift_nodepools_size:sum"} + - --whitelist={__name__="cluster_name:hypershift_nodepools_available_replicas:sum"} - --whitelist={__name__="pod:eo_es_shards_total:max"} - --whitelist={__name__="profile:cluster_monitoring_operator_collection_profile:max"} - --whitelist={__name__="rhacs:telemetry:rox_central_info"} @@ -541,6 +543,8 @@ objects: - --whitelist={__name__="os_image_url_override:sum"} - --whitelist={__name__="platform:hypershift_hostedclusters:max"} - --whitelist={__name__="platform:hypershift_nodepools:max"} + - --whitelist={__name__="cluster_name:hypershift_nodepools_size:sum"} + - --whitelist={__name__="cluster_name:hypershift_nodepools_available_replicas:sum"} - --whitelist={__name__="pod:eo_es_shards_total:max"} - --whitelist={__name__="profile:cluster_monitoring_operator_collection_profile:max"} - --whitelist={__name__="rhacs:telemetry:rox_central_info"}