Merge branch 'master' of github.com:grafana/grafana

2025-02-25 18:55:37 -06:00 · 2016-06-21 17:08:16 +02:00
parent 257e6c469e ef9766eb96
commit 302ad5f1f9
6 changed files with 91 additions and 4 deletions
--- a/docker/blocks/prometheus/fig
+++ b/docker/blocks/prometheus/fig
@@ -6,6 +6,12 @@ prometheus:
  volumes:
    - /var/docker/prometheus:/prometheus-data

+node_exporter:
+  image: prom/node-exporter
+  net: bridge
+  ports:
+    - "9100:9100"
+
 fake-prometheus-data:
  image: grafana/fake-data-gen
  net: bridge
--- a/docker/blocks/prometheus/prometheus.yml
+++ b/docker/blocks/prometheus/prometheus.yml
@@ -23,4 +23,4 @@ scrape_configs:
    # scheme defaults to 'http'.

    target_groups:
-      - targets: ['localhost:9090', '172.17.0.1:9091']
+      - targets: ['localhost:9090', '172.17.0.1:9091', '172.17.0.1:9100']