update config

Signed-off-by: Weifeng Wang <[email protected]> code clean Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Mar 8, 2024 · 6b04954 · 6b04954
1 parent e94b0bb
commit 6b04954
Show file tree

Hide file tree

Showing 68 changed files with 7,593 additions and 614 deletions.
diff --git a/Makefile b/Makefile
@@ -204,8 +204,6 @@ deploy-grafana: deploy-prometheus-operator-crds deploy-minio deploy-gateway
 	$(info ******************** deploy grafana manifests ********************)
 	@$(KUSTOMIZE) build --enable-helm kubernetes/common/grafana | kubectl apply -f -
 	@$(KUSTOMIZE) build --enable-helm kubernetes/common/grafana-agent | kubectl apply -f -
-	kubectl rollout status -n monitoring-system deployment/grafana --watch --timeout=600s
-	kubectl rollout status -n minio-system statefulset/codelab-pool-10gb --watch --timeout=600s
 delete-grafana:
 	@$(KUSTOMIZE) build --enable-helm kubernetes/common/grafana-agent | kubectl delete --ignore-not-found -f -
 	@$(KUSTOMIZE) build --enable-helm kubernetes/common/grafana | kubectl delete --ignore-not-found -f -

diff --git a/docker-compose/common/config/agent-flow/monolithic-mode-all.river b/docker-compose/common/config/agent-flow/monolithic-mode-all.river
@@ -280,7 +280,7 @@ otelcol.processor.filter "containers" {
 otelcol.processor.batch "containers" {
 	send_batch_size     = 16384
 	send_batch_max_size = 0
-	timeout             = "2s"
+	timeout             = "5s"
 
 	output {
 		metrics = [otelcol.processor.memory_limiter.containers.input]

diff --git a/docker-compose/common/config/agent-flow/traces.river b/docker-compose/common/config/agent-flow/traces.river
@@ -243,7 +243,7 @@ otelcol.processor.filter "containers" {
 otelcol.processor.batch "containers" {
 	send_batch_size     = 16384
 	send_batch_max_size = 0
-	timeout             = "2s"
+	timeout             = "5s"
 
 	output {
 		metrics = [otelcol.processor.memory_limiter.containers.input]

diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml
@@ -7,7 +7,7 @@ analytics:
 server:
   http_listen_port: 3100
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   compactor_address: http://compactor:3100

diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml
@@ -7,7 +7,7 @@ analytics:
 server:
   http_listen_port: 3100
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   compactor_address: loki

diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml
@@ -7,7 +7,7 @@ analytics:
 server:
   http_listen_port: 3100
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   compactor_address: loki-backend

diff --git a/docker-compose/common/config/mimir/microservices-mode-metrics.yaml b/docker-compose/common/config/mimir/microservices-mode-metrics.yaml
@@ -9,7 +9,7 @@ usage_stats:
 server:
   http_listen_port: 8080
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   storage:

diff --git a/docker-compose/common/config/mimir/monolithic-mode-metrics.yaml b/docker-compose/common/config/mimir/monolithic-mode-metrics.yaml
@@ -9,7 +9,7 @@ usage_stats:
 server:
   http_listen_port: 8080
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   storage:

diff --git a/docker-compose/common/config/mimir/read-write-mode-metrics.yaml b/docker-compose/common/config/mimir/read-write-mode-metrics.yaml
@@ -9,7 +9,7 @@ usage_stats:
 server:
   http_listen_port: 8080
   grpc_listen_port: 9095
-  log_level: warn
+  log_level: info
 
 common:
   storage:

diff --git a/docker-compose/common/config/tempo/microservices-mode-traces.yaml b/docker-compose/common/config/tempo/microservices-mode-traces.yaml
@@ -66,6 +66,7 @@ metrics_generator:
 server:
   http_listen_port: 3100
   grpc_listen_port: 9095
+  log_level: info
 
 
 storage:

diff --git a/docker-compose/common/config/tempo/monolithic-mode-traces.yaml b/docker-compose/common/config/tempo/monolithic-mode-traces.yaml
@@ -32,6 +32,7 @@ querier:
 server:
   http_listen_port: 3200
   grpc_listen_port: 9095
+  log_level: info
 
 metrics_generator:
   processor:

diff --git a/docker-compose/microservices-mode/logs/docker-compose.yaml b/docker-compose/microservices-mode/logs/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
       timeout: 5s
       retries: 5
     ports:
-      - "3100"
+      - "3100:3100"
 
   distributor:
     depends_on:
@@ -46,7 +46,6 @@ services:
       - -config.file=/etc/loki.yaml
       - -target=distributor
       - -config.expand-env=true
-#      - -log.level=warn
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ]
       interval: 10s
@@ -70,8 +69,6 @@ services:
       - -config.file=/etc/loki.yaml
       - -target=ingester
       - -config.expand-env=true
-    ports:
-      - "3100"
     deploy:
       replicas: 3
     networks:
@@ -157,7 +154,7 @@ services:
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
       - ../../common/config/loki/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml # load datasources
     environment:
-      - GF_LOG_LEVEL=error
+      - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
     ports:
       - "3000:3000"
diff --git a/docker-compose/microservices-mode/metrics/docker-compose.yaml b/docker-compose/microservices-mode/metrics/docker-compose.yaml
@@ -35,7 +35,7 @@ services:
       timeout: 5s
       retries: 5
     ports:
-      - "8080"
+      - "8080:8080"
 
   distributor:
     depends_on:
@@ -188,8 +188,6 @@ services:
       - -config.file=/etc/mimir.yaml
       - -config.expand-env=true
       - -target=ingester
-    ports:
-      - "8080"
     deploy:
       replicas: 3
     networks:
@@ -222,12 +220,12 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ../../common/config/mimir/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml    # load datasources
-      - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin # load dashboards
+      - ../../common/config/mimir/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
+      - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin
       - ../../../monitoring-mixins/agent-flow-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/agent-flow-mixin
       - ../../../monitoring-mixins/go-runtime-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/go-runtime-mixin
     environment:
-      - GF_LOG_LEVEL=error
+      - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
     ports:
       - "3000:3000"
diff --git a/docker-compose/microservices-mode/profiles/docker-compose.yaml b/docker-compose/microservices-mode/profiles/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
       timeout: 5s
       retries: 5
     ports:
-      - "4040"
+      - "4040:4040"
 
   distributor:
     depends_on:
@@ -39,16 +39,13 @@ services:
     image: &pyroscopeImage grafana/pyroscope:1.4.0
     volumes:
       - ../../common/config/pyroscope/microservices-mode-profiles.yaml:/etc/config.yaml # Note: profiles use microservices-mode-profiles.yaml
-    ports:
-      - "4040"
     command:
       - -config.file=/etc/config.yaml
       - -target=distributor
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
       # - -runtime-config.file=/etc/overrides/overrides.yaml
-      # - -log.level=warn
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:4040/ready || exit 1" ]
       interval: 15s
@@ -72,7 +69,6 @@ services:
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=warn
     deploy:
       replicas: 3
     networks:
@@ -93,7 +89,6 @@ services:
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=warn
     deploy:
       replicas: 1
     networks:
@@ -108,15 +103,12 @@ services:
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope/microservices-mode-profiles.yaml:/etc/config.yaml # Note: profiles use microservices-mode-profiles.yaml
-    ports:
-      - "4040"
     command:
       - -config.file=/etc/config.yaml
       - -target=query-frontend
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=warn
     networks:
       default:
         aliases:
@@ -137,7 +129,6 @@ services:
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=warn
       - -store-gateway.sharding-ring.replication-factor=1
     networks:
       default:
@@ -157,7 +148,6 @@ services:
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=error
     networks:
       default:
         aliases:
@@ -176,7 +166,6 @@ services:
       - -config.expand-env=true
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
-      - -log.level=error
       - -store-gateway.sharding-ring.replication-factor=1
     networks:
       default:
@@ -193,7 +182,7 @@ services:
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
       - ../../common/config/pyroscope/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml # load datasources
     environment:
-      - GF_LOG_LEVEL=error
+      - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
       - GF_FEATURE_TOGGLES_ENABLE=flameGraph
       - GF_DIAGNOSTICS_PROFILING_ENABLED=true

diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml
@@ -39,6 +39,9 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    ports:
+      - "3200:3200"
+      - "8080:8080"
 
   distributor:
     depends_on:
@@ -51,7 +54,6 @@ services:
       - -config.file=/etc/tempo.yaml
       - -target=distributor
       - -config.expand-env=true
-      - -log.level=warn
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -76,7 +78,6 @@ services:
       - -config.file=/etc/tempo.yaml
       - -target=ingester
       - -config.expand-env=true
-      - -log.level=warn
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -101,7 +102,6 @@ services:
       - -config.file=/etc/tempo.yaml
       - -target=query-frontend
       - -config.expand-env=true
-      - -log.level=warn
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -122,7 +122,6 @@ services:
       - -config.file=/etc/tempo.yaml
       - -target=querier
       - -config.expand-env=true
-      - -log.level=warn
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -140,7 +139,6 @@ services:
     command:
       - -config.file=/etc/tempo.yaml
       - -target=compactor
-      - -log.level=error
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -159,7 +157,6 @@ services:
       - -config.file=/etc/config.yaml
       - -target=all
       - -config.expand-env=true
-      - -log.level=warn
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ready || exit 1" ]
       interval: 10s
@@ -189,7 +186,7 @@ services:
       - ../../../monitoring-mixins/agent-flow-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/agent-flow-mixin
       - ../../../monitoring-mixins/go-runtime-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/go-runtime-mixin
     environment:
-      - GF_LOG_LEVEL=error
+      - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
       - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles
     ports:

diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
@@ -46,7 +46,6 @@ services:
       - -config.file=/etc/config.yaml
       - -target=all
       - -config.expand-env=true
-      - -log.level=warn
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ready || exit 1" ]
       interval: 10s
@@ -84,7 +83,6 @@ services:
       - -config.file=/etc/config.yaml
       - -target=all
       - -config.expand-env=true
-      - -log.level=warn
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ]
       interval: 10s
@@ -124,7 +122,6 @@ services:
       - -config.file=/etc/config.yaml
       - -target=all
       - -config.expand-env=true
-      - -log.level=warn
     environment:
       - JAEGER_AGENT_HOST=agent
       - JAEGER_AGENT_PORT=6831
@@ -162,7 +159,6 @@ services:
     command:
       - -config.file=/etc/config.yaml
       - -config.expand-env=true
-      - -log.level=warn
 
   grafana:
     image: grafana/grafana:10.4.0

diff --git a/docker-compose/monolithic-mode/logs/docker-compose.yaml b/docker-compose/monolithic-mode/logs/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
       timeout: 5s
       retries: 5
     ports:
-      - "3100"
+      - "3100:3100"
 
   loki:
     depends_on:
@@ -43,12 +43,9 @@ services:
     command:
       - -config.file=/etc/loki.yaml
       - -target=all
-      - -log.level=error
       - -config.expand-env=true
     volumes:
       - ../../common/config/loki/monolithic-mode-logs.yaml:/etc/loki.yaml
-    ports:
-      - "3100"
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ]
       interval: 10s