openstack/openstack-helm
Code Issues Proposed changes

Prometheus: Remove block duration flags, update cadvisor job

Browse Source 
This removes the min_block_duration and max_block_duration flags
from the Prometheus chart, as the suggested best practice is to
use the defaults (2h min, 10% of retention time as max).

This also updates the scrape target configuration for cadvisor to
match the upstream example endpoint for kubernetes versions 1.7.3
and later

Change-Id: I200969d6c4da9d17d0a7d3a34a114ccc5f5ee70f
This commit is contained in:
Steve Wilkerson 2018-08-20 09:23:11 -05:00
parent faef231b0b
commit d5dc97a431
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
prometheus/values.yaml
View File

@ -431,8 +431,6 @@ conf:
query.timeout: 2m query.timeout: 2m
storage.tsdb.path: /var/lib/prometheus/data storage.tsdb.path: /var/lib/prometheus/data
storage.tsdb.retention: 7d storage.tsdb.retention: 7d
storage.tsdb.min_block_duration: 2h
storage.tsdb.max_block_duration: 2h
# NOTE(srwilkers): These settings default to false, but they are # NOTE(srwilkers): These settings default to false, but they are
# exposed here to allow enabling if desired. Please note the security # exposed here to allow enabling if desired. Please note the security
# impacts of enabling these flags. More information regarding the impacts # impacts of enabling these flags. More information regarding the impacts
@ -542,9 +540,11 @@ conf:
# This job is not necessary and should be removed in Kubernetes 1.6 and # This job is not necessary and should be removed in Kubernetes 1.6 and
# earlier versions, or it will cause the metrics to be scraped twice. # earlier versions, or it will cause the metrics to be scraped twice.
- job_name: 'kubernetes-cadvisor' - job_name: 'kubernetes-cadvisor'
# Default to scraping over https. If required, just disable this or change to # Default to scraping over https. If required, just disable this or change to
# `http`. # `http`.
scheme: https scheme: https
# This TLS & bearer token file config is used to connect to the actual scrape # This TLS & bearer token file config is used to connect to the actual scrape
# endpoints for cluster components. This is separate to discovery auth # endpoints for cluster components. This is separate to discovery auth
# configuration because discovery & scraping are two separate concerns in # configuration because discovery & scraping are two separate concerns in
@ -554,9 +554,10 @@ conf:
tls_config: tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
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
scrape_interval: 45s
relabel_configs: relabel_configs:
- action: labelmap - action: labelmap
regex: __meta_kubernetes_node_label_(.+) regex: __meta_kubernetes_node_label_(.+)
@ -567,23 +568,6 @@ conf:
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
- source_labels:
- __meta_kubernetes_node_name
action: replace
target_label: kubernetes_io_hostname
metric_relabel_configs:
- action: replace
source_labels:
- id
regex: '^/machine\.slice/machine-rkt\\x2d([^\\]+)\\.+/([^/]+)\.service$'
target_label: rkt_container_name
replacement: '${2}-${1}'
- action: replace
source_labels:
- id
regex: '^/system\.slice/(.+)\.service$'
target_label: systemd_service_name
replacement: '${1}'
# Scrape config for API servers. # Scrape config for API servers.
# #
# Kubernetes exposes API servers as endpoints to the default/kubernetes # Kubernetes exposes API servers as endpoints to the default/kubernetes