public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'alerting' of github.com:grafana/grafana into alerting

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-08-18 09:04:00 +02:00
parent 75a6c2b612 6d080904fa
commit 902314d3a1
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/alerting-dashboard.json
-19
View File
@@ -74,7 +74,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -185,7 +184,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -296,7 +294,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -407,7 +404,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -526,7 +522,6 @@
"notifications": [],
"severity": "warning"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -636,7 +631,6 @@
"notifications": [],
"severity": "warning"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -746,7 +740,6 @@
"notifications": [],
"severity": "warning"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -856,7 +849,6 @@
"notifications": [],
"severity": "warning"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -974,7 +966,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1084,7 +1075,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1194,7 +1184,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1304,7 +1293,6 @@
"notifications": [],
"severity": "critical"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1422,7 +1410,6 @@
"notifications": [],
"name": "Fast Warning panel alert"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1532,7 +1519,6 @@
"notifications": [],
"name": "Fast Warning panel alert"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1642,7 +1628,6 @@
"notifications": [],
"name": "Fast Warning panel alert"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1752,7 +1737,6 @@
"notifications": [],
"name": "Fast Warning panel alert"
},
"alerting": {},
"aliasColors": {},
"bars": false,
"datasource": "${DS_GRAPHITE}",
@@ -1936,7 +1920,6 @@
"timeShift": null,
"aliasColors": {},
"seriesOverrides": [],
"alerting": {},
"thresholds": [
{
"value": 20,
@@ -2047,7 +2030,6 @@
"timeShift": null,
"aliasColors": {},
"seriesOverrides": [],
"alerting": {},
"thresholds": [
{
"value": 10,
@@ -2167,7 +2149,6 @@
"timeShift": null,
"aliasColors": {},
"seriesOverrides": [],
"alerting": {},
"thresholds": [
{
"value": 60,
pkg/services/alerting/engine.go
+1 -6
View File
@@ -101,11 +101,6 @@ func (e *Engine) resultDispatcher() {
for result := range e.resultQueue {
e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing)
if result.Error != nil {
e.log.Error("Alert Rule Result Error", "ruleId", result.Rule.Id, "error", result.Error, "retry")
} else {
e.resultHandler.Handle(result)
}
e.resultHandler.Handle(result)
}
}
pkg/services/alerting/result_handler.go
+1 -2
View File
@@ -29,7 +29,7 @@ func NewResultHandler() *DefaultResultHandler {
func (handler *DefaultResultHandler) Handle(ctx *EvalContext) {
oldState := ctx.Rule.State
exeuctionError := ""
exeuctionError := " "
if ctx.Error != nil {
handler.log.Error("Alert Rule Result Error", "ruleId", ctx.Rule.Id, "error", ctx.Error)
ctx.Rule.State = m.AlertStateExeuctionError
@@ -41,7 +41,6 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) {
}
countSeverity(ctx.Rule.Severity)
if ctx.Rule.State != oldState {
handler.log.Info("New state change", "alertId", ctx.Rule.Id, "newState", ctx.Rule.State, "oldState", oldState)