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

Merge branch 'prometheus' of github.com:grafana/grafana

Browse Source 
Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js
This commit is contained in:
Torkel Ödegaard
2015-10-06 16:36:58 +02:00
parent 44d377b810 0db2d07a1a
commit 106fe4854f
9 changed files with 233 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/mkdocs.yml
+1
View File
@@ -69,6 +69,7 @@ pages:
- ['datasources/influxdb.md', 'Data Sources', 'InfluxDB']
- ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB']
- ['datasources/kairosdb.md', 'Data Sources', 'KairosDB']
- ['datasources/prometheus.md', 'Data Sources', 'Prometheus']
- ['tutorials/index.md', 'Tutorials', 'Tutorials']
- ['tutorials/hubot_howto.md', 'Tutorials', 'How To integrate Hubot and Grafana']