Merge branch 'master' into alerting_definitions

Conflicts: conf/defaults.ini pkg/api/dashboard.go
2016-06-06 08:43:01 +02:00
parent 6a49d4ed6b 7cbaf06097
commit f36a44c49a
49 changed files with 5529 additions and 222 deletions
@@ -237,7 +237,10 @@ func Register(r *macaron.Macaron) {
 		r.Get("/search/", Search)

 		// metrics
-		r.Get("/metrics/test", GetTestMetrics)
+		r.Get("/metrics/test", wrap(GetTestMetrics))
+
+		// metrics
+		r.Get("/metrics", wrap(GetInternalMetrics))

 		r.Group("/alerts", func() {
 			r.Group("/rules", func() {