Skip to content

Commit 153ccd7

Browse files
authored
Merge pull request #7 from sumaro2101/develop
remove cadvisor
2 parents dd11908 + 9ce73cb commit 153ccd7

2 files changed

Lines changed: 12 additions & 25 deletions

File tree

caddy/Caddyfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
tls off
1919
}
2020

21+
:9091 {
22+
basicauth / {$ADMIN_USER} {$ADMIN_PASSWORD}
23+
proxy / pushgateway:9091 {
24+
transparent
25+
}
26+
27+
errors stderr
28+
tls off
29+
}
30+
2131
:3000 {
2232
proxy / grafana:3000 {
2333
transparent

docker-compose.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ services:
4949
command: /start-flower
5050
volumes:
5151
- .:/app
52-
expose:
53-
- 5555
52+
ports:
53+
- 5555:5555
5454
env_file:
5555
- .env
5656
depends_on:
@@ -140,28 +140,6 @@ services:
140140
labels:
141141
org.label-schema.group: "monitoring"
142142

143-
cadvisor:
144-
image: gcr.io/cadvisor/cadvisor:v0.47.1
145-
container_name: cadvisor
146-
privileged: true
147-
platform: linux/aarch64
148-
devices:
149-
- "/dev/kmsg:/dev/kmsg"
150-
volumes:
151-
- /var/run:/var/run:ro
152-
- /sys:/sys:ro
153-
- /var/lib/docker/:/var/lib/docker:ro
154-
- /var/run/docker.sock:/var/run/docker.sock:ro
155-
- /etc/machine-id:/etc/machine-id:ro
156-
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id:ro
157-
restart: unless-stopped
158-
expose:
159-
- 8081
160-
networks:
161-
- monitor-net
162-
labels:
163-
org.label-schema.group: "monitoring"
164-
165143
nodeexporter:
166144
image: prom/node-exporter:v0.18.1
167145
container_name: nodeexporter
@@ -201,7 +179,6 @@ services:
201179
- "9090:9090"
202180
- "9093:9093"
203181
- "9091:9091"
204-
- "5555:5555"
205182
volumes:
206183
- ./caddy:/etc/caddy
207184
environment:

0 commit comments

Comments
 (0)