Merge branch 'huegelc-huegelc-patch-expose-consoles' into version-2

This commit is contained in:
Brian Christner 2017-09-12 15:22:51 +02:00
commit f5d6df9d1d
No known key found for this signature in database
GPG Key ID: 8453AD0CB29591D1
2 changed files with 3 additions and 0 deletions

View File

@ -19,6 +19,8 @@ services:
- '-config.file=/etc/prometheus/prometheus.yml'
- '-storage.local.path=/prometheus'
- '-alertmanager.url=http://alertmanager:9093'
- '-web.console.libraries=/usr/share/prometheus/console_libraries'
- '-web.console.templates=/usr/share/prometheus/consoles'
expose:
- 9090
ports:

View File

@ -20,6 +20,7 @@ rule_files:
scrape_configs:
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
- job_name: 'prometheus'
- job_name: 'node'
# Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s