From d94c0838da5a6c7fbd1e7e8620f4ff8b571beaca Mon Sep 17 00:00:00 2001 From: "grafanarenovatebot[bot]" <146220760+grafanarenovatebot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:16:49 +0000 Subject: [PATCH 1/3] Update dependency opentelemetry-collector to v0.109.0 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9f53f97..b3ab5b7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ ENV TEMPO_VERSION="2.5.0" # renovate: datasource=github-releases depName=loki packageName=grafana/loki ENV LOKI_VERSION="3.1.0" # renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases -ENV OPENTELEMETRY_COLLECTOR_VERSION="0.106.1" +ENV OPENTELEMETRY_COLLECTOR_VERSION=v0.109.0 # TARGETARCH is automatically detected and set by the Docker daemon during the build process. If the build starts # on an amd64 architecture, than the TARGETARCH will be set to `amd64`. From 9500e3fc000f87748b0ebb5cc9143dbeb5b38236 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 13 Sep 2024 11:57:40 +0200 Subject: [PATCH 2/3] use substring --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b3ab5b7..f6b1b71 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -42,10 +42,10 @@ RUN bash -c 'curl -sOL https://github.com/grafana/loki/releases/download/v"$LOKI unzip loki-linux-"${TARGETARCH}" -d loki/ && \ rm loki-linux-"${TARGETARCH}".zip' -RUN bash -c 'curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v"$OPENTELEMETRY_COLLECTOR_VERSION"/otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz && \ +RUN bash -c 'curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/${OPENTELEMETRY_COLLECTOR_VERSION}"/otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ mkdir otelcol-contrib && \ - tar xfz otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz -C otelcol-contrib/ && \ - rm otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz' + tar xfz otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz -C otelcol-contrib/ && \ + rm otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz' COPY prometheus.yaml . COPY run-prometheus.sh . From 57457a34ae1f1953271908e4b3af7d5be470df5a Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 13 Sep 2024 12:01:26 +0200 Subject: [PATCH 3/3] use substring --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f6b1b71..2b086ed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -42,7 +42,7 @@ RUN bash -c 'curl -sOL https://github.com/grafana/loki/releases/download/v"$LOKI unzip loki-linux-"${TARGETARCH}" -d loki/ && \ rm loki-linux-"${TARGETARCH}".zip' -RUN bash -c 'curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/${OPENTELEMETRY_COLLECTOR_VERSION}"/otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ +RUN bash -c 'curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/"${OPENTELEMETRY_COLLECTOR_VERSION}"/otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ mkdir otelcol-contrib && \ tar xfz otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz -C otelcol-contrib/ && \ rm otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION:1}"_linux_"${TARGETARCH}".tar.gz'