mirror of
https://github.com/grafana/grafana.git
synced 2026-07-29 15:59:50 -05:00
tech(dataproxy): moves cfg to [dataproxy]
This commit is contained in:
+6
-3
@@ -47,9 +47,6 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
|
|||||||
# Log web requests
|
# Log web requests
|
||||||
router_logging = false
|
router_logging = false
|
||||||
|
|
||||||
# This enables data proxy logging, default is false
|
|
||||||
data_proxy_logging = false
|
|
||||||
|
|
||||||
# the path relative working path
|
# the path relative working path
|
||||||
static_root_path = public
|
static_root_path = public
|
||||||
|
|
||||||
@@ -116,6 +113,12 @@ cookie_secure = false
|
|||||||
session_life_time = 86400
|
session_life_time = 86400
|
||||||
gc_interval_time = 86400
|
gc_interval_time = 86400
|
||||||
|
|
||||||
|
#################################### Data proxy ###########################
|
||||||
|
[dataproxy]
|
||||||
|
|
||||||
|
# This enables data proxy logging, default is false
|
||||||
|
logging = false
|
||||||
|
|
||||||
#################################### 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.
|
||||||
|
|||||||
@@ -107,6 +107,13 @@
|
|||||||
# Session life time, default is 86400
|
# Session life time, default is 86400
|
||||||
;session_life_time = 86400
|
;session_life_time = 86400
|
||||||
|
|
||||||
|
#################################### Data proxy ###########################
|
||||||
|
[dataproxy]
|
||||||
|
|
||||||
|
# This enables data proxy logging, default is false
|
||||||
|
;logging = false
|
||||||
|
|
||||||
|
|
||||||
#################################### 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.
|
||||||
|
|||||||
@@ -492,7 +492,7 @@ func NewConfigContext(args *CommandLineArgs) error {
|
|||||||
HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR)
|
HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR)
|
||||||
HttpPort = server.Key("http_port").MustString("3000")
|
HttpPort = server.Key("http_port").MustString("3000")
|
||||||
RouterLogging = server.Key("router_logging").MustBool(false)
|
RouterLogging = server.Key("router_logging").MustBool(false)
|
||||||
DataProxyLogging = server.Key("data_proxy_logging").MustBool(false)
|
|
||||||
EnableGzip = server.Key("enable_gzip").MustBool(false)
|
EnableGzip = server.Key("enable_gzip").MustBool(false)
|
||||||
EnforceDomain = server.Key("enforce_domain").MustBool(false)
|
EnforceDomain = server.Key("enforce_domain").MustBool(false)
|
||||||
StaticRootPath = makeAbsolute(server.Key("static_root_path").String(), HomePath)
|
StaticRootPath = makeAbsolute(server.Key("static_root_path").String(), HomePath)
|
||||||
@@ -501,6 +501,10 @@ func NewConfigContext(args *CommandLineArgs) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// read data proxy settings
|
||||||
|
dataproxy := Cfg.Section("dataproxy")
|
||||||
|
DataProxyLogging = dataproxy.Key("logging").MustBool(false)
|
||||||
|
|
||||||
// read security settings
|
// read security settings
|
||||||
security := Cfg.Section("security")
|
security := Cfg.Section("security")
|
||||||
SecretKey = security.Key("secret_key").String()
|
SecretKey = security.Key("secret_key").String()
|
||||||
|
|||||||
Reference in New Issue
Block a user