Pre-merge alternative of #2020 in our kubermatic version

To fix the faulty prometheus clusters this commit creates a version of #2020 (github.com/kubermatic/kubermatic) which rolls out the metric drop for _all types_ of clusters (the merge itself does not work, as the .TemplateData field is not implemented yet and im too lazy to backport this to v2.7.1). ATTENTION: This commit MUST be reverted when #2020 is merged into this repo or conflicts will occur
multi-io · Sep 20, 2018 · 62f15d6 · 62f15d6
1 parent 575820f
commit 62f15d6
Show file tree

Hide file tree

Showing 49 changed files with 485 additions and 0 deletions.
diff --git a/api/pkg/resources/prometheus/configmap.go b/api/pkg/resources/prometheus/configmap.go
@@ -69,6 +69,11 @@ scrape_configs:
       names:
       - "{{ $.Cluster.Status.NamespaceName }}"
 
+  metric_relabel_configs:
+  - source_labels: [job, __name__]
+    regex: 'controller-manager;rest_.*'
+    action: drop
+
   relabel_configs:
   - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_{{ $i }}_scrape]
     action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.10.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.10.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.10.6-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.10.6-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.11.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.11.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.11.1-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.11.1-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.12.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.12.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.8.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.8.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.9.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.9.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-aws-1.9.10-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-aws-1.9.10-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.10.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.10.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.10.6-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.10.6-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.11.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.11.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.11.1-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.11.1-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.12.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.12.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.8.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.8.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.9.0-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.9.0-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep

diff --git a/api/pkg/resources/test/fixtures/configmap-azure-1.9.10-prometheus.yaml b/api/pkg/resources/test/fixtures/configmap-azure-1.9.10-prometheus.yaml
@@ -25,6 +25,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_0_scrape]
         action: keep
@@ -56,6 +61,11 @@ data:
           names:
           - "cluster-de-test-01"
 
+      metric_relabel_configs:
+      - source_labels: [job, __name__]
+        regex: 'controller-manager;rest_.*'
+        action: drop
+
       relabel_configs:
       - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_1_scrape]
         action: keep