From dd2a56f9fae86c409fc23f947e800a407afedbf5 Mon Sep 17 00:00:00 2001 From: apolzek Date: Tue, 7 Jan 2025 07:21:59 -0300 Subject: [PATCH 1/3] Update docker image in examples/demo from 0.88.0 to 0.116.1 Update collector configuration to keep metrics working on port 8888 --- examples/demo/.env | 2 +- examples/demo/otel-collector-config.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/demo/.env b/examples/demo/.env index 4963b70d55a0..b687611f688e 100644 --- a/examples/demo/.env +++ b/examples/demo/.env @@ -1,2 +1,2 @@ -OTELCOL_IMG=otel/opentelemetry-collector:0.88.0 +OTELCOL_IMG=otel/opentelemetry-collector:0.116.1 OTELCOL_ARGS= diff --git a/examples/demo/otel-collector-config.yaml b/examples/demo/otel-collector-config.yaml index 205a47e97c4a..1b260098c04f 100644 --- a/examples/demo/otel-collector-config.yaml +++ b/examples/demo/otel-collector-config.yaml @@ -42,3 +42,11 @@ service: receivers: [otlp] processors: [batch] exporters: [debug, prometheus] + telemetry: + metrics: + readers: + - pull: + exporter: + prometheus: + host: '0.0.0.0' + port: 8888 \ No newline at end of file From 556352e843dede8a6a37327382d5f19eb47365e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Batista?= Date: Tue, 7 Jan 2025 13:43:07 -0300 Subject: [PATCH 2/3] Remove whitespace change Co-authored-by: Curtis Robert --- examples/demo/otel-collector-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/demo/otel-collector-config.yaml b/examples/demo/otel-collector-config.yaml index 1b260098c04f..3c241503b2f7 100644 --- a/examples/demo/otel-collector-config.yaml +++ b/examples/demo/otel-collector-config.yaml @@ -49,4 +49,4 @@ service: exporter: prometheus: host: '0.0.0.0' - port: 8888 \ No newline at end of file + port: 8888 From b854b404dfde23e8be85cb31b10714dd5a03f4dc Mon Sep 17 00:00:00 2001 From: apolzek Date: Wed, 8 Jan 2025 16:36:33 -0300 Subject: [PATCH 3/3] move configuration from .env to docker-compose.yaml to support renovate updates --- examples/demo/.env | 2 -- examples/demo/docker-compose.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 examples/demo/.env diff --git a/examples/demo/.env b/examples/demo/.env deleted file mode 100644 index b687611f688e..000000000000 --- a/examples/demo/.env +++ /dev/null @@ -1,2 +0,0 @@ -OTELCOL_IMG=otel/opentelemetry-collector:0.116.1 -OTELCOL_ARGS= diff --git a/examples/demo/docker-compose.yaml b/examples/demo/docker-compose.yaml index b23fbb3b823d..db514918576c 100644 --- a/examples/demo/docker-compose.yaml +++ b/examples/demo/docker-compose.yaml @@ -21,9 +21,9 @@ services: # Collector otel-collector: - image: ${OTELCOL_IMG} + image: otel/opentelemetry-collector:0.116.1 restart: always - command: ["--config=/etc/otel-collector-config.yaml", "${OTELCOL_ARGS}"] + command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml ports: