IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech(dataproxy): moves cfg to [dataproxy]

Browse Source
This commit is contained in:
bergquist 2017-01-16 12:43:59 +01:00
parent d4a96b9741
commit 06440ef57b
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/defaults.ini
View File

@ -47,9 +47,6 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
# Log web requests
router_logging = false
# This enables data proxy logging, default is false
data_proxy_logging = false
# the path relative working path
static_root_path = public
@ -116,6 +113,12 @@ cookie_secure = false
session_life_time = 86400
gc_interval_time = 86400
#################################### Data proxy ###########################
[dataproxy]
# This enables data proxy logging, default is false
logging = false
#################################### Analytics ###########################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.

7
conf/sample.ini
View File

@ -107,6 +107,13 @@
# Session life time, default is 86400
;session_life_time = 86400
#################################### Data proxy ###########################
[dataproxy]
# This enables data proxy logging, default is false
;logging = false
#################################### Analytics ####################################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.

6
pkg/setting/setting.go
View File

@ -492,7 +492,7 @@ func NewConfigContext(args *CommandLineArgs) error {
HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR)
HttpPort = server.Key("http_port").MustString("3000")
RouterLogging = server.Key("router_logging").MustBool(false)
DataProxyLogging = server.Key("data_proxy_logging").MustBool(false)
EnableGzip = server.Key("enable_gzip").MustBool(false)
EnforceDomain = server.Key("enforce_domain").MustBool(false)
StaticRootPath = makeAbsolute(server.Key("static_root_path").String(), HomePath)
@ -501,6 +501,10 @@ func NewConfigContext(args *CommandLineArgs) error {
return err
}
// read data proxy settings
dataproxy := Cfg.Section("dataproxy")
DataProxyLogging = dataproxy.Key("logging").MustBool(false)
// read security settings
security := Cfg.Section("security")
SecretKey = security.Key("secret_key").String()