add grafana.net auth section to defaults.ini, normalize section heading line lengths

This commit is contained in:
Dan Cech 2016-09-20 10:09:20 -04:00
parent f5e2d61aef
commit dcd96c90e2

View File

@ -9,7 +9,7 @@ app_mode = production
# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
instance_name = ${HOSTNAME} instance_name = ${HOSTNAME}
#################################### Paths #################################### #################################### Paths ###############################
[paths] [paths]
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
# #
@ -23,7 +23,7 @@ logs = data/log
# #
plugins = data/plugins plugins = data/plugins
#################################### Server #################################### #################################### Server ##############################
[server] [server]
# Protocol (http or https) # Protocol (http or https)
protocol = http protocol = http
@ -57,7 +57,7 @@ enable_gzip = false
cert_file = cert_file =
cert_key = cert_key =
#################################### Database #################################### #################################### Database ############################
[database] [database]
# You can configure the database connection by specifying type, host, name, user and password # You can configure the database connection by specifying type, host, name, user and password
# as seperate properties or as on string using the url propertie. # as seperate properties or as on string using the url propertie.
@ -84,7 +84,7 @@ server_cert_name =
# For "sqlite3" only, path relative to data_path setting # For "sqlite3" only, path relative to data_path setting
path = grafana.db path = grafana.db
#################################### Session #################################### #################################### Session #############################
[session] [session]
# Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file" # Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file"
provider = file provider = file
@ -112,7 +112,7 @@ cookie_secure = false
session_life_time = 86400 session_life_time = 86400
gc_interval_time = 86400 gc_interval_time = 86400
#################################### Analytics #################################### #################################### Analytics ###########################
[analytics] [analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours. # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
# No ip addresses are being tracked, only simple counters to track # No ip addresses are being tracked, only simple counters to track
@ -133,7 +133,7 @@ google_analytics_ua_id =
# Google Tag Manager ID, only enabled if you specify an id here # Google Tag Manager ID, only enabled if you specify an id here
google_tag_manager_id = google_tag_manager_id =
#################################### Security #################################### #################################### Security ############################
[security] [security]
# default admin user, created on startup # default admin user, created on startup
admin_user = admin admin_user = admin
@ -161,7 +161,7 @@ external_enabled = true
external_snapshot_url = https://snapshots-origin.raintank.io external_snapshot_url = https://snapshots-origin.raintank.io
external_snapshot_name = Publish to snapshot.raintank.io external_snapshot_name = Publish to snapshot.raintank.io
#################################### Users #################################### #################################### Users ###############################
[users] [users]
# disable user signup / registration # disable user signup / registration
allow_sign_up = true allow_sign_up = true
@ -187,7 +187,7 @@ default_theme = dark
# Allow users to sign in using username and password # Allow users to sign in using username and password
allow_user_pass_login = true allow_user_pass_login = true
#################################### Anonymous Auth ########################## #################################### Anonymous Auth ######################
[auth.anonymous] [auth.anonymous]
# enable anonymous access # enable anonymous access
enabled = false enabled = false
@ -198,7 +198,7 @@ org_name = Main Org.
# specify role for unauthenticated users # specify role for unauthenticated users
org_role = Viewer org_role = Viewer
#################################### Github Auth ########################## #################################### Github Auth #########################
[auth.github] [auth.github]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = false
@ -211,7 +211,7 @@ api_url = https://api.github.com/user
team_ids = team_ids =
allowed_organizations = allowed_organizations =
#################################### Google Auth ########################## #################################### Google Auth #########################
[auth.google] [auth.google]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = false
@ -223,7 +223,16 @@ token_url = https://accounts.google.com/o/oauth2/token
api_url = https://www.googleapis.com/oauth2/v1/userinfo api_url = https://www.googleapis.com/oauth2/v1/userinfo
allowed_domains = allowed_domains =
#################################### Generic OAuth ########################## #################################### Grafana.net Auth ####################
[auth.grafananet]
enabled = false
allow_sign_up = false
client_id = some_id
client_secret = some_secret
scopes = user:email
allowed_organizations =
#################################### Generic OAuth #######################
[auth.generic_oauth] [auth.generic_oauth]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = false
@ -247,12 +256,12 @@ header_name = X-WEBAUTH-USER
header_property = username header_property = username
auto_sign_up = true auto_sign_up = true
#################################### Auth LDAP ########################## #################################### Auth LDAP ###########################
[auth.ldap] [auth.ldap]
enabled = false enabled = false
config_file = /etc/grafana/ldap.toml config_file = /etc/grafana/ldap.toml
#################################### SMTP / Emailing ########################## #################################### SMTP / Emailing #####################
[smtp] [smtp]
enabled = false enabled = false
host = localhost:25 host = localhost:25
@ -267,7 +276,7 @@ from_address = admin@grafana.localhost
welcome_email_on_sign_up = false welcome_email_on_sign_up = false
templates_pattern = emails/*.html templates_pattern = emails/*.html
#################################### Logging ########################## #################################### Logging #############################
[log] [log]
# Either "console", "file", "syslog". Default is console and file # Either "console", "file", "syslog". Default is console and file
# Use space to separate multiple modes, e.g. "console file" # Use space to separate multiple modes, e.g. "console file"
@ -322,18 +331,18 @@ facility =
tag = tag =
#################################### AMQP Event Publisher ########################## #################################### AMQP Event Publisher ################
[event_publisher] [event_publisher]
enabled = false enabled = false
rabbitmq_url = amqp://localhost/ rabbitmq_url = amqp://localhost/
exchange = grafana_events exchange = grafana_events
#################################### Dashboard JSON files ########################## #################################### Dashboard JSON files ################
[dashboards.json] [dashboards.json]
enabled = false enabled = false
path = /var/lib/grafana/dashboards path = /var/lib/grafana/dashboards
#################################### Usage Quotas ########################## #################################### Usage Quotas ########################
[quota] [quota]
enabled = false enabled = false
@ -368,7 +377,7 @@ global_api_key = -1
# global limit on number of logged in users. # global limit on number of logged in users.
global_session = -1 global_session = -1
#################################### Alerting ###################################### #################################### Alerting ############################
# docs about alerting can be found in /docs/sources/alerting/ # docs about alerting can be found in /docs/sources/alerting/
# __.-/| # __.-/|
# \`o_O' # \`o_O'
@ -387,7 +396,7 @@ global_session = -1
[alerting] [alerting]
enabled = true enabled = true
#################################### Internal Grafana Metrics ########################## #################################### Internal Grafana Metrics ############
# Metrics available at HTTP API Url /api/metrics # Metrics available at HTTP API Url /api/metrics
[metrics] [metrics]
enabled = true enabled = true
@ -402,7 +411,7 @@ prefix = prod.grafana.%(instance_name)s.
[grafana_net] [grafana_net]
url = https://grafana.net url = https://grafana.net
#################################### External image storage ########################## #################################### External Image Storage ##############
[external_image_storage] [external_image_storage]
# You can choose between (s3, webdav or internal) # You can choose between (s3, webdav or internal)
provider = s3 provider = s3