Merge ~sergiodj/ubuntu-docker-images/+git/telegraf:1.19-21.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:1.17-21.04

[Sergio Durigan Junior]

This MP updates the telegraf OCI image to use Ubuntu Impish as the base layer. It also updates the documentation.

Built locally and tested with our unittest suite.

[Bryce Harrington (bryce)]

Athos would probably be better to review than me, but I know he's off until next week.
I wanted to at least test your image builds, but unfortunately my local system's docker doesn't work, so will instead trust CI to build/test.

Verified the new version is 1.19.2 in impish, and things seem to be substituted correctly.

LGTM, +1

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Thursday, August 26 2021, Bryce Harrington wrote:

> Athos would probably be better to review than me, but I know he's off until next week.
> I wanted to at least test your image builds, but unfortunately my local system's docker doesn't work, so will instead trust CI to build/test.
>
> Verified the new version is 1.19.2 in impish, and things seem to be substituted correctly.
>
> LGTM, +1

Thanks for the review, Bryce. New branch created.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/Dockerfile b/Dockerfile
index 3bcd73f..2c619d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:hirsute AS manifest-builder
+FROM ubuntu:impish AS manifest-builder
 
 WORKDIR /src/telegraf
 
@@ -22,7 +22,7 @@ RUN set -eux; \
 	/src/telegraf/utils/golang-manifest-builder.py /src/telegraf/telegraf-mods.txt > /src/telegraf/manifest-upstream.txt; \
 	cat /src/telegraf/manifest-upstream.txt
 
-FROM ubuntu:hirsute
+FROM ubuntu:impish
 
 ENV TZ UTC
 
diff --git a/HACKING.md b/HACKING.md
index 0423e8f..70266c4 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Telegraf is available as a `.deb` package.  For this reason,
-this image was built by installing the Telegraf Ubuntu 21.04 package
+this image was built by installing the Telegraf Ubuntu 21.10 package
 inside a docker container.
 
 In order to contribute to the Telegraf OCI image, do the following:
@@ -50,6 +50,6 @@ The repository containing the templates is located at:
 https://code.launchpad.net/~canonical-server/ubuntu-docker-images/+git/templates
 
 The specific data for this image's template can be found inside the
-`data/` directory.
+`data/` directory, in the image's own repository.
 
 
diff --git a/README.md b/README.md
index 1d66f30..1ade38b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/telegraf but are shown here for com
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.17-21.04_beta`**    | | | Telegraf 1.17.2 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`1.19-21.10_beta`**    | | | Telegraf 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.17-21.04_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.19-21.10_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -64,7 +64,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.17-21.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.19-21.10_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/data/telegraf.yaml b/data/telegraf.yaml
index 67cd654..7de933d 100644
--- a/data/telegraf.yaml
+++ b/data/telegraf.yaml
@@ -3,8 +3,8 @@ main: false
 repo: telegraf
 description: >
   Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
-version: 1.17.2
-base: Ubuntu 21.04
+version: 1.19.2
+base: Ubuntu 21.10
 architectures:
   - amd64
   - arm64