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

[Sergio Durigan Junior]

This updates grafana to 7.4.1 and the base image to hirsute.

Tested with our unit tests. I've also set up a docker container with the image and made sure that I could access the site and view everything there.

[Sergio Durigan Junior (sergiodj)]

Diff updated to include the "data/" update.

[Bryce Harrington (bryce)]

LGTM, +1

review: Approve

[Sergio Durigan Junior (sergiodj)]

The new grafana image has been uploaded to dockerhub.

diff --git a/Dockerfile b/Dockerfile
index 18ef091..b2dba39 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:focal AS snap-installer
+FROM ubuntu:hirsute 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:focal
+FROM ubuntu:hirsute
 
 EXPOSE 3000
 LABEL maintainer="Ubuntu Server team <[e-mail]>"
diff --git a/data/grafana.yaml b/data/grafana.yaml
index 35e436f..efcd5f5 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.2.0
-base: Ubuntu 20.04 LTS
+version: 7.4.1
+base: Ubuntu 21.04
 architectures:
   - amd64
   - arm64