Update Telemeter metrics allow-list (#704)

* Update Telemeter metrics allow-list * Fix generated files
rhobs · Nov 13, 2024 · 6e20a24 · 6e20a24
1 parent 238f33c
commit 6e20a24
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/configuration/telemeter/metrics.json b/configuration/telemeter/metrics.json
@@ -199,6 +199,7 @@
   "{__name__=\"type:tempo_operator_tempostack_multi_tenancy:sum\",type=~\"enabled|disabled\"}",
   "{__name__=\"type:tempo_operator_tempostack_storage_backend:sum\",type=~\"azure|gcs|s3\"}",
   "{__name__=\"up\"}",
+  "{__name__=\"vendor_model:node_accelerator_cards:sum\",vendor=~\"NVIDIA\",model=~\"A100|RTX_A6000|RTX_4090|A40|V100\"}",
   "{__name__=\"visual_web_terminal_sessions_total\"}",
   "{__name__=\"workload:cpu_usage_cores:sum\"}",
   "{__name__=\"workload:memory_usage_bytes:sum\"}",

diff --git a/crds/loki.grafana.com_alertingrules.libsonnet b/crds/loki.grafana.com_alertingrules.libsonnet
@@ -8,11 +8,11 @@
     },
     creationTimestamp: null,
     labels: {
-      'app.kubernetes.io/instance': 'loki-operator-v0.7.0',
+      'app.kubernetes.io/instance': 'loki-operator-v0.7.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.7.0',
+      'app.kubernetes.io/version': '0.7.1',
     },
     name: 'alertingrules.loki.grafana.com',
   },

diff --git a/crds/loki.grafana.com_recordingrules.libsonnet b/crds/loki.grafana.com_recordingrules.libsonnet
@@ -8,11 +8,11 @@
     },
     creationTimestamp: null,
     labels: {
-      'app.kubernetes.io/instance': 'loki-operator-v0.7.0',
+      'app.kubernetes.io/instance': 'loki-operator-v0.7.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.7.0',
+      'app.kubernetes.io/version': '0.7.1',
     },
     name: 'recordingrules.loki.grafana.com',
   },

diff --git a/resources/crds/observatorium-logs-crds-template.yaml b/resources/crds/observatorium-logs-crds-template.yaml
@@ -11,11 +11,11 @@ objects:
       controller-gen.kubebuilder.io/version: v0.16.3
     creationTimestamp: null
     labels:
-      app.kubernetes.io/instance: loki-operator-v0.7.0
+      app.kubernetes.io/instance: loki-operator-v0.7.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.7.0
+      app.kubernetes.io/version: 0.7.1
     name: alertingrules.loki.grafana.com
   spec:
     group: loki.grafana.com
@@ -348,11 +348,11 @@ objects:
       controller-gen.kubebuilder.io/version: v0.16.3
     creationTimestamp: null
     labels:
-      app.kubernetes.io/instance: loki-operator-v0.7.0
+      app.kubernetes.io/instance: loki-operator-v0.7.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.7.0
+      app.kubernetes.io/version: 0.7.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
@@ -293,6 +293,7 @@ objects:
           - --whitelist={__name__="type:tempo_operator_tempostack_multi_tenancy:sum",type=~"enabled|disabled"}
           - --whitelist={__name__="type:tempo_operator_tempostack_storage_backend:sum",type=~"azure|gcs|s3"}
           - --whitelist={__name__="up"}
+          - --whitelist={__name__="vendor_model:node_accelerator_cards:sum",vendor=~"NVIDIA",model=~"A100|RTX_A6000|RTX_4090|A40|V100"}
           - --whitelist={__name__="visual_web_terminal_sessions_total"}
           - --whitelist={__name__="workload:cpu_usage_cores:sum"}
           - --whitelist={__name__="workload:memory_usage_bytes:sum"}
@@ -594,6 +595,7 @@ objects:
           - --whitelist={__name__="type:tempo_operator_tempostack_multi_tenancy:sum",type=~"enabled|disabled"}
           - --whitelist={__name__="type:tempo_operator_tempostack_storage_backend:sum",type=~"azure|gcs|s3"}
           - --whitelist={__name__="up"}
+          - --whitelist={__name__="vendor_model:node_accelerator_cards:sum",vendor=~"NVIDIA",model=~"A100|RTX_A6000|RTX_4090|A40|V100"}
           - --whitelist={__name__="visual_web_terminal_sessions_total"}
           - --whitelist={__name__="workload:cpu_usage_cores:sum"}
           - --whitelist={__name__="workload:memory_usage_bytes:sum"}