From 8c5f5e7a32fd27c122dbf52f799e7413f17a9576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?= Date: Fri, 12 Aug 2022 00:16:02 +0200 Subject: [PATCH] Alerting: create provisioning dir in docker image (#53594) --- Dockerfile | 1 + Dockerfile.ubuntu | 1 + packaging/deb/control/postinst | 4 ++++ packaging/docker/Dockerfile | 1 + packaging/docker/ubuntu.Dockerfile | 1 + packaging/rpm/control/postinst | 4 ++++ 6 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index cd05b655ba4..9454e6dfed5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,6 +75,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ "$GF_PATHS_PROVISIONING/notifiers" \ "$GF_PATHS_PROVISIONING/plugins" \ "$GF_PATHS_PROVISIONING/access-control" \ + "$GF_PATHS_PROVISIONING/alerting" \ "$GF_PATHS_LOGS" \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 0dc2c263f2f..d99e7836930 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -68,6 +68,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \ "$GF_PATHS_PROVISIONING/notifiers" \ "$GF_PATHS_PROVISIONING/plugins" \ "$GF_PATHS_PROVISIONING/access-control" \ + "$GF_PATHS_PROVISIONING/alerting" \ "$GF_PATHS_LOGS" \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst index 4464824d432..95d7d89483a 100755 --- a/packaging/deb/control/postinst +++ b/packaging/deb/control/postinst @@ -52,6 +52,10 @@ case "$1" in cp /usr/share/grafana/conf/provisioning/access-control/sample.yaml $PROVISIONING_CFG_DIR/access-control/sample.yaml fi + if [ ! -d $PROVISIONING_CFG_DIR/alerting ]; then + mkdir -p $PROVISIONING_CFG_DIR/alerting + fi + # configuration files should not be modifiable by grafana user, as this can be a security issue chown -Rh root:$GRAFANA_GROUP /etc/grafana/* chmod 755 /etc/grafana diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b0c4af2806a..6914694fab1 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -60,6 +60,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ "$GF_PATHS_PROVISIONING/notifiers" \ "$GF_PATHS_PROVISIONING/plugins" \ "$GF_PATHS_PROVISIONING/access-control" \ + "$GF_PATHS_PROVISIONING/alerting" \ "$GF_PATHS_LOGS" \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile index e7f6e06b98b..c4bc984edf6 100644 --- a/packaging/docker/ubuntu.Dockerfile +++ b/packaging/docker/ubuntu.Dockerfile @@ -45,6 +45,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ "$GF_PATHS_PROVISIONING/notifiers" \ "$GF_PATHS_PROVISIONING/plugins" \ "$GF_PATHS_PROVISIONING/access-control" \ + "$GF_PATHS_PROVISIONING/alerting" \ "$GF_PATHS_LOGS" \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst index 3bc46537e24..739babd6a57 100755 --- a/packaging/rpm/control/postinst +++ b/packaging/rpm/control/postinst @@ -66,6 +66,10 @@ if [ $1 -eq 1 ] ; then cp /usr/share/grafana/conf/provisioning/access-control/sample.yaml $PROVISIONING_CFG_DIR/access-control/sample.yaml fi + if [ ! -d $PROVISIONING_CFG_DIR/alerting ]; then + mkdir -p $PROVISIONING_CFG_DIR/alerting + fi + # Set user permissions on /var/log/grafana, /var/lib/grafana mkdir -p /var/log/grafana /var/lib/grafana chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana