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

Merge branch 'master' into websocket

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-01-31 08:56:49 +01:00
parent 2594041eed 9ba1ea0179
commit 8a95c563bb
283 changed files with 29761 additions and 7732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/grafana-server/server.go
View File

@@ -55,7 +55,7 @@ func (g *GrafanaServerImpl) Start() {
plugins.Init()
// init alerting
if setting.ExecuteAlerts {
if setting.AlertingEnabled && setting.ExecuteAlerts {
engine := alerting.NewEngine()
g.childRoutines.Go(func() error { return engine.Run(g.context) })
}