Merge remote-tracking branch 'grafana/master' into influx-db-query2

* grafana/master:
  docker: change port for prom random data scrape target
This commit is contained in:
ryan 2018-03-15 10:25:20 +01:00
commit 853d9bb378
4 changed files with 4 additions and 4 deletions

View File

@ -28,4 +28,4 @@
build: blocks/prometheus_random_data
network_mode: host
ports:
- "8080:8080"
- "8081:8080"

View File

@ -36,4 +36,4 @@ scrape_configs:
- job_name: 'prometheus-random-data'
static_configs:
- targets: ['127.0.0.1:8080']
- targets: ['127.0.0.1:8081']

View File

@ -28,4 +28,4 @@
build: blocks/prometheus_random_data
network_mode: host
ports:
- "8080:8080"
- "8081:8080"

View File

@ -36,4 +36,4 @@ scrape_configs:
- job_name: 'prometheus-random-data'
static_configs:
- targets: ['127.0.0.1:8080']
- targets: ['127.0.0.1:8081']