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

* grafana/master:
  docker: change port for prom random data scrape target

docker/blocks/prometheus/docker-compose.yaml

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

docker/blocks/prometheus/prometheus.yml

@@ -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']

docker/blocks/prometheus2/docker-compose.yaml

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

docker/blocks/prometheus2/prometheus.yml

@@ -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']