diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 92e6a2a255..1c3b59c1c5 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -47,7 +47,7 @@ receivers: # thrift_binary: # endpoint: 0.0.0.0:6832 hostmetrics: - collection_interval: 60s + collection_interval: 30s scrapers: cpu: {} load: {} @@ -58,7 +58,7 @@ receivers: prometheus: config: global: - scrape_interval: 30s + scrape_interval: 60s scrape_configs: # otel-collector internal metrics - job_name: otel-collector @@ -75,7 +75,6 @@ processors: # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels. detectors: [env, system] # include ec2 for AWS, gce for GCP and azure for Azure. timeout: 2s - override: false signozspanmetrics/prometheus: metrics_exporter: prometheus latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ] diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index b7311a18f8..46bd7a87d4 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -47,7 +47,7 @@ receivers: # thrift_binary: # endpoint: 0.0.0.0:6832 hostmetrics: - collection_interval: 60s + collection_interval: 30s scrapers: cpu: {} load: {} @@ -58,7 +58,7 @@ receivers: prometheus: config: global: - scrape_interval: 30s + scrape_interval: 60s scrape_configs: # otel-collector internal metrics - job_name: otel-collector @@ -99,7 +99,6 @@ processors: # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels. detectors: [env, system] # include ec2 for AWS, gce for GCP and azure for Azure. timeout: 2s - override: false extensions: health_check: diff --git a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml index 3cef45e640..33600b35e6 100644 --- a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml +++ b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml @@ -47,7 +47,7 @@ receivers: # thrift_binary: # endpoint: 0.0.0.0:6832 hostmetrics: - collection_interval: 60s + collection_interval: 30s scrapers: cpu: {} load: {} @@ -58,11 +58,10 @@ receivers: prometheus: config: global: - scrape_interval: 30s + scrape_interval: 60s scrape_configs: # otel-collector internal metrics - job_name: otel-collector - scrape_interval: 60s static_configs: - targets: - otel-collector:8888 @@ -99,7 +98,6 @@ processors: resourcedetection: detectors: [env, system] timeout: 2s - override: false extensions: health_check: