Merge branch 'master' into graphite-series-by-tags

2017-11-15 11:12:11 +01:00
parent af9941e50a 1a3170373a
commit b5b93a68fc
374 changed files with 9101 additions and 17366 deletions
@@ -0,0 +1,21 @@
+  graphite:
+    build:
+      context: blocks/graphite1
+      args:
+        - version=master
+    ports:
+      - "8080:80"
+      - "2003:2003"
+      - "8125:8125/udp"
+      - "8126:8126"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+
+  fake-graphite-data:
+    image: grafana/fake-data-gen
+    network_mode: bridge
+    environment:
+      FD_DATASOURCE: graphite
+      FD_PORT: 2003
+