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

fix(alerting): measure state result instead of severity

Browse Source
This commit is contained in:
bergquist 2016-08-31 11:55:35 +02:00
parent e493015f54
commit c624f3d470
2 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pkg/metrics/metrics.go
View File

@ -9,34 +9,36 @@ func init() {
} }
var ( var (
M_Instance_Start Counter M_Instance_Start Counter
M_Page_Status_200 Counter M_Page_Status_200 Counter
M_Page_Status_500 Counter M_Page_Status_500 Counter
M_Page_Status_404 Counter M_Page_Status_404 Counter
M_Api_Status_500 Counter M_Api_Status_500 Counter
M_Api_Status_404 Counter M_Api_Status_404 Counter
M_Api_User_SignUpStarted Counter M_Api_User_SignUpStarted Counter
M_Api_User_SignUpCompleted Counter M_Api_User_SignUpCompleted Counter
M_Api_User_SignUpInvite Counter M_Api_User_SignUpInvite Counter
M_Api_Dashboard_Save Timer M_Api_Dashboard_Save Timer
M_Api_Dashboard_Get Timer M_Api_Dashboard_Get Timer
M_Api_Dashboard_Search Timer M_Api_Dashboard_Search Timer
M_Api_Admin_User_Create Counter M_Api_Admin_User_Create Counter
M_Api_Login_Post Counter M_Api_Login_Post Counter
M_Api_Login_OAuth Counter M_Api_Login_OAuth Counter
M_Api_Org_Create Counter M_Api_Org_Create Counter
M_Api_Dashboard_Snapshot_Create Counter M_Api_Dashboard_Snapshot_Create Counter
M_Api_Dashboard_Snapshot_External Counter M_Api_Dashboard_Snapshot_External Counter
M_Api_Dashboard_Snapshot_Get Counter M_Api_Dashboard_Snapshot_Get Counter
M_Models_Dashboard_Insert Counter M_Models_Dashboard_Insert Counter
M_Alerting_Result_Critical Counter M_Alerting_Result_State_Critical Counter
M_Alerting_Result_Warning Counter M_Alerting_Result_State_Warning Counter
M_Alerting_Result_Info Counter M_Alerting_Result_State_Ok Counter
M_Alerting_Result_Ok Counter M_Alerting_Result_State_Paused Counter
M_Alerting_Active_Alerts Counter M_Alerting_Result_State_Pending Counter
M_Alerting_Notification_Sent_Slack Counter M_Alerting_Result_State_ExecutionError Counter
M_Alerting_Notification_Sent_Email Counter M_Alerting_Active_Alerts Counter
M_Alerting_Notification_Sent_Webhook Counter M_Alerting_Notification_Sent_Slack Counter
M_Alerting_Notification_Sent_Email Counter
M_Alerting_Notification_Sent_Webhook Counter
// Timers // Timers
M_DataSource_ProxyReq_Timer Timer M_DataSource_ProxyReq_Timer Timer
@ -75,10 +77,13 @@ func initMetricVars(settings *MetricSettings) {
M_Models_Dashboard_Insert = RegCounter("models.dashboard.insert") M_Models_Dashboard_Insert = RegCounter("models.dashboard.insert")
M_Alerting_Result_Critical = RegCounter("alerting.result", "severity", "critical") M_Alerting_Result_State_Critical = RegCounter("alerting.result", "state", "critical")
M_Alerting_Result_Warning = RegCounter("alerting.result", "severity", "warning") M_Alerting_Result_State_Warning = RegCounter("alerting.result", "state", "warning")
M_Alerting_Result_Info = RegCounter("alerting.result", "severity", "info") M_Alerting_Result_State_Ok = RegCounter("alerting.result", "state", "ok")
M_Alerting_Result_Ok = RegCounter("alerting.result", "severity", "ok") M_Alerting_Result_State_Paused = RegCounter("alerting.result", "state", "paused")
M_Alerting_Result_State_Pending = RegCounter("alerting.result", "state", "pending")
M_Alerting_Result_State_ExecutionError = RegCounter("alerting.result", "state", "execution_error")
M_Alerting_Active_Alerts = RegCounter("alerting.active_alerts") M_Alerting_Active_Alerts = RegCounter("alerting.active_alerts")
M_Alerting_Notification_Sent_Slack = RegCounter("alerting.notifications_sent", "type", "slack") M_Alerting_Notification_Sent_Slack = RegCounter("alerting.notifications_sent", "type", "slack")
M_Alerting_Notification_Sent_Email = RegCounter("alerting.notifications_sent", "type", "email") M_Alerting_Notification_Sent_Email = RegCounter("alerting.notifications_sent", "type", "email")

24
pkg/services/alerting/result_handler.go
View File

@ -41,7 +41,7 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) {
ctx.Rule.State = m.AlertStateOK ctx.Rule.State = m.AlertStateOK
} }
countSeverity(ctx.Rule.Severity) countStateResult(ctx.Rule.State)
if ctx.Rule.State != oldState { if ctx.Rule.State != oldState {
handler.log.Info("New state change", "alertId", ctx.Rule.Id, "newState", ctx.Rule.State, "oldState", oldState) handler.log.Info("New state change", "alertId", ctx.Rule.Id, "newState", ctx.Rule.State, "oldState", oldState)
@ -78,15 +78,19 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) {
} }
} }
func countSeverity(state m.AlertSeverityType) { func countStateResult(state m.AlertStateType) {
switch state { switch state {
case m.AlertSeverityOK: case m.AlertStateCritical:
metrics.M_Alerting_Result_Ok.Inc(1) metrics.M_Alerting_Result_State_Critical.Inc(1)
case m.AlertSeverityInfo: case m.AlertStateWarning:
metrics.M_Alerting_Result_Info.Inc(1) metrics.M_Alerting_Result_State_Warning.Inc(1)
case m.AlertSeverityWarning: case m.AlertStateOK:
metrics.M_Alerting_Result_Warning.Inc(1) metrics.M_Alerting_Result_State_Ok.Inc(1)
case m.AlertSeverityCritical: case m.AlertStatePaused:
metrics.M_Alerting_Result_Critical.Inc(1) metrics.M_Alerting_Result_State_Paused.Inc(1)
case m.AlertStatePending:
metrics.M_Alerting_Result_State_Pending.Inc(1)
case m.AlertStateExeuctionError:
metrics.M_Alerting_Result_State_ExecutionError.Inc(1)
} }
} }