diff --git a/tests-synthetic/Dockerfile.telegraf b/tests-synthetic/Dockerfile.telegraf index b3b9055b..22f1d700 100644 --- a/tests-synthetic/Dockerfile.telegraf +++ b/tests-synthetic/Dockerfile.telegraf @@ -1,7 +1,7 @@ FROM golang:1.16-alpine AS builder RUN apk add git -RUN git clone --branch jgm-opentelemetry --depth 1 https://github.com/jacobmarble/telegraf +RUN git clone --branch master --depth 1 https://github.com/influxdata/telegraf WORKDIR /go/telegraf RUN \ @@ -12,3 +12,4 @@ RUN \ FROM scratch COPY --from=builder /go/bin/telegraf / +CMD ["/telegraf"] diff --git a/tests-synthetic/docker-compose.influx2otel-otelcol.yml b/tests-synthetic/docker-compose.influx2otel-otelcol.yml index d4d24ac3..444fe2ea 100644 --- a/tests-synthetic/docker-compose.influx2otel-otelcol.yml +++ b/tests-synthetic/docker-compose.influx2otel-otelcol.yml @@ -16,8 +16,7 @@ services: # Configuration in telegraf-generate-lp.toml build: dockerfile: Dockerfile.telegraf - image: telegraf:local - command: /telegraf +# image: telegraf:1.20-alpine volumes: - ./telegraf-generate-lp.toml:/etc/telegraf/telegraf.conf:ro links: @@ -25,7 +24,7 @@ services: opentelemetry-collector: # Configuration in otelcol-receive-print-lp.yaml - image: otel/opentelemetry-collector-contrib:0.28.0 + image: otel/opentelemetry-collector-contrib:0.35.0 command: /otelcolcontrib --config /config.yaml --log-level INFO stop_grace_period: 1s volumes: diff --git a/tests-synthetic/otelcol-receive-print-lp.yaml b/tests-synthetic/otelcol-receive-print-lp.yaml index bcfc8a5b..5c3a0869 100644 --- a/tests-synthetic/otelcol-receive-print-lp.yaml +++ b/tests-synthetic/otelcol-receive-print-lp.yaml @@ -1,7 +1,6 @@ receivers: influxdb: endpoint: 0.0.0.0:8086 - metrics_schema: telegraf-prometheus-v1 processors: