chore: update configuration/telemeter/metrics.json

Signed-off-by: Simon Pasquier <[email protected]>
rhobs · Jun 4, 2024 · 11cf2b8 · 11cf2b8
1 parent d2353fb
commit 11cf2b8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"}