Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops

This commit is contained in:
bergquist
2016-11-29 22:22:25 +01:00
5 changed files with 168 additions and 1 deletions
+2
View File
@@ -45,6 +45,7 @@ var (
M_Alerting_Notification_Sent_Email Counter
M_Alerting_Notification_Sent_Webhook Counter
M_Alerting_Notification_Sent_PagerDuty Counter
M_Alerting_Notification_Sent_Victorops Counter
// Timers
M_DataSource_ProxyReq_Timer Timer
@@ -108,6 +109,7 @@ func initMetricVars(settings *MetricSettings) {
M_Alerting_Notification_Sent_Email = RegCounter("alerting.notifications_sent", "type", "email")
M_Alerting_Notification_Sent_Webhook = RegCounter("alerting.notifications_sent", "type", "webhook")
M_Alerting_Notification_Sent_PagerDuty = RegCounter("alerting.notifications_sent", "type", "pagerduty")
M_Alerting_Notification_Sent_Victorops = RegCounter("alerting.notifications_sent", "type", "victorops")
// Timers
M_DataSource_ProxyReq_Timer = RegTimer("api.dataproxy.request.all")