From 3d4fc23dc71773f5ee7397e18337871d0fbc402c Mon Sep 17 00:00:00 2001 From: kev Date: Thu, 11 Nov 2021 15:37:05 +0800 Subject: [PATCH] update graphite --- README.md | 2 +- grafana/README.md | 2 -- graphite/Dockerfile | 3 ++- graphite/README.md | 34 ++++++++++++++++++---------------- graphite/docker-compose.yml | 34 ++++++++++++++++++---------------- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 547656b..3545c8a 100644 --- a/README.md +++ b/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 diff --git a/grafana/README.md b/grafana/README.md index 92fb082..03834ca 100644 --- a/grafana/README.md +++ b/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. diff --git a/graphite/Dockerfile b/graphite/Dockerfile index b4e00a5..7a9a3e8 100644 --- a/graphite/Dockerfile +++ b/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/* diff --git a/graphite/README.md b/graphite/README.md index 5bac664..ac598b9 100644 --- a/graphite/README.md +++ b/graphite/README.md @@ -10,22 +10,24 @@ graphite ## docker-compose.yml ```yaml -graphite: - image: vimagick/graphite - ports: - - "2003:2003" - - "2003:2003/udp" - - "2004:2004" - - "2023:2023" - - "2024:2024" - - "7002:7002" - - "8080:8080" - - "9001:9001" - volumes: - - ./data/conf:/opt/graphite/conf - - ./data/storage:/opt/graphite/storage - - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp - restart: unless-stopped +version: "3.8" +services: + graphite: + image: vimagick/graphite + ports: + - "2003:2003/udp" + - "2003:2003" + - "2004:2004" + - "2023:2023" + - "2024:2024" + - "7002:7002" + - "8080:8080" + - "9001:9001" + volumes: + - ./data/conf:/opt/graphite/conf + - ./data/storage:/opt/graphite/storage + - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp + restart: unless-stopped ``` ## Up and Running diff --git a/graphite/docker-compose.yml b/graphite/docker-compose.yml index 001d058..62421a0 100644 --- a/graphite/docker-compose.yml +++ b/graphite/docker-compose.yml @@ -1,16 +1,18 @@ -graphite: - image: vimagick/graphite - ports: - - "2003:2003/udp" - - "2003:2003" - - "2004:2004" - - "2023:2023" - - "2024:2024" - - "7002:7002" - - "8080:8080" - - "9001:9001" - volumes: - - ./data/conf:/opt/graphite/conf - - ./data/storage:/opt/graphite/storage - - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp - restart: unless-stopped +version: "3.8" +services: + graphite: + image: vimagick/graphite + ports: + - "2003:2003/udp" + - "2003:2003" + - "2004:2004" + - "2023:2023" + - "2024:2024" + - "7002:7002" + - "8080:8080" + - "9001:9001" + volumes: + - ./data/conf:/opt/graphite/conf + - ./data/storage:/opt/graphite/storage + - ./data/storage/log/webapp:/opt/graphite/storage/log/webapp + restart: unless-stopped