x

2026-05-06 02:34:43 -07:00
parent 595e4c62f9
commit cbb451d18c
10 changed files with 2439 additions and 145 deletions
@@ -6,9 +6,9 @@
 # 4. 运行: docker-compose -f docker-compose.cloud.yml up -d
 #
 # 网络说明：
-#   ppanel-server 使用 host 网络（可出外网，访问 MySQL/Redis/Tempo 用 127.0.0.1）
-#   监控服务（MySQL/Redis/Loki/Tempo/Grafana/Prometheus）在 ppanel_net bridge 网络中
-#   MySQL(3306)/Redis(6379)/Tempo(4317) 将端口映射到 127.0.0.1，ppanel-server 通过 host 网络访问
+#   ppanel-server 使用 host 网络（可出外网，直接访问 AWS RDS/ElastiCache 私网地址）
+#   监控服务（Loki/Tempo/Grafana/Prometheus）在 ppanel_net bridge 网络中
+#   Tempo(4317) 将端口映射到 127.0.0.1，ppanel-server 通过 host 网络访问
 #   监控端口绑定 127.0.0.1，需通过 SSH 隧道或 Nginx 反代访问
 #
 # 未来多开 ppanel-server 时：
@@ -18,7 +18,7 @@
 services:
  # ----------------------------------------------------
  # 1. 业务后端 (PPanel Server)
-  #    host 网络：可出外网，通过 127.0.0.1 访问 MySQL/Redis/Tempo
+  #    host 网络：可出外网，直接访问 AWS RDS/Redis；通过 127.0.0.1 访问 Tempo
  # ----------------------------------------------------
  ppanel-server:
    image: registry.kxsw.us/vpn-server:${PPANEL_SERVER_TAG:-latest}
@@ -37,10 +37,6 @@ services:
        soft: 65535
        hard: 65535
    depends_on:
-      mysql:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
      tempo:
        condition: service_started
    logging:
@@ -50,82 +46,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 2. MySQL Database
-  # ----------------------------------------------------
-  mysql:
-    image: mysql:8.0
-    container_name: ppanel-mysql
-    restart: always
-    ports:
-      - "3306:3306" # 仅宿主机可访问，ppanel-server(host网络)通过127.0.0.1连接
-    environment:
-      MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?请在 .env 文件中设置 MYSQL_ROOT_PASSWORD}"
-      MYSQL_DATABASE: "ppanel"
-      TZ: Asia/Shanghai
-    command:
-      - --default-authentication-plugin=mysql_native_password
-      - --innodb_buffer_pool_size=16G
-      - --innodb_buffer_pool_instances=16
-      - --innodb_log_file_size=2G
-      - --innodb_flush_log_at_trx_commit=2
-      - --innodb_io_capacity=5000
-      - --max_connections=5000
-    volumes:
-      - mysql_data:/var/lib/mysql
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 65535
-        hard: 65535
-    networks:
-      - ppanel_net
-    healthcheck:
-      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-p${MYSQL_ROOT_PASSWORD}" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-
-  # ----------------------------------------------------
-  # 3. Redis
-  # ----------------------------------------------------
-  redis:
-    image: redis:8.2.1
-    container_name: ppanel-redis
-    restart: always
-    ports:
-      - "127.0.0.1:6379:6379" # 仅宿主机可访问，ppanel-server(host网络)通过127.0.0.1连接
-    command:
-      - redis-server
-      - --tcp-backlog 65535
-      - --maxmemory-policy allkeys-lru
-      - --requirepass hifast67yj
-    volumes:
-      - redis_data:/data
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 65535
-        hard: 65535
-    networks:
-      - ppanel_net
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-
-  # ----------------------------------------------------
-  # 4. Tempo (链路追踪存储)
+  # 2. Tempo (链路追踪存储)
  # ----------------------------------------------------
  tempo:
    image: grafana/tempo:2.4.1
