diff --git a/defaults/main.yml b/defaults/main.yml index d251ac4..d591bd3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,6 +4,9 @@ grafana: secret_key: "{{ lookup('password', '/dev/null') }}" instance_name: "${HOSTNAME}" root_url: "https://localhost" + signout_redirect_url: "" + disable_login_form: "false" + oauth_auto_login: "false" oauth2: enabled: "false" name: "OAuth" @@ -13,6 +16,7 @@ grafana: token_url: "" api_url: "" scopes: "" + role_attribute_path: "role" plugins: "grafana-piechart-panel": {} datasources: {} diff --git a/templates/grafana.ini.j2 b/templates/grafana.ini.j2 index 68d0a6a..035f21e 100644 --- a/templates/grafana.ini.j2 +++ b/templates/grafana.ini.j2 @@ -267,17 +267,17 @@ disable_gravatar = true ;token_rotation_interval_minutes = 10 # Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false -;disable_login_form = false +disable_login_form = {{ grafana.config.disable_login_form }} # Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false ;disable_signout_menu = false # URL to redirect the user to after sign out -;signout_redirect_url = +signout_redirect_url = {{ grafana.config.signout_redirect_url }} # Set to true to attempt login with OAuth automatically, skipping the login screen. # This setting is ignored if multiple OAuth providers are configured. -;oauth_auto_login = false +oauth_auto_login = {{ grafana.config.oauth_auto_login }} #################################### Anonymous Auth ###################### [auth.anonymous]