diff --git a/distributions/otelcol-contrib/config.yaml b/distributions/otelcol-contrib/config.yaml index 3ca32735e..b1b40d6a2 100644 --- a/distributions/otelcol-contrib/config.yaml +++ b/distributions/otelcol-contrib/config.yaml @@ -1,3 +1,4 @@ +--- # To limit exposure to denial of service attacks, change the host in endpoints below from 0.0.0.0 to a specific network interface. # See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks @@ -15,16 +16,6 @@ receivers: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - - # Collect own metrics - prometheus: - config: - scrape_configs: - - job_name: 'otel-collector' - scrape_interval: 10s - static_configs: - - targets: ['0.0.0.0:8888'] - jaeger: protocols: grpc: @@ -35,7 +26,6 @@ receivers: endpoint: 0.0.0.0:6831 thrift_http: endpoint: 0.0.0.0:14268 - zipkin: endpoint: 0.0.0.0:9411 @@ -47,6 +37,9 @@ exporters: verbosity: detailed service: + telemetry: + metrics: + level: basic pipelines: @@ -56,7 +49,7 @@ service: exporters: [debug] metrics: - receivers: [otlp, prometheus] + receivers: [otlp] processors: [batch] exporters: [debug] diff --git a/distributions/otelcol/config.yaml b/distributions/otelcol/config.yaml index 3ca32735e..d360d96b0 100644 --- a/distributions/otelcol/config.yaml +++ b/distributions/otelcol/config.yaml @@ -15,16 +15,6 @@ receivers: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - - # Collect own metrics - prometheus: - config: - scrape_configs: - - job_name: 'otel-collector' - scrape_interval: 10s - static_configs: - - targets: ['0.0.0.0:8888'] - jaeger: protocols: grpc: @@ -47,16 +37,18 @@ exporters: verbosity: detailed service: - + telemetry: + metrics: + level: basic pipelines: traces: - receivers: [otlp, jaeger, zipkin] + receivers: [otlp,jaeger,zipkin] processors: [batch] exporters: [debug] metrics: - receivers: [otlp, prometheus] + receivers: [otlp] processors: [batch] exporters: [debug] diff --git a/tests/golden/config.yaml b/tests/golden/config.yaml index 89c43ce93..e237c3b97 100644 --- a/tests/golden/config.yaml +++ b/tests/golden/config.yaml @@ -1,12 +1,10 @@ +--- receivers: - # Collect own metrics - prometheus: - config: - scrape_configs: - - job_name: 'otel-collector' - scrape_interval: 2s - static_configs: - - targets: ['0.0.0.0:8888'] +# Collects-metrics-with-otel + otlp: + protocols: + grpc: + http: exporters: debug: verbosity: detailed @@ -19,9 +17,13 @@ exporters: sending_queue: enabled: false service: + telemetry: + metrics: + level: basic + pipelines: metrics: receivers: - - prometheus + - otlp exporters: - otlp