@@ -149,7 +70,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 5. Loki (日志存储)
+  # 3. Loki (日志存储)
  # ----------------------------------------------------
  loki:
    image: grafana/loki:3.0.0
@@ -169,7 +90,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 6. Promtail (日志采集)
+  # 4. Promtail (日志采集)
  # ----------------------------------------------------
  promtail:
    image: grafana/promtail:3.0.0
@@ -193,7 +114,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 7. Grafana (可观测面板)
+  # 5. Grafana (可观测面板)
  # 访问: ssh -L 3333:localhost:3333 your-server 后浏览器打开 http://localhost:3333
  # 或配置 Nginx 反代（建议加认证）
  # ----------------------------------------------------
@@ -202,11 +123,18 @@ services:
    container_name: ppanel-grafana
    restart: always
    ports:
-      - "3333:3000" # 仅本机可访问，需 SSH 隧道或 Nginx 反代
+      - "127.0.0.1:3333:3000" # 仅本机可访问，需 SSH 隧道或 Nginx 反代
    environment:
      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD:?请在 .env 文件中设置 GRAFANA_PASSWORD}
      - GF_USERS_ALLOW_SIGN_UP=false
+      - GF_SERVER_DOMAIN=${GRAFANA_DOMAIN:-logsx.hifast.biz}
+      - GF_SERVER_ROOT_URL=${GRAFANA_ROOT_URL:-https://logsx.hifast.biz}
      - GF_FEATURE_TOGGLES_ENABLE=appObservability
+      - AWS_REGION=${AWS_REGION:-ap-east-1}
+      - AWS_DEFAULT_REGION=${AWS_REGION:-ap-east-1}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}
+      - AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN:-}
    volumes:
      - grafana_data:/var/lib/grafana
      - ./grafana/provisioning:/etc/grafana/provisioning
@@ -223,7 +151,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 8. Prometheus (指标采集)
+  # 6. Prometheus (指标采集)
  # ----------------------------------------------------
  prometheus:
    image: prom/prometheus:latest
@@ -248,26 +176,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 9. Redis Exporter
-  # ----------------------------------------------------
-  redis-exporter:
-    image: oliver006/redis_exporter:latest
-    container_name: ppanel-redis-exporter
-    restart: always
-    environment:
-      - REDIS_ADDR=redis://redis:6379
-    networks:
-      - ppanel_net
-    depends_on:
-      - redis
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-
-  # ----------------------------------------------------
-  # 10. Nginx Exporter (监控宿主机 Nginx)
+  # 7. Nginx Exporter (监控宿主机 Nginx)
  # ----------------------------------------------------
  nginx-exporter:
    image: nginx/nginx-prometheus-exporter:latest
@@ -286,28 +195,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 11. MySQL Exporter
-  # ----------------------------------------------------
-  mysql-exporter:
-    image: prom/mysqld-exporter:latest
-    container_name: ppanel-mysql-exporter
-    restart: always
-    command:
-      - --config.my-cnf=/etc/.my.cnf
-    volumes:
-      - ./mysql/.my.cnf:/etc/.my.cnf:ro
-    networks:
-      - ppanel_net
-    depends_on:
-      - mysql
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-
-  # ----------------------------------------------------
-  # 12. Node Exporter (宿主机监控)
+  # 8. Node Exporter (宿主机监控)
  # ----------------------------------------------------
  node-exporter:
    image: prom/node-exporter:latest
@@ -330,7 +218,7 @@ services:
        max-file: "3"

  # ----------------------------------------------------
-  # 13. cAdvisor (容器监控)
+  # 9. cAdvisor (容器监控)
  # ----------------------------------------------------
  cadvisor:
    image: gcr.io/cadvisor/cadvisor:latest
@@ -351,8 +239,6 @@ services:
        max-file: "3"

 volumes:
-  mysql_data:
-  redis_data:
  loki_data:
  grafana_data:
  prometheus_data: