Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1'…

Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1' into pawel/connect_to_prometheus_through_proxy-30480 * 42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1: Fix values.yaml for Prometheus

Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1'…
81384a6d · Mike Greiling · f87afeff · 25e13458 · 81384a6d
Unverified Commit 81384a6d authored Jan 29, 2018 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 21 deletions

values.yaml vendor/prometheus/values.yaml +9 -21

No files found.
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -11,10 +11,10 @@ pushgateway:
  enabled: false

 serverFiles:
-  alerts: ""
-  rules: ""
+  alerts: {}
+  rules: {}

-  prometheus.yml: |-
+  prometheus.yml:
    rule_files:
      - /etc/config/rules
      - /etc/config/alerts
@@ -26,15 +26,11 @@ serverFiles:
      - job_name: kubernetes-cadvisor
        scheme: https
        tls_config:
-          ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
          insecure_skip_verify: true
-        bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
+        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
        kubernetes_sd_configs:
          - role: node
-          api_server: https://kubernetes.default.svc:443
-          tls_config:
-            ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-          bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
        relabel_configs:
          - action: labelmap
            regex: __meta_kubernetes_node_label_(.+)
@@ -53,15 +49,11 @@ serverFiles:
      - job_name: kubernetes-nodes
        scheme: https
        tls_config:
-          ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
          insecure_skip_verify: true
-        bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
+        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
        kubernetes_sd_configs:
          - role: node
-          api_server: https://kubernetes.default.svc:443
-          tls_config:
-            ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-          bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
        relabel_configs:
          - action: labelmap
            regex: __meta_kubernetes_node_label_(.+)
@@ -79,15 +71,11 @@ serverFiles:
            regex: "(.+)-.+-.+"
      - job_name: kubernetes-pods
        tls_config:
-          ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
          insecure_skip_verify: true
-        bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
+        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
        kubernetes_sd_configs:
          - role: pod
-          api_server: https://kubernetes.default.svc:443
-          tls_config:
-            ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-          bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
        relabel_configs:
          - source_labels:
            - __meta_kubernetes_pod_annotation_prometheus_io_scrape