Generate new overrides yaml/libsonnet file(s).

SumoLogic · Apr 15, 2020 · 8367beb · 8367beb
1 parent a066e0d
commit 8367beb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml
@@ -152,13 +152,15 @@ 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.application.control-plane
       writeRelabelConfigs:
-      - # coredns
-        action: keep
-        regex: (?:coredns_.*)
-        sourceLabels: [__name__]
-      - # etcd server
-        action: keep
-        regex: (?:etcd_(debugging|disk|grpc|network|server)_.*)
-        sourceLabels: [__name__]
+      - action: keep
+        regex: coredns
+        sourceLabels: [job]
+    - # etcd server
+      url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.application.control-plane
+      writeRelabelConfigs:
+      - action: keep
+        regex: kube-etcd
+        sourceLabels: [job]
diff --git a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet
@@ -151,16 +151,21 @@
         writeRelabelConfigs: [
           {
             action: "keep",
-            regex: "(?:coredns_.*)",
+            regex: "coredns",
             sourceLabels: [
-              "__name__"
+              "job"
             ]
-          },
+          }
+        ]
+      },
+      {
+        url: $._config.sumologicCollectorSvc + "prometheus.metrics.application.control-plane",
+        writeRelabelConfigs: [
           {
             action: "keep",
-            regex: "(?:etcd_(debugging|disk|grpc|network|server)_.*)",
+            regex: "kube-etcd",
             sourceLabels: [
-              "__name__"
+              "job"
             ]
           }
         ]