Merge branch 'main' into add-failed-pod-container-pending

newrelic · Nov 7, 2023 · 581e59e · 581e59e
2 parents acf163d + 2a27ee2
commit 581e59e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/e2e/1_24-exceptions.yml b/e2e/1_24-exceptions.yml
@@ -1,4 +1,2 @@
 # This metrics are not present on 1.24
-except_metrics:
-# etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
-- k8s.apiserver.etcd.objectCount_*
+except_metrics: []
diff --git a/e2e/1_25-exceptions.yml b/e2e/1_25-exceptions.yml
@@ -1,4 +1,2 @@
 # This metrics are not present on 1.25
-except_metrics:
-# etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
-- k8s.apiserver.etcd.objectCount_*
+except_metrics: []
diff --git a/e2e/1_26-exceptions.yml b/e2e/1_26-exceptions.yml
@@ -1,4 +1,2 @@
 # This metrics are not present on 1.26
-except_metrics:
-# etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
-- k8s.apiserver.etcd.objectCount_*
+except_metrics: []
diff --git a/e2e/1_27-exceptions.yml b/e2e/1_27-exceptions.yml
@@ -1,4 +1,2 @@
 # This metrics are not present on 1.27
-except_metrics:
-# etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
-- k8s.apiserver.etcd.objectCount_*
+except_metrics: []
diff --git a/e2e/1_28-exceptions.yml b/e2e/1_28-exceptions.yml
@@ -1,4 +1,2 @@
 # This metrics are not present on 1.28
-except_metrics:
-# etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
-- k8s.apiserver.etcd.objectCount_*
+except_metrics: []
diff --git a/e2e/test-specs.yml b/e2e/test-specs.yml
@@ -112,6 +112,9 @@ scenarios:
             # Labels are attributes, not metrics. This erroneous metric has been removed
             - k8s.hpa.labels
 
+            # etcd_object_counts was deprecated in k8s 1.22 and removed in 1.23 (replaced by apiserver_storage_objects)
+            - k8s.apiserver.etcd.objectCount_*
+
   - description: |
       This scenario will verify that metrics from a k8s Cluster are correctly collected without privileges.
     before: