update grafana

grafana/README.md

@@ -6,12 +6,19 @@ grafana
 [Grafana][1] is a leading open source application for visualizing large-scale
 measurement data.
 
+As an alternative to installing and running the image renderer as a plugin you
+can run it as a remote image rendering service using [Docker][3].
+
 [Installing using Docker][2]
 
 ## docker-compose.yml
 
 ```yaml
-grafana:
+version: "3.8"
+
+services:
+
+  grafana:
     image: grafana/grafana
     ports:
       - "3000:3000"
@@ -28,7 +35,18 @@ grafana:
       - GF_SMTP_PASSWORD=******
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_ALERTING_ERROR_OR_TIMEOUT=keep_state
-  restart: always
+      - GF_RENDERING_SERVER_URL=http://renderer:8081/render
+      - GF_RENDERING_CALLBACK_URL=http://grafana:3000/
+    restart: unless-stopped
+
+  renderer:
+    image: grafana/grafana-image-renderer
+    ports:
+      - "8081:8081"
+    environment:
+      - ENABLE_METRICS=true
+      - BROWSER_TZ=Asia/Shanghai
+    restart: unless-stopped
 ```
 
 ## up and running
@@ -47,3 +65,4 @@ $ curl http://localhost:3000/
 
 [1]: http://grafana.org/
 [2]: http://docs.grafana.org/installation/docker/
+[3]: https://github.com/grafana/grafana-image-renderer/blob/master/docs/remote_rendering_using_docker.md

grafana/docker-compose.yml

@@ -1,4 +1,8 @@
-grafana:
+version: "3.8"
+
+services:
+
+  grafana:
     image: grafana/grafana
     ports:
       - "3000:3000"
@@ -15,4 +19,15 @@ grafana:
       - GF_SMTP_PASSWORD=******
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_ALERTING_ERROR_OR_TIMEOUT=keep_state
-  restart: always
+      - GF_RENDERING_SERVER_URL=http://renderer:8081/render
+      - GF_RENDERING_CALLBACK_URL=http://grafana:3000/
+    restart: unless-stopped
+
+  renderer:
+    image: grafana/grafana-image-renderer
+    ports:
+      - "8081:8081"
+    environment:
+      - ENABLE_METRICS=true
+      - BROWSER_TZ=Asia/Shanghai
+    restart: unless-stopped