chore(metrics): remove deprecated coredns metrics

SumoLogic · Mar 2, 2023 · 159cf15 · 159cf15
1 parent 23363d9
commit 159cf15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/.changelog/2899.changed.txt b/.changelog/2899.changed.txt
@@ -0,0 +1 @@
+chore(metrics): remove deprecated coredns and etcd metrics
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -1673,24 +1673,23 @@ kube-prometheus-stack:
       interval:
       ## see docs/scraped_metrics.md
       ## coredns:
-      ## coredns_cache_size
       ## coredns_cache_entries
       ## coredns_cache_hits_total
       ## coredns_cache_misses_total
       ## coredns_dns_request_duration_seconds_count
       ## coredns_dns_request_duration_seconds_sum
-      ## coredns_dns_request_count_total
       ## coredns_dns_requests_total
-      ## coredns_dns_response_rcode_count_total
       ## coredns_dns_responses_total
-      ## coredns_forward_request_count_total
       ## coredns_forward_requests_total
       ## process_cpu_seconds_total
       ## process_open_fds
       ## process_resident_memory_bytes
+      ## process_cpu_seconds_total
+      ## process_open_fds
+      ## process_resident_memory_bytes
       metricRelabelings:
         - action: keep
-          regex: (?:coredns_cache_(size|entries|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(dns_request|dns_response_rcode|forward_request)_count_total|coredns_(forward_requests|dns_requests|dns_responses)_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes))
+          regex: (?:coredns_cache_(entries|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(forward_requests|dns_requests|dns_responses)_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes))
           sourceLabels: [__name__]
   kubeEtcd:
     serviceMonitor:
@@ -2313,17 +2312,13 @@ kube-prometheus-stack:
               sourceLabels: [__name__]
         ## control plane metrics
         ## coredns:
-        ## coredns_cache_size
         ## coredns_cache_entries
         ## coredns_cache_hits_total
         ## coredns_cache_misses_total
         ## coredns_dns_request_duration_seconds_count
         ## coredns_dns_request_duration_seconds_sum
-        ## coredns_dns_request_count_total
         ## coredns_dns_requests_total
-        ## coredns_dns_response_rcode_count_total
         ## coredns_dns_responses_total
-        ## coredns_forward_request_count_total
         ## coredns_forward_requests_total
         ## process_cpu_seconds_total
         ## process_open_fds
@@ -2332,7 +2327,7 @@ kube-prometheus-stack:
           remoteTimeout: 5s
           writeRelabelConfigs:
             - action: keep
-              regex: coredns;(?:coredns_cache_(size|entries|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(dns_request|dns_response_rcode|forward_request)_count_total|coredns_(forward_requests|dns_requests|dns_responses)_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes))
+              regex: coredns;(?:coredns_cache_(entries|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(forward_requests|dns_requests|dns_responses)_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes))
               sourceLabels: [job, __name__]
         ## etcd server:
         ## etcd_mvcc_db_total_size_in_bytes

diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go
@@ -144,13 +144,6 @@ var (
 		"process_cpu_seconds_total",
 		"process_open_fds",
 		"process_resident_memory_bytes",
-		// Deprecated in https://coredns.io/2020/06/15/coredns-1.7.0-release/#metric-changes
-		// "coredns_cache_size",
-		// "coredns_dns_response_rcode_count_total",
-		// "coredns_forward_request_count_total",
-		// No idea where this came from, doesn't seem to exist
-		// TODO: confirm it doesn't exist and remove it from values.yaml
-		// "coredns_dns_request_count_total",
 	}
 	CAdvisorMetrics = []string{
 		"container_cpu_usage_seconds_total",