public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-05-03 12:03:04 +02:00
parent 04d071aaa3 fbed72c89c
commit 99257eb048
19 changed files with 2999 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-server/main.go
+1
View File
@@ -22,6 +22,7 @@ import (
_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
_ "github.com/grafana/grafana/pkg/tsdb/cloudwatch"
_ "github.com/grafana/grafana/pkg/tsdb/elasticsearch"
_ "github.com/grafana/grafana/pkg/tsdb/graphite"
_ "github.com/grafana/grafana/pkg/tsdb/influxdb"
_ "github.com/grafana/grafana/pkg/tsdb/mysql"