Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:1.17-21.04-update into ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:edge

[Sergio Durigan Junior]

Update the telegraf OCI image to hirsute, convert it to deb-based, and generate the manifest.

[Bryce Harrington (bryce)]

Looks good.

There's a git checkout of the utils module that I'm curious if that's supposed to be there. But other than that the rest looks good.

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thansk Bryce. Yeah, the utils repository is where the golang-manifest-builder script lives, so we have to check it out first. Arguably I could use a wget directly instead, but I opted for the easier way.

diff --git a/Dockerfile b/Dockerfile
index 97b39b7..2f858b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,37 +1,45 @@
-FROM ubuntu:focal AS builder
-
-COPY . .
+FROM ubuntu:hirsute AS manifest-builder
 
 WORKDIR /src/telegraf
 
-RUN apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends git dpkg-dev ca-certificates pristine-tar \
-	&& git clone https://git.launchpad.net/~ubuntu-server/ubuntu/+source/telegraf \
-	&& cd telegraf \
-	&& git branch pristine-tar origin/pristine-tar \
-	&& git checkout focal \
-	&& cp -a /adjust-telegraf-conf.patch debian/patches \
-	&& echo "adjust-telegraf-conf.patch" >> debian/patches/series \
-	&& sed -i 's@^EXCLUDE_TESTS.*@EXCLUDE_TESTS = github.com/influxdata/telegraf/plugins/inputs/http_response \
-github.com/influxdata/telegraf/plugins/inputs/zipkin \
-github.com/influxdata/telegraf/plugins/outputs/prometheus_client \\@' debian/rules \
-	&& pristine-tar checkout ../telegraf_$(dpkg-parsechangelog -SVersion | sed 's/\(.*\)-.ubuntu.*/\1/').orig.tar.xz \
-	&& DEBIAN_FRONTEND=noninteractive apt-get build-dep . -y \
-	&& dpkg-buildpackage -us -uc
-
-FROM ubuntu:focal
+RUN set -eux; \
+	grep '^deb ' /etc/apt/sources.list | sed 's/^deb/deb-src/' >> /etc/apt/sources.list; \
+	DEBIAN_FRONTEND=noninteractive apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		dpkg-dev golang-go git python3 python3-lxml python3-requests; \
+	apt-get source telegraf; \
+	git clone https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/utils; \
+	cd telegraf*/vendor; \
+# We have to use -mod=mod because "go list -m all" (from hirsute)
+# doesn't work with vendorized deps.
+#
+# https://github.com/golang/go/issues/35224
+# https://bugs.launchpad.net/docker.io/+bug/1916296
+	go list -mod=mod -m all | tail -n +2 > /src/telegraf/telegraf-mods.txt; \
+	/src/telegraf/utils/golang-manifest-builder.py /src/telegraf/telegraf-mods.txt | tee /src/telegraf/manifest-upstream.txt
+
+FROM ubuntu:hirsute
 
 ENV TZ UTC
 
-COPY --from=builder /src/telegraf/telegraf*.deb /pkg/
-
-RUN apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends /pkg/telegraf*.deb tzdata \
+RUN set -eux; \
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		telegraf tzdata; \
 # We don't need to keep the .deb packages around
-	&& rm -rf /pkg \
-	&& rm -rf /var/lib/apt/lists/*
+	rm -rf /pkg; \
+	rm -rf /var/lib/apt/lists/*; \
+# smoke test
+	telegraf --version; \
+# create manifest
+	mkdir -p /usr/share/rocks; \
+	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
+
+# telegraf is "special" because we have a dpkg.query for it, but also
+# the list of Golang modules needed to build the .deb.
+COPY --from=manifest-builder /src/telegraf/manifest-upstream.txt /usr/share/rocks/upstream
 
 EXPOSE     9273
 ENTRYPOINT [ "/usr/bin/telegraf" ]
diff --git a/adjust-telegraf-conf.patch b/adjust-telegraf-conf.patch
 deleted file mode 100644
index d081fb2..0000000
--- a/adjust-telegraf-conf.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Sergio Durigan Junior <[e-mail]>
-
-A few adjustments needed to:
-
-  - Disable outputs.influxdb, which, if enabled, will pollute the logs
-    if influxdb is not installed.
-  - Enable outputs.prometheus_client.
-
-diff --git a/etc/telegraf.conf b/etc/telegraf.conf
-index 62bc616..6439457 100644
---- a/etc/telegraf.conf
-+++ b/etc/telegraf.conf
-@@ -102,7 +102,7 @@
- 
- 
- # Configuration for sending metrics to InfluxDB
--[[outputs.influxdb]]
-+#[[outputs.influxdb]]
-   ## The full HTTP or UDP URL for your InfluxDB instance.
-   ##
-   ## Multiple URLs can be specified for a single cluster, only ONE of the
-@@ -1118,17 +1119,17 @@
- 
- 
- # # Configuration for the Prometheus client to spawn
--# [[outputs.prometheus_client]]
-+[[outputs.prometheus_client]]
- #   ## Address to listen on
--#   listen = ":9273"
--#
-+    listen = "127.0.0.1:9273"
-+
- #   ## Metric version controls the mapping from Telegraf metrics into
- #   ## Prometheus format.  When using the prometheus input, use the same value in
- #   ## both plugins to ensure metrics are round-tripped without modification.
- #   ##
- #   ##   example: metric_version = 1; deprecated in 1.13
- #   ##            metric_version = 2; recommended version
--#   # metric_version = 1
-+    metric_version = 2
- #
- #   ## Use HTTP Basic Authentication.
- #   # basic_username = "Foo"