More granularity to grafana authentication and anonymous login

scylladb · Feb 27, 2023 · 6eea123 · 6eea123
1 parent 8bfc1a8
commit 6eea123
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/start-all.sh b/start-all.sh
@@ -206,6 +206,12 @@ for arg; do
                 ;;
             (--victoria-metrics) VICTORIA_METRICS="1"
                 ;;
+            (--auth)
+                GRAFANA_ENV_COMMAND="$GRAFANA_ENV_COMMAND --auth"
+                ;;
+            (--disable-anonymous)
+                GRAFANA_ENV_COMMAND="$GRAFANA_ENV_COMMAND --disable-anonymous"
+                ;;
             (--limit)
                 LIMIT="1"
                 ;;

diff --git a/start-grafana.sh b/start-grafana.sh
@@ -4,13 +4,21 @@ if [ -f CURRENT_VERSION.sh ]; then
     CURRENT_VERSION=`cat CURRENT_VERSION.sh`
 fi
 LOCAL=""
-GRAFANA_ADMIN_PASSWORD="admin"
-GRAFANA_AUTH=false
-GRAFANA_AUTH_ANONYMOUS=true
+if [ -z "$GRAFANA_ADMIN_PASSWORD" ]; then
+    GRAFANA_ADMIN_PASSWORD="admin"
+fi
+if [ -z "$GRAFANA_AUTH" ]; then
+    GRAFANA_AUTH=false
+fi
+if [ -z "$GRAFANA_AUTH_ANONYMOUS" ]; then
+    GRAFANA_AUTH_ANONYMOUS=true
+fi
 DOCKER_PARAM=""
 EXTERNAL_VOLUME=""
 BIND_ADDRESS=""
-ANONYMOUS_ROLE="Admin"
+if [ -z "$ANONYMOUS_ROLE" ]; then
+    ANONYMOUS_ROLE="Admin"
+fi
 SPECIFIC_SOLUTION=""
 LDAP_FILE=""
 
@@ -49,6 +57,12 @@ for arg; do
                 LIMIT="1"
                 PARAM="1"
                 ;;
+            (--auth)
+                GRAFANA_AUTH=true
+                ;;
+            (--disable-anonymous)
+                GRAFANA_AUTH_ANONYMOUS=false
+                ;;
             (*) set -- "$@" "$arg"
                 ;;
         esac
@@ -122,8 +136,6 @@ while getopts ':hlEg:n:p:v:a:x:c:j:m:G:M:D:A:S:P:L:Q:' option; do
     Q) ANONYMOUS_ROLE=$OPTARG
        ;;
     a) GRAFANA_ADMIN_PASSWORD=$OPTARG
-       GRAFANA_AUTH=true
-       GRAFANA_AUTH_ANONYMOUS=false
        ;;
     x) HTTP_PROXY="$OPTARG"
        ;;
@@ -228,7 +240,6 @@ if [ ! -z $RUN_RENDERER ]; then
     GRAFANA_ENV_COMMAND="$GRAFANA_ENV_COMMAND -e GF_RENDERING_SERVER_URL=http://$DOCKER_HOST:8081/render -e GF_RENDERING_CALLBACK_URL=http://$DOCKER_HOST:$GRAFANA_PORT/"
 fi
 
-
 docker run -d $DOCKER_PARAM ${DOCKER_LIMITS["grafana"]} -i $USER_PERMISSIONS $PORT_MAPPING \
      -e "GF_AUTH_BASIC_ENABLED=$GRAFANA_AUTH" \
      -e "GF_AUTH_ANONYMOUS_ENABLED=$GRAFANA_AUTH_ANONYMOUS" \