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

[Athos Ribeiro]

This change creates the grafana OCI image for impish.

Just the trivial changes were needed and no regressions were detected when running the unit test.

Note that this MP is targeting the 7.4-21.04 branch solely for comparing purposes. When accepted, these changes should be pushed into a new 7.4-21.10 branch.

Moreover, we did not change the snap track for fetching the snap, since an impish track is not available yet.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

For these images, I think it's better if we work on creating the proper snap tracks and then updating the snaps themselves. Let's put this MP on hold until then.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

BTW, the same applies to the other images are based on snaps.

[Athos Ribeiro (athos-ribeiro)]

Closing this one for now. I will either reopen it or file a new MP when the time comes for us to create and build new impish OCI images.

Unmerged commits

012b37e... by Athos Ribeiro on 2021-05-31

Regenerate documentation

Signed-off-by: Athos Ribeiro <email address hidden>

1d1c2f6... by Athos Ribeiro on 2021-05-31

Update to impish

Update the image to be based on impish. Note that until there is an
impish track for the grafana snap, we will keep using the hirsute one.

Signed-off-by: Athos Ribeiro <email address hidden>

diff --git a/Dockerfile b/Dockerfile
index ba826ca..5e36aae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # 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 && \
@@ -18,7 +18,7 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna
 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]>"
diff --git a/HACKING.md b/HACKING.md
index 9448300..fca4771 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.
diff --git a/README.md b/README.md
index 2f3e897..d6aea31 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` |
+| **`7.4-21.10_beta`** &nbsp;&nbsp; | | | Grafana 7.4.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:7.4-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:7.4-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..ec600f9 100644
--- a/data/grafana.yaml
+++ b/data/grafana.yaml
@@ -5,7 +5,7 @@ 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
+base: Ubuntu 21.10
 architectures:
   - amd64
   - arm64