Skip to content

Commit deb2730

Browse files
committed
add monitoring
1 parent aed40de commit deb2730

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

compose/production/django/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN chmod +x /start-flower
4747
RUN mkdir /app
4848
RUN mkdir /app/staticfiles
4949
RUN mkdir /app/mediafiles
50+
RUN mkdir /app/flower_db
5051
WORKDIR /app
5152

5253
# copy project code

compose/production/django/celery/flower/start

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ until worker_ready; do
1313
done
1414
>&2 echo 'Celery workers is available'
1515

16-
flower \
16+
exec flower --persistent=1 --db=/app/flower_db/flower.db \
1717
--app=django_celery_example \
1818
--broker="${CELERY_BROKER}" \
1919
--basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"

docker-compose.prod.yml

+24-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- mediafiles:/app/mediafiles
1010
ports:
1111
- 80:80
12-
- 5555:5555
12+
- 5559:5555
1313
- 15672:15672
1414
depends_on:
1515
- web
@@ -85,13 +85,36 @@ services:
8585
volumes:
8686
- staticfiles:/app/staticfiles
8787
- mediafiles:/app/mediafiles
88+
- flower_db:/app/flower_db
8889
env_file:
8990
- ./.env/.prod-sample
9091
depends_on:
9192
- redis
9293
- db
9394

95+
96+
prometheus:
97+
image: prom/prometheus
98+
ports:
99+
- 9090:9090
100+
command:
101+
- --config.file=/etc/prometheus/prometheus.yml
102+
volumes:
103+
- ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
104+
depends_on:
105+
- cadvisor
106+
107+
cadvisor:
108+
image: google/cadvisor
109+
container_name: cadvisor
110+
volumes:
111+
- /:/rootfs:ro
112+
- /var/run:/var/run:rw
113+
- /sys:/sys:ro
114+
- /var/lib/docker/:/var/lib/docker:ro
115+
94116
volumes:
95117
postgres_data:
96118
staticfiles:
97119
mediafiles:
120+
flower_db:

prometheus.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
scrape_configs:
2+
3+
- job_name: cadvisor
4+
scrape_interval: 5s
5+
static_configs:
6+
- targets:
7+
- cadvisor:8080

0 commit comments

Comments
 (0)