From 413179cd78b558acdb370c2f91a69d806063b56c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 28 Mar 2023 00:23:44 +0200
Subject: [PATCH] [bitnami/grafana] Release 9.4.7-debian-11-r1 (#28419)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/grafana/9/debian-11/Dockerfile        |  4 ++--
 .../opt/bitnami/.bitnami_components.json      |  2 --
 .../opt/bitnami/scripts/libwebserver.sh       | 24 +++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bitnami/grafana/9/debian-11/Dockerfile b/bitnami/grafana/9/debian-11/Dockerfile
index dda66de9052a..2e03815c9c5b 100644
--- a/bitnami/grafana/9/debian-11/Dockerfile
+++ b/bitnami/grafana/9/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-22T18:58:15Z" \
+      org.opencontainers.image.created="2023-03-27T21:59:46Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.4.7-debian-11-r0" \
+      org.opencontainers.image.ref.name="9.4.7-debian-11-r1" \
       org.opencontainers.image.title="grafana" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.4.7"
diff --git a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 9bcfd438768a..3698d54efd7b 100644
--- a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,14 +1,12 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "grafana": {
         "arch": "amd64",
-        "digest": "6b195ced496d46caeb47ad23b9f799809fb626249077c361b81191c027734431",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "9.4.7-0"
diff --git a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,7 +112,11 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl start "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -126,7 +130,11 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl stop "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -140,7 +148,11 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl restart "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -153,7 +165,11 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl reload "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################