BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit 81384a6d by Mike Greiling
Options

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
parents f87afeff 25e13458
Showing with 64 additions and 76 deletions
vendor/prometheus/values.yaml
...@@ -11,10 +11,10 @@ pushgateway: ...@@ -11,10 +11,10 @@ pushgateway:
enabled: false enabled: false
serverFiles: serverFiles:
alerts: "" alerts: {}
rules: "" rules: {}
prometheus.yml: |- prometheus.yml:
rule_files: rule_files:
- /etc/config/rules - /etc/config/rules
- /etc/config/alerts - /etc/config/alerts
...@@ -26,92 +26,80 @@ serverFiles: ...@@ -26,92 +26,80 @@ serverFiles:
- job_name: kubernetes-cadvisor - job_name: kubernetes-cadvisor
scheme: https scheme: https
tls_config: 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 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: kubernetes_sd_configs:
- role: node - 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: relabel_configs:
- action: labelmap - action: labelmap
regex: __meta_kubernetes_node_label_(.+) regex: __meta_kubernetes_node_label_(.+)
- target_label: __address__ - target_label: __address__
replacement: kubernetes.default.svc:443 replacement: kubernetes.default.svc:443
- source_labels: - source_labels:
- __meta_kubernetes_node_name - __meta_kubernetes_node_name
regex: "(.+)" regex: "(.+)"
target_label: __metrics_path__ target_label: __metrics_path__
replacement: "/api/v1/nodes/${1}/proxy/metrics/cadvisor" replacement: "/api/v1/nodes/${1}/proxy/metrics/cadvisor"
metric_relabel_configs: metric_relabel_configs:
- source_labels: - source_labels:
- pod_name - pod_name
target_label: environment target_label: environment
regex: "(.+)-.+-.+" regex: "(.+)-.+-.+"
- job_name: kubernetes-nodes - job_name: kubernetes-nodes
scheme: https scheme: https
tls_config: 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 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: kubernetes_sd_configs:
- role: node - 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: relabel_configs:
- action: labelmap - action: labelmap
regex: __meta_kubernetes_node_label_(.+) regex: __meta_kubernetes_node_label_(.+)
- target_label: __address__ - target_label: __address__
replacement: kubernetes.default.svc:443 replacement: kubernetes.default.svc:443
- source_labels: - source_labels:
- __meta_kubernetes_node_name - __meta_kubernetes_node_name
regex: "(.+)" regex: "(.+)"
target_label: __metrics_path__ target_label: __metrics_path__
replacement: "/api/v1/nodes/${1}/proxy/metrics" replacement: "/api/v1/nodes/${1}/proxy/metrics"
metric_relabel_configs: metric_relabel_configs:
- source_labels: - source_labels:
- pod_name - pod_name
target_label: environment target_label: environment
regex: "(.+)-.+-.+" regex: "(.+)-.+-.+"
- job_name: kubernetes-pods - job_name: kubernetes-pods
tls_config: 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 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: kubernetes_sd_configs:
- role: pod - 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: relabel_configs:
- source_labels: - source_labels:
- __meta_kubernetes_pod_annotation_prometheus_io_scrape - __meta_kubernetes_pod_annotation_prometheus_io_scrape
action: keep action: keep
regex: 'true' regex: 'true'
- source_labels: - source_labels:
- __meta_kubernetes_pod_annotation_prometheus_io_path - __meta_kubernetes_pod_annotation_prometheus_io_path
action: replace action: replace
target_label: __metrics_path__ target_label: __metrics_path__
regex: "(.+)" regex: "(.+)"
- source_labels: - source_labels:
- __address__ - __address__
- __meta_kubernetes_pod_annotation_prometheus_io_port - __meta_kubernetes_pod_annotation_prometheus_io_port
action: replace action: replace
regex: "([^:]+)(?::[0-9]+)?;([0-9]+)" regex: "([^:]+)(?::[0-9]+)?;([0-9]+)"
replacement: "$1:$2" replacement: "$1:$2"
target_label: __address__ target_label: __address__
- action: labelmap - action: labelmap
regex: __meta_kubernetes_pod_label_(.+) regex: __meta_kubernetes_pod_label_(.+)
- source_labels: - source_labels:
- __meta_kubernetes_namespace - __meta_kubernetes_namespace
action: replace action: replace
target_label: kubernetes_namespace target_label: kubernetes_namespace
- source_labels: - source_labels:
- __meta_kubernetes_pod_name - __meta_kubernetes_pod_name
action: replace action: replace
target_label: kubernetes_pod_name target_label: kubernetes_pod_name
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment