Merge remote-tracking branch 'origin/master' into getting-started-panel-css2

2016-11-18 16:31:54 +01:00
parent 0c9001c7ae 61bb9cbc13
commit fd512457d8
93 changed files with 854 additions and 1344 deletions
@@ -5,6 +5,7 @@ type SystemStats struct {
 	UserCount      int64
 	OrgCount       int64
 	PlaylistCount  int64
+	AlertCount     int64
 }

 type DataSourceStats struct {
@@ -29,6 +30,7 @@ type AdminStats struct {
 	DataSourceCount int `json:"data_source_count"`
 	PlaylistCount   int `json:"playlist_count"`
 	StarredDbCount  int `json:"starred_db_count"`
+	AlertCount      int `json:"alert_count"`
 }

 type GetAdminStatsQuery struct {