From b070784b8a21885620029602603b0a9b68775712 Mon Sep 17 00:00:00 2001
From: Carl Bergquist <carl@grafana.com>
Date: Thu, 6 Sep 2018 21:03:09 +0200
Subject: [PATCH] adds usage stats for alert notifiers (#13173)

---
 pkg/metrics/metrics.go              | 10 ++++++++++
 pkg/metrics/metrics_test.go         | 22 ++++++++++++++++++++++
 pkg/models/stats.go                 |  9 +++++++++
 pkg/services/sqlstore/stats.go      |  8 ++++++++
 pkg/services/sqlstore/stats_test.go |  6 ++++++
 5 files changed, 55 insertions(+)

diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index a8d9f7308fa..dcdfbf124e1 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -440,6 +440,16 @@ func sendUsageStats() {
 		metrics["stats.ds_access.other."+access+".count"] = count
 	}
 
+	anStats := models.GetAlertNotifierUsageStatsQuery{}
+	if err := bus.Dispatch(&anStats); err != nil {
+		metricsLogger.Error("Failed to get alert notification stats", "error", err)
+		return
+	}
+
+	for _, stats := range anStats.Result {
+		metrics["stats.alert_notifiers."+stats.Type+".count"] = stats.Count
+	}
+
 	out, _ := json.MarshalIndent(report, "", " ")
 	data := bytes.NewBuffer(out)
 
diff --git a/pkg/metrics/metrics_test.go b/pkg/metrics/metrics_test.go
index 8d88e03d106..9fbfd0c26a2 100644
--- a/pkg/metrics/metrics_test.go
+++ b/pkg/metrics/metrics_test.go
@@ -115,6 +115,24 @@ func TestMetrics(t *testing.T) {
 			return nil
 		})
 
+		var getAlertNotifierUsageStatsQuery *models.GetAlertNotifierUsageStatsQuery
+		bus.AddHandler("test", func(query *models.GetAlertNotifierUsageStatsQuery) error {
+			query.Result = []*models.NotifierUsageStats{
+				{
+					Type:  "slack",
+					Count: 1,
+				},
+				{
+					Type:  "webhook",
+					Count: 2,
+				},
+			}
+
+			getAlertNotifierUsageStatsQuery = query
+
+			return nil
+		})
+
 		var wg sync.WaitGroup
 		var responseBuffer *bytes.Buffer
 		var req *http.Request
@@ -157,6 +175,7 @@ func TestMetrics(t *testing.T) {
 				So(getSystemStatsQuery, ShouldNotBeNil)
 				So(getDataSourceStatsQuery, ShouldNotBeNil)
 				So(getDataSourceAccessStatsQuery, ShouldNotBeNil)
+				So(getAlertNotifierUsageStatsQuery, ShouldNotBeNil)
 				So(req, ShouldNotBeNil)
 				So(req.Method, ShouldEqual, http.MethodPost)
 				So(req.Header.Get("Content-Type"), ShouldEqual, "application/json")
@@ -198,6 +217,9 @@ func TestMetrics(t *testing.T) {
 				So(metrics.Get("stats.ds_access."+models.DS_PROMETHEUS+".proxy.count").MustInt(), ShouldEqual, 3)
 				So(metrics.Get("stats.ds_access.other.direct.count").MustInt(), ShouldEqual, 6+7)
 				So(metrics.Get("stats.ds_access.other.proxy.count").MustInt(), ShouldEqual, 4+8)
+
+				So(metrics.Get("stats.alert_notifiers.slack.count").MustInt(), ShouldEqual, 1)
+				So(metrics.Get("stats.alert_notifiers.webhook.count").MustInt(), ShouldEqual, 2)
 			})
 		})
 
diff --git a/pkg/models/stats.go b/pkg/models/stats.go
index 4cd50d37463..d3e145dedf4 100644
--- a/pkg/models/stats.go
+++ b/pkg/models/stats.go
@@ -40,6 +40,15 @@ type GetDataSourceAccessStatsQuery struct {
 	Result []*DataSourceAccessStats
 }
 
+type NotifierUsageStats struct {
+	Type  string
+	Count int64
+}
+
+type GetAlertNotifierUsageStatsQuery struct {
+	Result []*NotifierUsageStats
+}
+
 type AdminStats struct {
 	Users       int `json:"users"`
 	Orgs        int `json:"orgs"`
diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go
index 6db481bf06b..2cec86e7239 100644
--- a/pkg/services/sqlstore/stats.go
+++ b/pkg/services/sqlstore/stats.go
@@ -13,11 +13,19 @@ func init() {
 	bus.AddHandler("sql", GetDataSourceStats)
 	bus.AddHandler("sql", GetDataSourceAccessStats)
 	bus.AddHandler("sql", GetAdminStats)
+	bus.AddHandlerCtx("sql", GetAlertNotifiersUsageStats)
 	bus.AddHandlerCtx("sql", GetSystemUserCountStats)
 }
 
 var activeUserTimeLimit = time.Hour * 24 * 30
 
+func GetAlertNotifiersUsageStats(ctx context.Context, query *m.GetAlertNotifierUsageStatsQuery) error {
+	var rawSql = `SELECT COUNT(*) as count, type FROM alert_notification GROUP BY type`
+	query.Result = make([]*m.NotifierUsageStats, 0)
+	err := x.SQL(rawSql).Find(&query.Result)
+	return err
+}
+
 func GetDataSourceStats(query *m.GetDataSourceStatsQuery) error {
 	var rawSql = `SELECT COUNT(*) as count, type FROM data_source GROUP BY type`
 	query.Result = make([]*m.DataSourceStats, 0)
diff --git a/pkg/services/sqlstore/stats_test.go b/pkg/services/sqlstore/stats_test.go
index dae24952d17..6949a0dbda2 100644
--- a/pkg/services/sqlstore/stats_test.go
+++ b/pkg/services/sqlstore/stats_test.go
@@ -36,5 +36,11 @@ func TestStatsDataAccess(t *testing.T) {
 			err := GetDataSourceAccessStats(&query)
 			So(err, ShouldBeNil)
 		})
+
+		Convey("Get alert notifier stats should not results in error", func() {
+			query := m.GetAlertNotifierUsageStatsQuery{}
+			err := GetAlertNotifiersUsageStats(context.Background(), &query)
+			So(err, ShouldBeNil)
+		})
 	})
 }