From c25c94ec304a53874590dff142a1e767c8336e72 Mon Sep 17 00:00:00 2001 From: houseme Date: Mon, 28 Apr 2025 11:34:52 +0800 Subject: [PATCH] upgrade config file --- .docker/observability/config/obs.toml | 1 + .docker/observability/jaeger-config.yaml | 11 +++++++++++ deploy/config/obs-zh.example.toml | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.docker/observability/config/obs.toml b/.docker/observability/config/obs.toml index 3b26644c..e4ea037b 100644 --- a/.docker/observability/config/obs.toml +++ b/.docker/observability/config/obs.toml @@ -7,6 +7,7 @@ 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 diff --git a/.docker/observability/jaeger-config.yaml b/.docker/observability/jaeger-config.yaml index 0df35f83..205d804d 100644 --- a/.docker/observability/jaeger-config.yaml +++ b/.docker/observability/jaeger-config.yaml @@ -37,9 +37,14 @@ extensions: traces_archive: another_store ui: config_file: ./cmd/jaeger/config-ui.json + log_access: true # The maximum duration that is considered for clock skew adjustments. # Defaults to 0 seconds, which means it's disabled. max_clock_skew_adjust: 0s + grpc: + endpoint: 0.0.0.0:16685 + http: + endpoint: 0.0.0.0:16686 jaeger_storage: backends: @@ -49,6 +54,12 @@ extensions: another_store: memory: max_traces: 100000 + metric_backends: + some_metrics_storage: + prometheus: + endpoint: http://prometheus:9090 + normalize_calls: true + normalize_duration: true remote_sampling: # You can either use file or adaptive sampling strategy in remote_sampling diff --git a/deploy/config/obs-zh.example.toml b/deploy/config/obs-zh.example.toml index 2bf4260f..712ae6ce 100644 --- a/deploy/config/obs-zh.example.toml +++ b/deploy/config/obs-zh.example.toml @@ -6,7 +6,8 @@ meter_interval = 30 # 指标收集间隔，单位为秒 service_name = "rustfs" # 服务名称，用于标识当前服务 service_version = "0.1.0" # 服务版本号 environments = "develop" # 运行环境，如开发环境 (develop) -logger_level = "debug" # 日志级别，可选 debug/info/warn/error 等 +logger_level = "debug" # 日志级别，可选 debug/info/warn/error 等 +local_logging_enabled = true # 是否启用本地 stdout 日志记录，true 表示启用，false 表示禁用 [sinks] [sinks.kafka] # Kafka 接收器配置