Commit Graph

150 Commits

Author SHA1 Message Date
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
f813b4c58f feat(plugins): converted graphite plugin to new format 2016-01-09 13:30:02 +01:00
Torkel Ödegaard
c5635f9c89 feat(plugins): changed what datasources should return, they should now return the datasource constructor 2016-01-09 13:21:16 +01:00
Torkel Ödegaard
3bb20dbf2e feat(plugins): changed plugin schema, pluginType -> type, type -> id 2016-01-08 23:15:44 +01:00
Torkel Ödegaard
dabd680d6b tech(systemjs): merged sync with master, all tests are passing 2015-12-21 16:13:24 +01:00
Torkel Ödegaard
4522b02925 tech(systemjs): almost all tests are passing 2015-12-21 16:00:58 +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
26abce647d feat(elastic): isolate drop first and last logic 2015-12-16 13:27:35 +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
Carl Bergquist
55fab0493d Merge pull request #3393 from pepl/master
Fixed spelling error
2015-12-11 16:12:19 +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
141f22bedf feat(elasticsearch): display more info in options 2015-12-11 09:44:37 +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
139b19f9ac feat(elasticsearch): make series naming generic for pipeline aggs 2015-12-10 17:42:31 +01:00
carl bergquist
6e50e2412e feat(elasticsearch): remove pipeline aggs as possible sources 2015-12-10 17:18:22 +01:00
carl bergquist
005e14a060 refactor(elasticsearch): mavg naming -> pipeline agg 2015-12-10 17:12:52 +01:00
carl bergquist
c8c9e0a7e7 feat(elasticsearch): improve pipeline aggs structure 2015-12-10 17:05:23 +01:00
carl bergquist
0f65cb2b79 feat(elasticsearch): update pipeline aggs if type change
make it possible to switch between different pipeline
aggregates without causing problms in the ui
2015-12-10 17:01:29 +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
Torkel Ödegaard
b36f644628 feat(elasticsearch): added pipleline aggregation derivative 2015-12-10 11:46:19 +01:00
Torkel Ödegaard
2dee9c8d74 Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support 2015-12-10 11:19:39 +01:00
Carl Bergquist
9c6eb7736f move pipeline options outside main switch 2015-12-10 11:17:14 +01:00
Carl Bergquist
e86dfcf55c rename mavgoptions to more generic pipelineaggs 2015-12-10 10:43:00 +01:00
Torkel Ödegaard
d6311aefb7 Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support 2015-12-09 16:46:29 +01:00
carl bergquist
8e18f2c5d2 refactor es pipeline aggregation variables to match ES 2015-12-09 16:25:05 +01:00
carl bergquist
0644bfe27c improves timeseries naming for moving average series 2015-12-09 14:58:26 +01:00
carl bergquist
0b285845d1 adds spec for query builder 2015-12-09 14:21:48 +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
78c6ce842e revert elastic response parser 2015-12-09 09:10:50 +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
b4763290de move target extraction logic to query def 2015-12-09 09:00:06 +01:00
Mitsuhiro Tanda
8264c76642 add separate datasource parameter withCredentials 2015-12-09 14:44:28 +09: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