Skip to content

Commit 0894138

Browse files
authored
Update node-agent, OBI (#120)
1 parent f50d256 commit 0894138

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

collector/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN mkdir -p /versions/0-default \
4646
# Set environment variables
4747
ENV BASE_URL=https://telemetry.betterstack.com
4848
ENV CLUSTER_COLLECTOR=false
49-
ENV COLLECTOR_VERSION=1.1.19
49+
ENV COLLECTOR_VERSION=1.1.20
5050
ENV VECTOR_VERSION=0.47.0
5151
ENV OBI_VERSION=0.4.1
5252
ENV CLUSTER_AGENT_VERSION=1.2.4

ebpf/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Add Node Agent to the image
2-
FROM ghcr.io/coroot/coroot-node-agent:1.27.0 AS node-agent
2+
FROM ghcr.io/coroot/coroot-node-agent:1.28.3 AS node-agent
33

44
# Add Cluster Agent to the image
55
FROM ghcr.io/coroot/coroot-cluster-agent:1.2.4 AS cluster-agent
@@ -13,8 +13,11 @@ FROM prometheuscommunity/postgres-exporter:v0.18.1 AS postgres-exporter
1313
# Add kafka exporter to the image
1414
FROM danielqsj/kafka-exporter:v1.9.0 AS kafka-exporter
1515

16-
# Add OBI to the image
17-
FROM otel/ebpf-instrument:v0.4.1 AS obi-source
16+
# Download OBI binary from GitHub release (Docker image otel/ebpf-instrument:v0.5.0 exists but is amd64-only)
17+
FROM debian:12.11-slim AS obi-source
18+
ARG TARGETARCH
19+
ADD https://github.com/open-telemetry/opentelemetry-ebpf-instrumentation/releases/download/v0.5.0/obi-v0.5.0-linux-${TARGETARCH}.tar.gz /tmp/obi.tar.gz
20+
RUN tar -xzf /tmp/obi.tar.gz -C /tmp
1821

1922
# Final stage - Using Debian 12.11-slim for glibc compatibility with node-agent
2023
FROM debian:12.11-slim
@@ -40,10 +43,9 @@ RUN curl -sS https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem \
4043
# Create necessary directories
4144
RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor /enrichment /bootstrap
4245

43-
# Copy eBPF instrument files from official image and set permissions
44-
COPY --from=obi-source --chmod=755 /ebpf-instrument /usr/local/bin/ebpf-instrument
45-
COPY --from=obi-source /LICENSE /LICENSE
46-
COPY --from=obi-source /NOTICE /NOTICE
46+
# Copy OBI binary and license files from extracted tarball
47+
COPY --from=obi-source --chmod=755 /tmp/obi /usr/local/bin/ebpf-instrument
48+
COPY --from=obi-source /tmp/LICENSE /tmp/NOTICE /usr/share/doc/ebpf-instrument/
4749

4850
# Copy Node Agent
4951
COPY --from=node-agent --chmod=755 /usr/bin/coroot-node-agent /usr/local/bin/node-agent

0 commit comments

Comments
 (0)