21 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	206cb51219	feat(query editors): updated prometheus editor	2016-04-27 10:50:29 +02:00
Torkel Ödegaard	22ae259cf5	ux(): varios tweaks and polish	2016-02-24 17:49:08 +01:00
bergquist	f225bb0032	ux(annotations): migrate annotations editors to new form	2016-02-22 10:07:02 +01:00
Mitsuhiro Tanda	20283a46f9	fix annotation editor error	2016-02-04 14:14:19 +09:00
Mitsuhiro Tanda	7a1326ff14	follow new plugin format	2016-02-04 14:06:01 +09:00
Mitsuhiro Tanda	f8b05e0f42	add prometheus annotation query	2016-02-04 14:05:44 +09:00
Torkel Ödegaard	fc829b32d9	feat(plugins): minor fixes to breaking out query editor row into reusable component	2016-02-02 16:57:05 +01:00
Torkel Ödegaard	f2700822e9	feat(plugins): extracted first plugin row to its own component	2016-02-02 16:32:36 +01:00
Torkel Ödegaard	356f7b9db6	feat(plugins): good progress on converting query editors, graphite's query ctrl is now working as is unit tests	2016-02-02 13:07:54 +01:00
Torkel Ödegaard	efdd4a6682	feat(plugins): more work on plugin editors,prometheus query editor is working	2016-02-02 10:19:15 +01:00
Torkel Ödegaard	eaaf9246b7	feat(plugins): more work on refining datasource editors	2016-02-02 09:12:58 +01:00
Torkel Ödegaard	0583ec0f93	feat(plugins): more work on plugin directives and isolation	2016-02-01 23:32:12 +01:00
Torkel Ödegaard	b1bfd35968	feat(datasources): last fixes for data sources	2016-02-01 17:06:44 +01:00
Torkel Ödegaard	ca3405afc5	feat(plugins): moved http settings to directive instad of just ng-include partial	2016-01-09 19:03:03 +01:00
Mitsuhiro Tanda	c1d592b72c	fix, call linkToPrometheus() directly	2015-10-23 09:58:42 +09:00
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