Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui

2017-01-25 13:16:48 +01:00
parent 4e30aa9da2 9862c9ff40
commit fee4846429
5 changed files with 9 additions and 3 deletions
@@ -150,7 +150,8 @@ var (
 	Quota QuotaSettings

 	// Alerting
-	ExecuteAlerts bool
+	ExecuteAlerts   bool
+	ShowAlertingUI  bool

 	// logger
 	logger log.Logger
@@ -579,6 +580,7 @@ func NewConfigContext(args *CommandLineArgs) error {

 	alerting := Cfg.Section("alerting")
 	ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
+	ShowAlertingUI = alerting.Key("show_alerting_ui").MustBool(true)

 	readSessionConfig()
 	readSmtpSettings()