feat(infra): 重构基础设施配置，修改相关配置

- 新增redis.conf和otel-config.yaml配置文件
- 更新metadata-config.yaml中的数据库和redis配置
- 重构docker-compose.yml使用国内镜像并调整端口
- 优化prometheus.yml配置使用固定IP地址
- 更新postgres初始化脚本中的权限设置
- 新增supervisor配置文件用于管理基础设施
- 删除旧的构建脚本并新增部署脚本

Author: JaD1ng

mock/s3/deployments/consul/consul-config.json

@@ -1,36 +1,10 @@
 {
   "datacenter": "mock-s3-dc",
-  "node_name": "consul-server",
+  "data_dir": "/consul/data",
+  "log_level": "INFO",
   "server": true,
   "bootstrap_expect": 1,
-  "bind_addr": "172.20.0.10",
-  "client_addr": "0.0.0.0",
-  "retry_join": [
-    "consul"
-  ],
   "ui_config": {
     "enabled": true
-  },
-  "connect": {
-    "enabled": true
-  },
-  "ports": {
-    "grpc": 8502,
-    "grpc_tls": 8503
-  },
-  "acl": {
-    "enabled": false,
-    "default_policy": "allow"
-  },
-  "log_level": "INFO",
-  "enable_syslog": false,
-  "data_dir": "/consul/data",
-  "encrypt_verify_incoming": false,
-  "encrypt_verify_outgoing": false,
-  "verify_incoming": false,
-  "verify_outgoing": false,
-  "ca_file": "",
-  "cert_file": "",
-  "key_file": "",
-  "verify_server_hostname": false
+  }
 }

mock/s3/deployments/docker-compose.infra.yml renamed to mock/s3/deployments/docker-compose.yml

@@ -21,7 +21,7 @@ volumes:
 services:
   # Consul - 服务发现
   consul:
-    image: hashicorp/consul:1.16
+    image: docker.m.daocloud.io/hashicorp/consul:1.16
     container_name: mock-s3-consul
     hostname: consul
     networks:
@@ -33,19 +33,19 @@ services:
     volumes:
       - consul-data:/consul/data
       - ./consul/consul-config.json:/consul/config/consul-config.json:ro
-    command: consul agent -server -bootstrap -ui -node=consul-server -bind=172.21.0.10 -client=0.0.0.0
+    command: consul agent -server -bootstrap -ui -node=consul-server -bind=172.21.0.10 -client=0.0.0.0 -data-dir=/consul/data
     restart: unless-stopped
 
   # PostgreSQL - 数据存储
   postgres:
-    image: postgres:15-alpine
+    image: docker.m.daocloud.io/postgres:15-alpine
     container_name: mock-s3-postgres
     hostname: postgres
     networks:
       infra-network:
         ipv4_address: 172.21.0.11
     ports:
-      - "5432:5432"
+      - "5532:5432"  # 改为5532避免与系统PostgreSQL冲突
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres123}
@@ -57,14 +57,14 @@ services:
 
   # Redis - 缓存和队列
   redis:
-    image: redis:7-alpine
+    image: docker.m.daocloud.io/redis:7-alpine
     container_name: mock-s3-redis
     hostname: redis
     networks:
       infra-network:
         ipv4_address: 172.21.0.12
     ports:
-      - "6379:6379"
+      - "16379:6379"  # 改为16379避免与系统Redis冲突
     volumes:
       - redis-data:/data
       - ./redis/redis.conf:/usr/local/etc/redis/redis.conf:ro
@@ -73,7 +73,7 @@ services:
 
   # Prometheus - 指标收集
   prometheus:
-    image: prom/prometheus:latest
+    image: docker.m.daocloud.io/prom/prometheus:latest
     container_name: mock-s3-prometheus
     hostname: prometheus
     networks:
@@ -92,7 +92,7 @@ services:
 
   # Grafana - 可视化
   grafana:
-    image: grafana/grafana:latest
+    image: docker.m.daocloud.io/grafana/grafana:latest
     container_name: mock-s3-grafana
     hostname: grafana
     networks:
@@ -111,7 +111,7 @@ services:
 
   # Elasticsearch - 日志存储
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+    image: docker.m.daocloud.io/elastic/elasticsearch:8.10.2
     container_name: mock-s3-elasticsearch
     hostname: elasticsearch
     networks:
@@ -130,7 +130,7 @@ services:
 
   # Kibana - 日志查询
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.10.2
+    image: docker.m.daocloud.io/elastic/kibana:8.10.2
     container_name: mock-s3-kibana
     hostname: kibana
     networks:
@@ -146,7 +146,7 @@ services:
 
   # OpenTelemetry Collector
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:latest
+    image: docker.m.daocloud.io/otel/opentelemetry-collector-contrib:latest
     container_name: mock-s3-otel
     hostname: otel-collector
     networks:
@@ -155,7 +155,7 @@ services:
     ports:
       - "4317:4317"   # OTLP gRPC
       - "4318:4318"   # OTLP HTTP
-      - "8888:8888"   # Prometheus metrics
+      - "18888:8889"  # Prometheus metrics - 使用8889内部端口避免冲突
     volumes:
       - ./otel/otel-config.yaml:/etc/otel-collector-config.yaml:ro
     command: ["--config=/etc/otel-collector-config.yaml"]

mock/s3/deployments/observability/otel-config.yaml

@@ -0,0 +1,22 @@
+# OpenTelemetry Collector配置
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:4317
+      http:
+        endpoint: 0.0.0.0:4318
+
+processors:
+  batch:
+
+exporters:
+  prometheus:
+    endpoint: "0.0.0.0:8889"  # 改用8889端口避免冲突
+
+service:
+  pipelines:
+    metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [prometheus]

mock/s3/deployments/observability/prometheus.yml

@@ -14,14 +14,14 @@ scrape_configs:
   # OpenTelemetry Collector指标
   - job_name: 'otel-collector'
     static_configs:
-      - targets: ['otel-collector:8888']
+      - targets: ['172.21.0.24:8889']  # 使用otel-collector的固定IP和新端口
     scrape_interval: 10s
     metrics_path: /metrics
 
   # Mock S3服务通过Consul服务发现
   - job_name: 'mock-s3-services'
     consul_sd_configs:
-      - server: 'consul:8500'
+      - server: '172.21.0.10:8500'  # 使用Consul的固定IP地址
         services: 
           - metadata-service
           - storage-service  

mock/s3/deployments/postgres/init.sql

@@ -19,8 +19,8 @@ CREATE INDEX IF NOT EXISTS idx_metadata_status ON metadata(status);
 CREATE INDEX IF NOT EXISTS idx_metadata_created_at ON metadata(created_at);
 
 -- 权限设置
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO admin;
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO admin;
-GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO admin;
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO postgres;
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO postgres;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO postgres;
 
 COMMIT;

mock/s3/deployments/redis/redis.conf

@@ -0,0 +1,4 @@
+# Redis配置文件
+bind 0.0.0.0
+protected-mode no
+port 6379