Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions distributions/otelcol-contrib/config.yaml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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:
Expand All @@ -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

Expand All @@ -47,6 +37,9 @@ exporters:
verbosity: detailed

service:
telemetry:
metrics:
level: basic

pipelines:

Expand All @@ -56,7 +49,7 @@ service:
exporters: [debug]

metrics:
receivers: [otlp, prometheus]
receivers: [otlp]
processors: [batch]
exporters: [debug]

Expand Down
18 changes: 5 additions & 13 deletions distributions/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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]

Expand Down
20 changes: 11 additions & 9 deletions tests/golden/config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,9 +17,13 @@ exporters:
sending_queue:
enabled: false
service:
telemetry:
metrics:
level: basic

pipelines:
metrics:
receivers:
- prometheus
- otlp
exporters:
- otlp
Loading