add global datasource proxy timeout setting

closes grafana#5699
2019-01-24 14:06:48 -05:00
parent c7b556c0e4
commit 9108fd1b9d
4 changed files with 9 additions and 1 deletions
@@ -77,6 +77,7 @@ var (
 	SocketPath         string
 	RouterLogging      bool
 	DataProxyLogging   bool
+	DataProxyTimeout   int
 	StaticRootPath     string
 	EnableGzip         bool
 	EnforceDomain      bool
@@ -583,6 +584,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	// read data proxy settings
 	dataproxy := iniFile.Section("dataproxy")
 	DataProxyLogging = dataproxy.Key("logging").MustBool(false)
+	DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)

 	// read security settings
 	security := iniFile.Section("security")