update graphite

README.md

@@ -87,7 +87,6 @@ A collection of delicious docker recipes.
 - [x] collectd
 - [x] elastalert
 - [x] glances
-- [x] grafana
 - [x] graphite
 - [x] influxdb
 - [x] logstash
@@ -340,6 +339,7 @@ A collection of delicious docker recipes.
     - [ ] python
 - [x] gogs/gogs :cn:
 - [x] gotify/server
+- [x] grafana/grafana
 - [x] haproxy
 - [x] h2non/imaginary
 - [x] jellyfin/jellyfin

grafana/README.md

@@ -1,8 +1,6 @@
 grafana
 =======
 
-![](https://badge.imagelayers.io/vimagick/grafana:latest.svg)
-
 [Grafana][1] is a leading open source application for visualizing large-scale
 measurement data.
 

graphite/Dockerfile

@@ -24,6 +24,7 @@ RUN set -xe \
                python3 \
                python3-dev \
     && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \
+    && pip3 install pip==20.1 \
     && pip3 install --no-cache-dir gunicorn supervisor \
     && pip3 install --no-cache-dir --install-option=--prefix=/opt/graphite \
                     --install-option=--install-lib=/opt/graphite/lib \
@@ -44,7 +45,7 @@ RUN set -xe \
     && apk del build-base \
                curl \
                libffi-dev \
-               python-dev \
+               python3-dev \
     && rm -rf /root/.cache/pip \
               /var/cache/apk/*
 

graphite/README.md

@@ -10,22 +10,24 @@ graphite
 ## docker-compose.yml
 
 ```yaml
-graphite:
+version: "3.8"
-  image: vimagick/graphite
+services:
-  ports:
+  graphite:
-    - "2003:2003"
+    image: vimagick/graphite
-    - "2003:2003/udp"
+    ports:
-    - "2004:2004"
+      - "2003:2003/udp"
-    - "2023:2023"
+      - "2003:2003"
-    - "2024:2024"
+      - "2004:2004"
-    - "7002:7002"
+      - "2023:2023"
-    - "8080:8080"
+      - "2024:2024"
-    - "9001:9001"
+      - "7002:7002"
-  volumes:
+      - "8080:8080"
-    - ./data/conf:/opt/graphite/conf
+      - "9001:9001"
-    - ./data/storage:/opt/graphite/storage
+    volumes:
-    - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp
+      - ./data/conf:/opt/graphite/conf
-  restart: unless-stopped
+      - ./data/storage:/opt/graphite/storage
+      - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp
+    restart: unless-stopped
 ```
 
 ## Up and Running

graphite/docker-compose.yml

@@ -1,16 +1,18 @@
-graphite:
+version: "3.8"
-  image: vimagick/graphite
+services:
-  ports:
+  graphite:
-    - "2003:2003/udp"
+    image: vimagick/graphite
-    - "2003:2003"
+    ports:
-    - "2004:2004"
+      - "2003:2003/udp"
-    - "2023:2023"
+      - "2003:2003"
-    - "2024:2024"
+      - "2004:2004"
-    - "7002:7002"
+      - "2023:2023"
-    - "8080:8080"
+      - "2024:2024"
-    - "9001:9001"
+      - "7002:7002"
-  volumes:
+      - "8080:8080"
-    - ./data/conf:/opt/graphite/conf
+      - "9001:9001"
-    - ./data/storage:/opt/graphite/storage
+    volumes:
-    - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp
+      - ./data/conf:/opt/graphite/conf
-  restart: unless-stopped
+      - ./data/storage:/opt/graphite/storage
+      - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp
+    restart: unless-stopped