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

feat(alerting): show execution errors in alert list

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-08-18 11:37:35 +02:00
parent 5cf9711862
commit 09cdf3e9e1
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/alert.go
+1 -1
View File
@@ -11,7 +11,7 @@ type AlertSeverityType string
const ( const (
AlertStatePending AlertStateType = "pending" AlertStatePending AlertStateType = "pending"
AlertStateExeuctionError AlertStateType = "exeuction_error" AlertStateExeuctionError AlertStateType = "execution_error"
AlertStatePaused AlertStateType = "paused" AlertStatePaused AlertStateType = "paused"
AlertStateCritical AlertStateType = "critical" AlertStateCritical AlertStateType = "critical"
AlertStateWarning AlertStateType = "warning" AlertStateWarning AlertStateType = "warning"
pkg/services/alerting/result_handler.go
+1 -1
View File
@@ -29,7 +29,7 @@ func NewResultHandler() *DefaultResultHandler {
func (handler *DefaultResultHandler) Handle(ctx *EvalContext) { func (handler *DefaultResultHandler) Handle(ctx *EvalContext) {
oldState := ctx.Rule.State oldState := ctx.Rule.State
exeuctionError := " " exeuctionError := ""
if ctx.Error != nil { if ctx.Error != nil {
handler.log.Error("Alert Rule Result Error", "ruleId", ctx.Rule.Id, "error", ctx.Error) handler.log.Error("Alert Rule Result Error", "ruleId", ctx.Rule.Id, "error", ctx.Error)
ctx.Rule.State = m.AlertStateExeuctionError ctx.Rule.State = m.AlertStateExeuctionError
public/app/features/alerting/alert_def.ts
+15 -7
View File
@@ -61,28 +61,36 @@ function getStateDisplayModel(state) {
iconClass: 'icon-gf icon-gf-critical', iconClass: 'icon-gf icon-gf-critical',
stateClass: 'alert-state-critical' stateClass: 'alert-state-critical'
}; };
} }
case 'warning': { case 'warning': {
return { return {
text: 'WARNING', text: 'WARNING',
iconClass: 'icon-gf icon-gf-warning', iconClass: 'icon-gf icon-gf-warning',
stateClass: 'alert-state-warning' stateClass: 'alert-state-warning'
}; };
} }
case 'pending': { case 'pending': {
return { return {
text: 'PENDING', text: 'PENDING',
iconClass: "fa fa-question", iconClass: "fa fa-question",
stateClass: 'alert-state-warning' stateClass: 'alert-state-warning'
}; };
} }
case 'paused': { case 'execution_error': {
return {
text: 'EXECUTION ERROR',
iconClass: 'icon-gf icon-gf-critical',
stateClass: 'alert-state-critical'
};
}
case 'paused': {
return { return {
text: 'paused', text: 'paused',
iconClass: "fa fa-pause", iconClass: "fa fa-pause",
stateClass: 'alert-state-paused' stateClass: 'alert-state-paused'
}; };
} }
} }
} }
public/app/features/alerting/partials/alert_list.html
+3 -4
View File
@@ -33,9 +33,6 @@
<i class="icon-gf icon-gf-settings"></i> <i class="icon-gf icon-gf-settings"></i>
</a> </a>
</div> </div>
<div class="card-item-notice" ng-show="alert.executionError">
<span>Execution Error</span>
</div>
</div> </div>
<div class="card-item-body"> <div class="card-item-body">
<div class="card-item-details"> <div class="card-item-details">
@@ -49,7 +46,9 @@
<i class="{{alert.stateModel.iconClass}}"></i> <i class="{{alert.stateModel.iconClass}}"></i>
{{alert.stateModel.text}} {{alert.stateModel.text}}
</span> for {{alert.newStateDateAgo}} </span> for {{alert.newStateDateAgo}}
</div> </div>
<div class="small muted" ng-show="alert.executionError">
{{alert.executionError}}
</div> </div>
</div> </div>
</div> </div>