diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2018-02-01 00:07:26 -0500 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2018-02-01 00:07:26 -0500 |
| commit | f4712289dce7b0139b9d2da231202bcf7423bd31 (patch) | |
| tree | 12226ca25b74885f3989a959d6a9e38403f31286 | |
| parent | 25e1345836d37a3162445720caf50808c2b3c025 (diff) | |
| download | gitlab-ce-42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1.tar.gz | |
Add service scraping, kube-state-metrics, pin container version42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1
| -rw-r--r-- | vendor/prometheus/values.yaml | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml index 4c709aeac76..db967514be7 100644 --- a/vendor/prometheus/values.yaml +++ b/vendor/prometheus/values.yaml @@ -2,7 +2,7 @@ alertmanager: enabled: false kubeStateMetrics: - enabled: false + enabled: true nodeExporter: enabled: false @@ -10,6 +10,10 @@ nodeExporter: pushgateway: enabled: false +server: + image: + tag: v2.1.0 + serverFiles: alerts: {} rules: {} @@ -46,6 +50,34 @@ serverFiles: - pod_name target_label: environment regex: "(.+)-.+-.+" + - job_name: 'kubernetes-service-endpoints' + kubernetes_sd_configs: + - role: endpoints + relabel_configs: + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape] + action: keep + regex: true + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme] + action: replace + target_label: __scheme__ + regex: (https?) + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path] + action: replace + target_label: __metrics_path__ + regex: (.+) + - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port] + action: replace + target_label: __address__ + regex: (.+)(?::\d+);(\d+) + replacement: $1:$2 + - action: labelmap + regex: __meta_kubernetes_service_label_(.+) + - source_labels: [__meta_kubernetes_namespace] + action: replace + target_label: kubernetes_namespace + - source_labels: [__meta_kubernetes_service_name] + action: replace + target_label: kubernetes_name - job_name: kubernetes-nodes scheme: https tls_config: |