6 Commits

Author	SHA1	Message	Date
Mitsuhiro Tanda	fcaecf4782	revert prometheus link	2015-10-23 01:35:34 +09:00
Torkel Ödegaard	f11785001c	docs: minor fix	2015-10-06 17:51:22 +02:00
Torkel Ödegaard	106fe4854f	Merge branch 'prometheus' of github.com:grafana/grafana ... 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	2015-10-06 16:36:58 +02:00
Torkel Ödegaard	44d377b810	feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code	2015-10-06 14:34:44 +02:00
Mitsuhiro Tanda	d0b744387b	fix unmatched tag	2015-10-01 01:33:13 +09:00
Jimmi Dyson	bf98cfeadc	Add prometheus datasource	2015-09-28 23:15:33 +01:00