Merge branch 'main' into dada/fix-entry

.docker/observability/README_ZH.md

@@ -9,7 +9,7 @@ Jaeger、Prometheus 等）而需要运行和维护多个代理/收集器的必
 2. 执行以下命令启动服务：
 
 ```bash
-docker compose up -d -f docker-compose.yml
+docker compose -f docker-compose.yml  up -d
 ```
 
 ### 访问监控面板
@@ -34,7 +34,7 @@ docker compose up -d -f docker-compose.yml
 | service_name    | 服务名称                       | rustfs                |
 | service_version | 服务版本                       | 1.0.0                 |
 | environment     | 运行环境                       | production            |
-| meter_interval  | 指标导出间隔 (秒)                  | 30                    |
+| meter_interval  | 指标导出间隔 (秒)               | 30                  |
 | sample_ratio    | 采样率                        | 1.0                   |
 | use_stdout      | 是否输出到控制台                   | true/false            |
 | logger_level    | 日志级别                       | info                  |

.docker/observability/config/obs-multi.toml

@@ -0,0 +1,34 @@
+[observability]
+endpoint = "http://otel-collector:4317" # Default is "http://localhost:4317" if not specified
+use_stdout = false # Output with stdout, true output, false no output
+sample_ratio = 2.0
+meter_interval = 30
+service_name = "rustfs"
+service_version = "0.1.0"
+environments = "production"
+logger_level = "debug"
+local_logging_enabled = true
+
+[sinks]
+[sinks.kafka] # Kafka sink is disabled by default
+enabled = false
+bootstrap_servers = "localhost:9092"
+topic = "logs"
+batch_size = 100 # Default is 100 if not specified
+batch_timeout_ms = 1000 # Default is 1000ms if not specified
+
+[sinks.webhook]
+enabled = false
+endpoint = "http://localhost:8080/webhook"
+auth_token = ""
+batch_size = 100 # Default is 3 if not specified
+batch_timeout_ms = 1000 # Default is 100ms if not specified
+
+[sinks.file]
+enabled = true
+path = "/root/data/logs/app.log"
+batch_size = 10
+batch_timeout_ms = 1000 # Default is 8192 bytes if not specified
+
+[logger]
+queue_capacity = 10

.docker/observability/config/obs.toml

@@ -1,5 +1,5 @@
 [observability]
-endpoint = "http://otel-collector:4317" # Default is "http://localhost:4317" if not specified
+endpoint = "http://localhost:4317" # Default is "http://localhost:4317" if not specified
 use_stdout = false # Output with stdout, true output, false no output
 sample_ratio = 2.0
 meter_interval = 30

.docker/observability/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.120.0
+    image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.124.0
     environment:
       - TZ=Asia/Shanghai
     volumes:
@@ -16,7 +16,7 @@ services:
     networks:
       - otel-network
   jaeger:
-    image: jaegertracing/jaeger:2.4.0
+    image: jaegertracing/jaeger:2.5.0
     environment:
       - TZ=Asia/Shanghai
     ports:
@@ -26,7 +26,7 @@ services:
     networks:
       - otel-network
   prometheus:
-    image: prom/prometheus:v3.2.1
+    image: prom/prometheus:v3.3.0
     environment:
       - TZ=Asia/Shanghai
     volumes:
@@ -36,7 +36,7 @@ services:
     networks:
       - otel-network
   loki:
-    image: grafana/loki:3.4.2
+    image: grafana/loki:3.5.0
     environment:
       - TZ=Asia/Shanghai
     volumes:
@@ -47,7 +47,7 @@ services:
     networks:
       - otel-network
   grafana:
-    image: grafana/grafana:11.6.0
+    image: grafana/grafana:11.6.1
     ports:
       - "3000:3000"  # Web UI
     environment: