90 Commits

Author	SHA1	Message	Date
bergquist	0525bf5d4e	ux(table): tight-form -> gf-form	2016-02-24 10:42:53 +01:00
Torkel Ödegaard	cb83c237f4	Merge branch 'master' of github.com:grafana/grafana ... Conflicts: public/sass/_grafana.scss	2016-02-22 12:00:57 +01:00
bergquist	f225bb0032	ux(annotations): migrate annotations editors to new form	2016-02-22 10:07:02 +01:00
Torkel Ödegaard	9c47fdeb2f	ux(): tweaks to light theme	2016-02-21 00:31:35 +01:00
Torkel Ödegaard	52241b8e0b	ux(): completed gf-size class rename	2016-02-20 14:48:10 +01:00
Torkel Ödegaard	3003a8cb6e	ux(sass): a lot of polish on headings and margins, ONLY USE bottom margins, othewise margin collapse causes issues	2016-02-18 12:16:47 +01:00
Torkel Ödegaard	41b775561a	ux(): datasource form tweaks	2016-02-16 07:57:58 +01:00
Torkel Ödegaard	2fc8da7a87	feat(plugins): migrated cloudwatch and fixed a bunch of issues with data source edit views	2016-02-03 17:01:53 +01:00
Torkel Ödegaard	0bea6aba63	feat(plugins): migrated elasticsearch to new plugin editor model, also minor fixes	2016-02-03 16:31:07 +01:00
Torkel Ödegaard	b1bfd35968	feat(datasources): last fixes for data sources	2016-02-01 17:06:44 +01:00
Torkel Ödegaard	2bfded3c5f	ux(): general ux polish	2016-01-15 14:42:59 +01:00
Torkel Ödegaard	8699d49f93	feat(plugins): updated cloudwatch to new plugin style	2016-01-14 15:15:45 +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
Torkel Ödegaard	cf98a16db0	feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json	2016-01-09 18:07:42 +01:00
Torkel Ödegaard	a7d7f31e76	Merge branch 'master' of github.com:grafana/grafana	2015-12-17 10:13:40 +01:00
Torkel Ödegaard	16847fdb41	feat(elasticsearch): trim edges, minor refactoring of #3541	2015-12-17 10:13:23 +01:00
carl bergquist	80d757b371	feat(elasticsearch): move default query parameters to new table	2015-12-17 10:00:53 +01:00
carl bergquist	5bdf0cd136	Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval ... Conflicts: public/app/plugins/datasource/elasticsearch/partials/config.html	2015-12-17 09:53:02 +01:00
carl bergquist	e498503428	fix(elastic): fixed typo	2015-12-17 09:05:01 +01:00
carl bergquist	dc30b9d37b	feat(elastic): change concept to trim edges instead.	2015-12-16 13:50:56 +01:00
carl bergquist	37cfe2a3cb	feat(elastic): shorten expression to target input	2015-12-16 13:29:54 +01:00
carl bergquist	d882af9f94	Merge branch 'es_drop_first_last' of https://github.com/Qtax/grafana into Qtax-es_drop_first_last	2015-12-16 09:48:14 +01:00
Torkel Ödegaard	f163ceffd0	fix(elasticsearch): fixes spelling of lucene, #3519	2015-12-15 08:29:24 +01:00
Qtax	bf41eb824d	Added ES histogram setting to drop/ignore the first and last datapoints	2015-12-14 19:58:08 +01:00
Torkel Ödegaard	aca9d3965d	feat(elasticsearch): added unit option to derivative metric, closes #3512	2015-12-14 18:49:53 +01:00
carl bergquist	f5eb54e595	feat(elasticsearch): only show pipeline agg for es version >= 2	2015-12-14 15:08:34 +01:00
Torkel Ödegaard	10f66fa78f	feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500	2015-12-11 18:20:53 +01:00
Torkel Ödegaard	7e9963ae05	fix(elasticsearch): minor markup fix	2015-12-11 12:51:39 +01:00
Torkel Ödegaard	9f294e3565	feat(elasticsearch): completed initial implementation of moving average and derivative pipleline aggregations, closes #3451	2015-12-11 12:41:40 +01:00
carl bergquist	4fa92198a0	feat(elasticsearch): add support for model setting	2015-12-11 09:19:05 +01:00
carl bergquist	662430d5db	feat(elasticsearch): adds last class for derivatives	2015-12-11 09:14:40 +01:00
carl bergquist	c8c9e0a7e7	feat(elasticsearch): improve pipeline aggs structure	2015-12-10 17:05:23 +01:00
Carl Bergquist	85094fc74d	feat(elasticsearch): add pipeline settings	2015-12-10 13:34:49 +01:00
Carl Bergquist	2d2ad8b237	show pipeline agg source for derivative	2015-12-10 13:06:46 +01:00
Torkel Ödegaard	1bb0530c69	feat(elasticsearch): metric options alignement	2015-12-10 12:15:11 +01:00
Carl Bergquist	e86dfcf55c	rename mavgoptions to more generic pipelineaggs	2015-12-10 10:43:00 +01:00
carl bergquist	8e18f2c5d2	refactor es pipeline aggregation variables to match ES	2015-12-09 16:25:05 +01:00
carl bergquist	d3ff4bf75e	changes to using an array for mavg options	2015-12-09 13:55:06 +01:00
carl bergquist	f51d74fa68	change the way options are added	2015-12-09 09:47:56 +01:00
carl bergquist	ad79df9b74	changes implementation direction ... moving average will now be based on another metric instead of having moving average on itself	2015-12-09 09:04:48 +01:00
Carl Bergquist	dd7a13930f	adds null check for response parser	2015-12-08 18:04:30 +01:00
Carl Bergquist	8ad10149ab	adds basic support for moving avg in es queries	2015-12-08 18:04:30 +01:00
utkarshcmu	005271d24b	Fixed missing closing tag	2015-12-07 05:41:18 -08:00
Torkel Ödegaard	ce58486850	fix(html): removed unneeded tag	2015-12-05 14:22:39 +01:00
Torkel Ödegaard	2345b41a74	feat(elasticsearch): added min_doc_count option for date histogram, closes #3416	2015-12-04 10:06:44 +01:00
Torkel Ödegaard	db9c288050	fix(elasticsearch): refactoring of #3321	2015-12-03 18:30:36 +01:00
Torkel Ödegaard	f1cb8f2f25	Merge branch 'keep_es_version' of https://github.com/replay/grafana into replay-keep_es_version	2015-12-03 18:08:26 +01:00
Torkel Ödegaard	419251ed35	fix(elasticsearch): fixed issue with default state of elasticsearch query, result in error before query controller could set defaults, moved defaults to query builder, also removed raw query mode as it is pretty broken, fixes #3396	2015-12-03 16:32:35 +01:00
Torkel Ödegaard	a1afd2328d	fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241	2015-11-23 14:19:10 +01:00
Mauro Stettler	ada9bfcae8	keep track of elastic search version and generate query according to version	2015-11-22 21:39:56 +09:00