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

Merge branch 'master' into alerting_opentsdb

Browse Source
This commit is contained in:
bergquist
2016-10-14 09:17:35 +02:00
parent 1606b74fce aeb0c5cb53
commit 455df7f0a0
175 changed files with 2736 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-server/main.go
+1
View File
@@ -20,6 +20,7 @@ import (
_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
_ "github.com/grafana/grafana/pkg/tsdb/graphite"
_ "github.com/grafana/grafana/pkg/tsdb/influxdb"
_ "github.com/grafana/grafana/pkg/tsdb/opentsdb"
_ "github.com/grafana/grafana/pkg/tsdb/prometheus"
_ "github.com/grafana/grafana/pkg/tsdb/testdata"