chore: update synthetic test influx2otel-otelcol

influxdata · Sep 21, 2021 · 10b0a19 · 10b0a19
1 parent 3eb003a
commit 10b0a19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -16,16 +16,15 @@ 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:
     - opentelemetry-collector
 
   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
@@ -1,7 +1,6 @@
 receivers:
   influxdb:
     endpoint: 0.0.0.0:8086
-    metrics_schema: telegraf-prometheus-v1
 
 processors: