Chore: Sync defaults.ini with sample.ini (#20645)

Make sure that configuration sections/keys from defaults.ini 
is mirrored in the sample.ini.

Fixes #20622

conf/defaults.ini

@@ -374,7 +374,7 @@ client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
 email_attribute_path =
-role_attribute_path = 
+role_attribute_path =
 auth_url =
 token_url =
 api_url =
@@ -437,6 +437,7 @@ enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
+# Deprecated, use sync_ttl instead
 ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
@@ -614,6 +615,7 @@ basic_auth_password =
 address =
 prefix = prod.grafana.%(instance_name)s.
 
+#################################### Grafana.com integration  ##########################
 [grafana_net]
 url = https://grafana.com
 
@@ -644,6 +646,7 @@ disable_shared_zipkin_spans = false
 
 #################################### External Image Storage ##############
 [external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
 # You can choose between (s3, webdav, gcs, azure_blob, local)
 provider =
 

conf/sample.ini

@@ -87,6 +87,11 @@
 # For "postgres" only, either "disable", "require" or "verify-full"
 ;ssl_mode = disable
 
+;ca_cert_path =
+;client_key_path =
+;client_cert_path =
+;server_cert_name =
+
 # For "sqlite3" only, path relative to data_path setting
 ;path = grafana.db
 
@@ -235,9 +240,15 @@
 # Set to true to automatically assign new users to the default organization (id 1)
 ;auto_assign_org = true
 
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+;auto_assign_org_id = 1
+
 # Default role new users will be automatically assigned (if disabled above is set to true)
 ;auto_assign_org_role = Viewer
 
+# Require email validation before sign up completes
+;verify_email_enabled = false
+
 # Background text for the user field on the login page
 ;login_hint = email or username
 ;password_hint = password
@@ -282,6 +293,9 @@
 # This setting is ignored if multiple OAuth providers are configured.
 ;oauth_auto_login = false
 
+# limit of api_key seconds to live before expiration
+;api_key_max_seconds_to_live = -1
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -306,6 +320,18 @@
 ;team_ids =
 ;allowed_organizations =
 
+#################################### GitLab Auth #########################
+[auth.gitlab]
+; enabled = false
+; allow_sign_up = true
+; client_id = some_id
+; client_secret = some_secret
+; scopes = api
+; auth_url = https://gitlab.com/oauth/authorize
+; token_url = https://gitlab.com/oauth/token
+; api_url = https://gitlab.com/api/v4
+; allowed_groups =
+
 #################################### Google Auth ##########################
 [auth.google]
 ;enabled = false
@@ -317,6 +343,16 @@
 ;token_url = https://accounts.google.com/o/oauth2/token
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
+;hosted_domain =
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
 
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
@@ -384,14 +420,9 @@
 # Friendly name or name of the attribute within the SAML assertion to use as the user's email
 ;assertion_attribute_email = mail
 
-#################################### Grafana.com Auth ####################
+#################################### Basic Auth ##########################
-[auth.grafana_com]
+[auth.basic]
-;enabled = false
+;enabled = true
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email
-;allowed_organizations =
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -405,10 +436,6 @@
 # Read the auth proxy docs for details on what the setting below enables
 ;enable_login_token = false
 
-#################################### Basic Auth ##########################
-[auth.basic]
-;enabled = true
-
 #################################### Auth LDAP ##########################
 [auth.ldap]
 ;enabled = false
@@ -437,6 +464,7 @@
 
 [emails]
 ;welcome_email_on_sign_up = false
+;templates_pattern = emails/*.html
 
 #################################### Logging ##########################
 [log]
@@ -495,6 +523,41 @@
 # Syslog tag. By default, the process' argv[0] is used.
 ;tag =
 
+#################################### Usage Quotas ########################
+[quota]
+; enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+; org_user = 10
+
+# limit number of dashboards per Org.
+; org_dashboard = 100
+
+# limit number of data_sources per Org.
+; org_data_source = 10
+
+# limit number of api_keys per Org.
+; org_api_key = 10
+
+# limit number of orgs a user can create.
+; user_org = 10
+
+# Global limit of users.
+; global_user = -1
+
+# global limit of orgs.
+; global_org = -1
+
+# global limit of dashboards
+; global_dashboard = -1
+
+# global limit of api_keys
+; global_api_key = -1
+
+# global limit on number of logged in users.
+; global_session = -1
+
 #################################### Alerting ############################
 [alerting]
 # Disable alerting engine & UI features
@@ -532,11 +595,14 @@
 [metrics]
 # Disable / Enable internal metrics
 ;enabled           = true
+# Graphite Publish interval
+;interval_seconds  = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 ;disable_total_stats = false
 
-# Publish interval
+#If both are set, basic auth will be required for the metrics endpoint.
-;interval_seconds  = 10
+; basic_auth_username =
+; basic_auth_password =
 
 # Send internal metrics to Graphite
 [metrics.graphite]
@@ -544,6 +610,11 @@
 ;address =
 ;prefix = prod.grafana.%(instance_name)s.
 
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+
 #################################### Distributed tracing ############
 [tracing.jaeger]
 # Enable by setting the address sending traces to jaeger (ex localhost:6831)
@@ -566,11 +637,6 @@
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 ;disable_shared_zipkin_spans = false
 
-#################################### Grafana.com integration  ##########################
-# Url used to import dashboards directly from Grafana.com
-[grafana_com]
-;url = https://grafana.com
-
 #################################### External image storage ##########################
 [external_image_storage]
 # Used for uploading images to public servers so they can be included in slack/email messages.
@@ -610,10 +676,6 @@
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
 
-[enterprise]
-# Path to a valid Grafana Enterprise license.jwt file
-;license_path =
-
 [panels]
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
 ;disable_sanitize_html = false
@@ -621,3 +683,11 @@
 [plugins]
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+;enable =