Skip to content

Commit 19973a3

Browse files
committed
Update Logs
1 parent a6f33e2 commit 19973a3

File tree

2 files changed

+105
-101
lines changed

2 files changed

+105
-101
lines changed

FileService/.idea/.idea.FileService/.idea/workspace.xml

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.prod-infra.yml

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -211,20 +211,20 @@ services:
211211
networks: [ backend ]
212212

213213

214-
# # ---------- Kibana ----------
215-
# kibana:
216-
# image: bitnami/kibana:8.7.0
217-
# container_name: kibana
218-
# restart: unless-stopped
219-
# environment:
220-
# - KIBANA_ELASTICSEARCH_URL=http://elasticsearch:9200
221-
# - ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
222-
# ports:
223-
# - "5601:5601"
224-
# depends_on:
225-
# elasticsearch:
226-
# condition: service_healthy
227-
# networks: [ backend ]
214+
# ---------- Kibana ----------
215+
kibana:
216+
image: bitnami/kibana:8.7.0
217+
container_name: kibana
218+
restart: unless-stopped
219+
environment:
220+
- KIBANA_ELASTICSEARCH_URL=http://elasticsearch:9200
221+
- ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
222+
ports:
223+
- "5601:5601"
224+
depends_on:
225+
elasticsearch:
226+
condition: service_healthy
227+
networks: [ backend ]
228228

229229
# ---------- MongoDB ----------
230230
mongo:
@@ -265,99 +265,99 @@ services:
265265
- notification-db
266266
- chat-db
267267

268-
# # ---------- Monitoring: Metrics (Prometheus/Grafana) ----------
269-
# prometheus:
270-
# image: bitnami/prometheus:latest
271-
# container_name: prometheus
272-
# restart: unless-stopped
273-
# ports: [ "5555:9090" ]
274-
# volumes:
275-
# - prometheus_data:/opt/bitnami/prometheus/data
276-
# - ./monitoring/prometheus.yml:/opt/bitnami/prometheus/conf/prometheus.yml:ro
277-
# networks: [ backend ]
278-
#
279-
# grafana:
280-
# image: bitnami/grafana:latest
281-
# container_name: grafana
282-
# restart: unless-stopped
283-
# ports: [ "5556:3000" ]
284-
# environment:
285-
# - GF_SECURITY_ADMIN_USER=admin
286-
# - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
287-
# volumes:
288-
# - grafana_data:/opt/bitnami/grafana/data
289-
# # Tự động thêm data source Prometheus & Loki
290-
# - ./monitoring/grafana/provisioning:/opt/bitnami/grafana/conf/provisioning
291-
# depends_on:
292-
# - prometheus
293-
# - loki
294-
# networks: [ backend ]
268+
# ---------- Monitoring: Metrics (Prometheus/Grafana) ----------
269+
prometheus:
270+
image: bitnami/prometheus:latest
271+
container_name: prometheus
272+
restart: unless-stopped
273+
ports: [ "5555:9090" ]
274+
volumes:
275+
- prometheus_data:/opt/bitnami/prometheus/data
276+
- ./monitoring/prometheus.yml:/opt/bitnami/prometheus/conf/prometheus.yml:ro
277+
networks: [ backend ]
278+
279+
grafana:
280+
image: bitnami/grafana:latest
281+
container_name: grafana
282+
restart: unless-stopped
283+
ports: [ "5556:3000" ]
284+
environment:
285+
- GF_SECURITY_ADMIN_USER=admin
286+
- GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
287+
volumes:
288+
- grafana_data:/opt/bitnami/grafana/data
289+
# Tự động thêm data source Prometheus & Loki
290+
- ./monitoring/grafana/provisioning:/opt/bitnami/grafana/conf/provisioning
291+
depends_on:
292+
- prometheus
293+
- loki
294+
networks: [ backend ]
295+
296+
# Exporter lấy metrics host & container
297+
node-exporter:
298+
image: bitnami/node-exporter:latest
299+
container_name: node-exporter
300+
restart: unless-stopped
301+
command:
302+
- --path.rootfs=/host
303+
- --path.sysfs=/host/sys
304+
- --path.procfs=/host/proc
305+
- --collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)
306+
volumes:
307+
- /:/host:ro
308+
- /proc:/host/proc:ro
309+
- /sys:/host/sys:ro
310+
ports: [ "5557:9100" ]
311+
networks: [ backend ]
312+
313+
cadvisor:
314+
image: bitnami/cadvisor:latest
315+
container_name: cadvisor
316+
restart: unless-stopped
317+
ports: [ "5558:8080" ]
318+
volumes:
319+
- /:/rootfs:ro
320+
- /var/run:/var/run:ro
321+
- /sys:/sys:ro
322+
- /var/lib/docker/:/var/lib/docker:ro
323+
networks: [ backend ]
324+
user: "0:0"
325+
privileged: true
326+
devices:
327+
- /dev/kmsg
295328

