feat(monitoring): 监控编排统一到 FruitServer compose

把原先散落在 D:\fruitshorts\monitoring 的手工栈收编进仓库:prometheus 增加 cAdvisor 与 blackbox 抓取、15 天保留期;grafana 改为 provisioning 自动加载数据源与看板;新增 blackbox/cadvisor 服务;Grafana 管理员密码改走环境变量(必填),不再硬编码 admin/admin。
This commit is contained in:
Zhou Weidong authored and trae-solo-agent committed 2026-10-21 10:51:28 +08:00
1 parent b391ad31af
commit 530da2b1b4
7 files changed
+210 -3

No files matched your search

+39 -2
View File
@@ -149,6 +149,7 @@ services:
retries: 3
# ─────────── 监控 ───────────
# 编排统一在这里:prometheus(应用指标 + 容器指标 + 黑盒探活)+ grafana(自动加载看板)
prometheus:
image: prom/prometheus:latest
container_name: fruitshorts-prometheus
@@ -160,6 +161,15 @@ services:
- prometheus-data:/prometheus
command:
- "--config.file=/etc/prometheus/prometheus.yml"
# 15 天保留期,避免磁盘无限增长
- "--storage.tsdb.retention.time=15d"
- "--web.enable-lifecycle"
healthcheck:
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:9090/-/healthy >/dev/null || exit 1"]
interval: 30s
timeout: 5s
start_period: 20s
retries: 3
grafana:
image: grafana/grafana:latest
@@ -169,9 +179,36 @@ services:
- "3000:3000"
volumes:
- grafana-data:/var/lib/grafana
# 数据源与看板全部来自仓库,换机器不需要手工配
- ./grafana/provisioning:/etc/grafana/provisioning:ro
- ./grafana/dashboards:/var/lib/grafana/dashboards:ro
environment:
- GF_SECURITY_ADMIN_USER=admin
- GF_SECURITY_ADMIN_PASSWORD=admin
GF_SECURITY_ADMIN_USER: ${GRAFANA_ADMIN_USER:-admin}
GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD:?Grafana 管理员密码必填,见 .env.example}
GF_USERS_ALLOW_SIGN_UP: "false"
TZ: Asia/Shanghai
depends_on:
- prometheus
# 黑盒探活:从外部探测接口可用性与耗时
blackbox:
image: prom/blackbox-exporter:latest
container_name: fruitshorts-blackbox
restart: unless-stopped
volumes:
- ./blackbox/blackbox.yml:/etc/blackbox_exporter/config.yml:ro
# 容器资源指标(CPU / 内存 / 网络 / 重启),供 Prometheus 抓取
cadvisor:
image: gcr.io/cadvisor/cadvisor:latest
container_name: fruitshorts-cadvisor
restart: unless-stopped
privileged: true
volumes:
- /:/rootfs:ro
- /var/run:/var/run:ro
- /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro
volumes:
# 命名卷:跟着 compose 项目走,`docker compose down -v` 才会删