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

..

partials

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

2015-10-06 16:36:58 +02:00

specs

Fix "Link to Prometheus" button for proxied Prometheus sources.

2015-10-01 18:23:29 +02:00

datasource.js

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

2015-10-06 16:36:58 +02:00

directives.js

Add prometheus datasource

2015-09-28 23:15:33 +01:00

plugin.json

Add prometheus datasource

2015-09-28 23:15:33 +01:00

query_ctrl.js

feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code

2015-10-06 14:34:44 +02:00