296-
# # Exporter lấy metrics host & container
297-
# node-exporter:
298-
# image: bitnami/node-exporter:latest
299-
# container_name: node-exporter
300-
# restart: unless-stopped
301-
# command:
302-
# - --path.rootfs=/host
303-
# - --path.sysfs=/host/sys
304-
# - --path.procfs=/host/proc
305-
# - --collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)
306-
# volumes:
307-
# - /:/host:ro
308-
# - /proc:/host/proc:ro
309-
# - /sys:/host/sys:ro
310-
# ports: [ "5557:9100" ]
311-
# networks: [ backend ]
312-
#
313-
# cadvisor:
314-
# image: bitnami/cadvisor:latest
315-
# container_name: cadvisor
316-
# restart: unless-stopped
317-
# ports: [ "5558:8080" ]
318-
# volumes:
319-
# - /:/rootfs:ro
320-
# - /var/run:/var/run:ro
321-
# - /sys:/sys:ro
322-
# - /var/lib/docker/:/var/lib/docker:ro
323-
# networks: [ backend ]
324-
# user: "0:0"
325-
# privileged: true
326-
# devices:
327-
# - /dev/kmsg
328-
#
329-
# # ---------- Monitoring: Logs (Loki/Promtail) ----------
330-
# loki:
331-
# image: grafana/loki:3.4.1
332-
# container_name: loki
333-
# restart: unless-stopped
334-
# command: -config.file=/etc/loki/config.yml
335-
# ports: [ "5559:3100" ]
336-
# volumes:
337-
# - ./monitoring/loki-config.yml:/etc/loki/config.yml:ro
338-
# - loki_data:/loki
339-
# networks: [ backend ]
340-
#
341-
# promtail:
342-
# image: grafana/promtail:3.4.1
343-
# container_name: promtail
344-
# restart: unless-stopped
345-
# command: -config.file=/etc/promtail/config.yml
346-
# volumes:
347-
# - ./monitoring/promtail-config.yml:/etc/promtail/config.yml:ro
348-
# - /var/log:/var/log:ro
349-
# - /var/lib/docker/containers:/var/lib/docker/containers:ro
350-
# - /var/run/docker.sock:/var/run/docker.sock:ro
351-
# networks: [ backend ]
329+
# ---------- Monitoring: Logs (Loki/Promtail) ----------
330+
loki:
331+
image: grafana/loki:3.4.1
332+
container_name: loki
333+
restart: unless-stopped
334+
command: -config.file=/etc/loki/config.yml
335+
ports: [ "5559:3100" ]
336+
volumes:
337+
- ./monitoring/loki-config.yml:/etc/loki/config.yml:ro
338+
- loki_data:/loki
339+
networks: [ backend ]
340+
341+
promtail:
342+
image: grafana/promtail:3.4.1
343+
container_name: promtail
344+
restart: unless-stopped
345+
command: -config.file=/etc/promtail/config.yml
346+
volumes:
347+
- ./monitoring/promtail-config.yml:/etc/promtail/config.yml:ro
348+
- /var/log:/var/log:ro
349+
- /var/lib/docker/containers:/var/lib/docker/containers:ro
350+
- /var/run/docker.sock:/var/run/docker.sock:ro
351+
networks: [ backend ]
352352

353353
networks:
354354
backend:
355355
name: codecampus_backend
356356

357357
volumes:
358-
# prometheus_data:
359-
# grafana_data:
360-
# loki_data:
358+
prometheus_data:
359+
grafana_data:
360+
loki_data:
361361
# organization_pg_data:
362362
# payment_pg_data:
363363
# identity_pg_data:

0 commit comments

Comments
 (0)