Merge ~sergiodj/ubuntu-docker-images/+git/grafana:8.1-21.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04

[Sergio Durigan Junior]

This MP updates the Dockerfile to 21.10. I took this opportunity to also bring the Dockerfile up to our current standards.

This has been built locally and tested using our unittest. The MP is targeting the 21.04 branch to facilitate the review process, but a new 21.10 branch will be created from it.

1a1e4ff... by Sergio Durigan Junior on 2021-08-25

Update documentation

Reflect the bump to 21.10 and the new grafana version.

Signed-off-by: Sergio Durigan Junior <email address hidden>

[Athos Ribeiro (athos-ribeiro)]

Hi Sergio,

The changes LGTM.

I did build and run the image, and can confirm Grafana starts and is available in port 3000.

I did see one odd thing during startup though: the logs show the following error:

EROR[08-26|12:33:37] Failed to read plugin provisioning files from directory logger=provisioning.plugins path=/etc/grafana/provisioning/plugins error="open /etc/grafana/provisioning/plugins: no such file or directory"

While I understand this could (should?) be set as a volume by users in case they want to load their custom configurations, should we create that directory for a clean startup otherwise?

Also, see https://github.com/grafana/grafana/pull/29570

review: Needs Information

[Sergio Durigan Junior (sergiodj)]

On Thursday, August 26 2021, Athos Ribeiro wrote:

> Hi Sergio,
>
> The changes LGTM.

Thanks for the review, Athos.

> I did build and run the image, and can confirm Grafana starts and is available in port 3000.
>
> I did see one odd thing during startup though: the logs show the following error:
>
> EROR[08-26|12:33:37] Failed to read plugin provisioning files from
> directory logger=provisioning.plugins
> path=/etc/grafana/provisioning/plugins error="open
> /etc/grafana/provisioning/plugins: no such file or directory"
>
> While I understand this could (should?) be set as a volume by users in case they want to load their custom configurations, should we create that directory for a clean startup otherwise?
>
> Also, see https://github.com/grafana/grafana/pull/29570

Very good catch! Thanks a lot for looking into this, and indeed, I
totally agree with your comment. I've now adjusted the Dockerfile to
make it create the directory automatically, and force-pushed the branch.

Let me know if that solves the problem for you.

Thanks,

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

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos. Branch created.

diff --git a/Dockerfile b/Dockerfile
index 737ab2e..88d9fc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,21 +4,21 @@
 # and adapted to use the grafana snap built from
 # https://github.com/auria/snap-grafana and installed from
 # https://snapcraft.io/grafana
-FROM ubuntu:hirsute AS snap-installer
+FROM ubuntu:impish AS snap-installer
 
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    jq curl ca-certificates squashfs-tools
+RUN set -eux; \
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		jq curl ca-certificates squashfs-tools
 
 # taken from https://snapcraft.io/docs/build-on-docker
 # Alternatively, we can install snapd, and issue `snap download grafana`
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' -H "X-Ubuntu-Architecture: $(dpkg --print-architecture)" 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=21.04/edge' | jq '.download_url' -r) --output grafana.snap
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' -H "X-Ubuntu-Architecture: $(dpkg --print-architecture)" 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=21.10/edge' | jq '.download_url' -r) --output grafana.snap
 
 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
 
-
-FROM ubuntu:hirsute
+FROM ubuntu:impish
 
 EXPOSE 3000
 LABEL maintainer="Ubuntu Server team <[e-mail]>"
@@ -27,12 +27,12 @@ ARG GF_UID="472"
 ARG GF_GID="472"
 
 ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+	GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+	GF_PATHS_DATA="/var/lib/grafana" \
+	GF_PATHS_HOME="/usr/share/grafana" \
+	GF_PATHS_LOGS="/var/log/grafana" \
+	GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+	GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 WORKDIR $GF_PATHS_HOME
 
@@ -41,27 +41,28 @@ COPY --from=snap-installer /snap/grafana/conf conf
 ENV TZ UTC
 
 # curl should be part of the image
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates curl tzdata && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-  addgroup --system --gid $GF_GID grafana && \
-  adduser --uid $GF_UID --system --ingroup grafana grafana && \
-  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/defaults.ini "$GF_PATHS_CONFIG" && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    mkdir -p /usr/share/rocks
-
-# XXX - removed from above RUN, not in the snap yet
-RUN if [ -f conf/ldap.toml ]; then cp conf/ldap.toml /etc/grafana/ldap.toml; fi
+RUN set -eux; \
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		ca-certificates curl tzdata; \
+	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
+	rm -rf /var/lib/apt/lists/*; \
+	mkdir -p "$GF_PATHS_HOME/.aws"; \
+	addgroup --system --gid $GF_GID grafana; \
+	adduser --uid $GF_UID --system --ingroup grafana grafana; \
+	mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+		"$GF_PATHS_PROVISIONING/dashboards" \
+		"$GF_PATHS_PROVISIONING/notifiers" \
+		"$GF_PATHS_PROVISIONING/plugins" \
+		"$GF_PATHS_LOGS" \
+		"$GF_PATHS_PLUGINS" \
+		"$GF_PATHS_DATA"; \
+	cp conf/defaults.ini "$GF_PATHS_CONFIG"; \
+	cp conf/ldap.toml /etc/grafana/ldap.toml; \
+	chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \
+	chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \
+	mkdir -p /usr/share/rocks
 
 COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/grafana-cli bin/
 COPY --from=snap-installer /snap/grafana/public public
diff --git a/HACKING.md b/HACKING.md
index 9448300..1622367 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -7,7 +7,7 @@ In order to contribute to the Grafana OCI image do the following:
 * Build a new image with your changes. You can use the following command:
 
 ```
-$ docker build -t ubuntu/grafana:test 
+$ docker build -t ubuntu/grafana:test .
 ```
 
 * Test the new image. Run it in some way that exercise your changes, you can also check th README.md file.
@@ -41,6 +41,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 2f3e897..65c6d91 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/grafana but are shown here for comp
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`7.4-21.04_beta`** &nbsp;&nbsp; | | | Grafana 7.4.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`8.1-21.10_beta`** &nbsp;&nbsp; | | | Grafana 8.1.1 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 grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:7.4-21.04_beta
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:8.1-21.10_beta
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -65,7 +65,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
-[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:7.4-21.04_beta`), then:
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.1-21.10_beta`), then:
 
 ```sh
 kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json
diff --git a/data/grafana.yaml b/data/grafana.yaml
index efcd5f5..efcae61 100644
--- a/data/grafana.yaml
+++ b/data/grafana.yaml
@@ -4,8 +4,8 @@ repo: grafana
 description: >
   Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics. 
   Read more on the [Grafana website](https://grafana.com/docs/).
-version: 7.4.1
-base: Ubuntu 21.04
+version: 8.1.1
+base: Ubuntu 21.10
 architectures:
   - amd64
   - arm64