Generate new overrides yaml/libsonnet file(s).

SumoLogic · Jun 1, 2020 · 1bf687c · 1bf687c
1 parent dabdef5
commit 1bf687c
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 5 deletions.
diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml
@@ -400,15 +400,50 @@ prometheus:
         regex: (?:up|prometheus_remote_storage_.*|fluentd_.*|fluentbit.*|otelcol.*)
         sourceLabels: [__name__]
     - # control plane metrics
-      # coredns
-      url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.control-plane
+      # coredns:
+      # coredns_cache_size
+      # 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_response_rcode_count_total
+      # coredns_forward_request_count_total
+      # process_cpu_seconds_total
+      # process_open_fds
+      # process_resident_memory_bytes
+      url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.control-plane.coredns
       writeRelabelConfigs:
       - action: keep
         regex: coredns
         sourceLabels: [job]
+      - action: keep
+        regex: coredns_cache_(size|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(dns_request|dns_response_rcode|forward_request)_count_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes)
+        sourceLabels: [__name__]
     - # etcd server
-      url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.control-plane
+      # etcd_debugging_mvcc_db_total_size_in_bytes
+      # etcd_debugging_store_expires_total
+      # etcd_debugging_store_watchers
+      # etcd_disk_backend_commit_duration_seconds_bucket
+      # etcd_disk_wal_fsync_duration_seconds_bucket
+      # etcd_grpc_proxy_cache_hits_total
+      # etcd_grpc_proxy_cache_misses_total
+      # etcd_network_client_grpc_received_bytes_total
+      # etcd_network_client_grpc_sent_bytes_total
+      # etcd_server_has_leader
+      # etcd_server_leader_changes_seen_total
+      # etcd_server_proposals_applied_total
+      # etcd_server_proposals_committed_total
+      # etcd_server_proposals_failed_total
+      # etcd_server_proposals_pending
+      # process_cpu_seconds_total
+      # process_open_fds
+      # process_resident_memory_bytes
+      url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.control-plane.kube-etcd
       writeRelabelConfigs:
       - action: keep
         regex: kube-etcd
         sourceLabels: [job]
+      - action: keep
+        regex: etcd_debugging_(mvcc_db_total_size_in_bytes|store_(expires_total|watchers))|etcd_disk_(backend_commit|wal_fsync)_duration_seconds_bucket|etcd_grpc_proxy_cache_(hits|misses)_total|etcd_network_client_grpc_(received|sent)_bytes_total|etcd_server_(has_leader|leader_changes_seen_total)|etcd_server_proposals_(pending|(applied|committed|failed)_total)|process_(cpu_seconds_total|open_fds|resident_memory_bytes)
+        sourceLabels: [__name__]
diff --git a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet
@@ -147,26 +147,40 @@
         ]
       },
       {
-        url: $._config.sumologicCollectorSvc + "prometheus.metrics.control-plane",
+        url: $._config.sumologicCollectorSvc + "prometheus.metrics.control-plane.coredns",
         writeRelabelConfigs: [
           {
             action: "keep",
             regex: "coredns",
             sourceLabels: [
               "job"
             ]
+          },
+          {
+            action: "keep",
+            regex: "coredns_cache_(size|(hits|misses)_total)|coredns_dns_request_duration_seconds_(count|sum)|coredns_(dns_request|dns_response_rcode|forward_request)_count_total|process_(cpu_seconds_total|open_fds|resident_memory_bytes)",
+            sourceLabels: [
+              "__name__"
+            ]
           }
         ]
       },
       {
-        url: $._config.sumologicCollectorSvc + "prometheus.metrics.control-plane",
+        url: $._config.sumologicCollectorSvc + "prometheus.metrics.control-plane.kube-etcd",
         writeRelabelConfigs: [
           {
             action: "keep",
             regex: "kube-etcd",
             sourceLabels: [
               "job"
             ]
+          },
+          {
+            action: "keep",
+            regex: "etcd_debugging_(mvcc_db_total_size_in_bytes|store_(expires_total|watchers))|etcd_disk_(backend_commit|wal_fsync)_duration_seconds_bucket|etcd_grpc_proxy_cache_(hits|misses)_total|etcd_network_client_grpc_(received|sent)_bytes_total|etcd_server_(has_leader|leader_changes_seen_total)|etcd_server_proposals_(pending|(applied|committed|failed)_total)|process_(cpu_seconds_total|open_fds|resident_memory_bytes)",
+            sourceLabels: [
+              "__name__"
+            ]
           }
         ]
       }