Skip to content

Commit e541263

Browse files
[otel-col] Add docker stats receiver (open-telemetry#1650)
* Add docker stats receiver * changelog * Nit: prevent write access to the Docker socket Co-authored-by: Roger Coll <roger.coll@elastic.co> * Add compose minimal --------- Co-authored-by: Roger Coll <roger.coll@elastic.co>
1 parent 69a6215 commit e541263

5 files changed

Lines changed: 19 additions & 2 deletions

File tree

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ TRACETEST_IMAGE=kubeshop/tracetest:v1.3.0
2222
ENV_PLATFORM=local
2323

2424
# OpenTelemetry Collector
25+
DOCKER_SOCK=/var/run/docker.sock
2526
OTEL_COLLECTOR_HOST=otelcol
2627
OTEL_COLLECTOR_PORT_GRPC=4317
2728
OTEL_COLLECTOR_PORT_HTTP=4318

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ the release.
1818
([#1610](https://github.com/open-telemetry/opentelemetry-demo/pull/1610))
1919
* [Valkey] Replace Redis with Valkey
2020
([#1619](https://github.com/open-telemetry/opentelemetry-demo/pull/1619))
21-
* ([recommendation] updated flag name to match flagd configuration
21+
* [recommendation] updated flag name to match flagd configuration
2222
([#1634](https://github.com/open-telemetry/opentelemetry-demo/pull/1634))
23+
* [otel-col] Add docker stats receiver
24+
([#1650](https://github.com/open-telemetry/opentelemetry-demo/pull/1650))
2325

2426
## 1.10.0
2527

docker-compose.minimal.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,9 @@ services:
583583
memory: 200M
584584
restart: unless-stopped
585585
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
586+
user: 0:0
586587
volumes:
588+
- ${DOCKER_SOCK}:/var/run/docker.sock:ro
587589
- ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
588590
- ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml
589591
ports:

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,9 @@ services:
693693
memory: 200M
694694
restart: unless-stopped
695695
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
696+
user: 0:0
696697
volumes:
698+
- ${DOCKER_SOCK}:/var/run/docker.sock:ro
697699
- ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
698700
- ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml
699701
ports:

src/otelcollector/otelcol-config.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,20 @@ receivers:
1313
httpcheck/frontendproxy:
1414
targets:
1515
- endpoint: http://frontendproxy:${env:ENVOY_PORT}
16+
docker_stats:
17+
endpoint: unix:///var/run/docker.sock
1618
redis:
1719
endpoint: "valkey-cart:6379"
1820
username: "valkey"
1921
collection_interval: 10s
22+
# Collector metrics
23+
prometheus:
24+
config:
25+
scrape_configs:
26+
- job_name: 'otelcol'
27+
scrape_interval: 10s
28+
static_configs:
29+
- targets: ['0.0.0.0:8888']
2030

2131
exporters:
2232
debug:
@@ -48,7 +58,7 @@ service:
4858
processors: [batch]
4959
exporters: [otlp, debug, spanmetrics]
5060
metrics:
51-
receivers: [httpcheck/frontendproxy, redis, otlp, spanmetrics]
61+
receivers: [docker_stats, httpcheck/frontendproxy, otlp, prometheus, redis, spanmetrics]
5262
processors: [batch]
5363
exporters: [otlphttp/prometheus, debug]
5464
logs:

0 commit comments

Comments
 (0)