carl bergquist
|
22c4e605cf
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-11 15:25:34 +01:00 |
|
carl bergquist
|
67737b1556
|
feat(changelog): add info about merge PR to changelog
|
2015-12-11 15:24:22 +01:00 |
|
carl bergquist
|
cdfd3449ed
|
Merge branch 'tmonk42-ldap_login_hints'
|
2015-12-11 15:18:29 +01:00 |
|
carl bergquist
|
fab1062c0b
|
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
|
2015-12-11 15:16:57 +01:00 |
|
Torkel Ödegaard
|
766b9d5270
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-11 14:40:18 +01:00 |
|
Torkel Ödegaard
|
023fa2b2cc
|
fix(influxdb): minor fix to new editor, there were 5min as a selectable option in derivative function
|
2015-12-11 14:39:59 +01:00 |
|
carl bergquist
|
8910351f5c
|
fix(changelog): add info about merged PR's
|
2015-12-11 14:38:50 +01:00 |
|
Torkel Ödegaard
|
1b42e3015e
|
fix(timepicker): mini change, removed unneeded space
|
2015-12-11 14:34:56 +01:00 |
|
Torkel Ödegaard
|
4e9e18d4c0
|
Merge pull request #3498 from bergquist/always_show_refresh_button
feat(timepicker): always show refresh button
|
2015-12-11 14:33:50 +01:00 |
|
carl bergquist
|
ba5b127684
|
feat(timepicker): always show refresh button
closes #1628
closes #1208
|
2015-12-11 14:26:38 +01:00 |
|
Carl Bergquist
|
225e7a6a32
|
Merge pull request #3161 from mischief/syslog
syslog support closes #3160
|
2015-12-11 14:03:21 +01:00 |
|
Torkel Ödegaard
|
7e9963ae05
|
fix(elasticsearch): minor markup fix
|
2015-12-11 12:51:39 +01:00 |
|
Torkel Ödegaard
|
b7c0f3ea95
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-11 12:45:01 +01:00 |
|
Torkel Ödegaard
|
a8e2610d7d
|
updated changelog
|
2015-12-11 12:44:47 +01:00 |
|
Torkel Ödegaard
|
b934ace1fc
|
Merge branch 'moving_avg_es_support'
|
2015-12-11 12:43:02 +01:00 |
|
Torkel Ödegaard
|
82cbfc9905
|
feat(elasticsearch): added pipeline aggregations feature to changelog
|
2015-12-11 12:42:55 +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 |
|
Torkel Ödegaard
|
68775182f0
|
Merge pull request #3494 from mtanda/cloudwatch_cleanup
remove aws-sdk-js require setting
|
2015-12-11 12:28:26 +01:00 |
|
Mitsuhiro Tanda
|
dc3e172eb4
|
remove aws-sdk-js require setting
|
2015-12-11 20:27:24 +09:00 |
|
Torkel Ödegaard
|
5bd128ba85
|
Merge pull request #3493 from bergquist/table_panel_color_invert_order
Table Panel: adds invert color order functionality
|
2015-12-11 12:05:35 +01:00 |
|
carl bergquist
|
1a8579cd6d
|
feat(table_panel): adds invert color order functionality
|
2015-12-11 12:01:04 +01:00 |
|
Torkel Ödegaard
|
5921bb0589
|
Merge pull request #3490 from mtanda/cloudwatch_metric_update
(cloudwatch) update suggest metrics and dimensions
|
2015-12-11 11:09:45 +01:00 |
|
Mitsuhiro Tanda
|
c8e894e8f8
|
sort metrics and dimensions
|
2015-12-11 17:56:35 +09:00 |
|
carl bergquist
|
141f22bedf
|
feat(elasticsearch): display more info in options
|
2015-12-11 09:44:37 +01:00 |
|
Mitsuhiro Tanda
|
d9844350fe
|
update supported metrics and dimensions
|
2015-12-11 17:42:40 +09:00 |
|
Mitsuhiro Tanda
|
2d9d11a89c
|
reorder supported metrics and dimensions
|
2015-12-11 17:19:56 +09: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 |
|
Torkel Ödegaard
|
5227dc679d
|
fix(invite): removed resend invite button, button logic was not implemented, fixes #3484
|
2015-12-10 13:31:24 +01:00 |
|
Torkel Ödegaard
|
77c510c364
|
fix(graph legend): fixed issue with escaping html text in graph legend, and in function param, fixes #3482
|
2015-12-10 13:27:57 +01:00 |
|
Carl Bergquist
|
2d2ad8b237
|
show pipeline agg source for derivative
|
2015-12-10 13:06:46 +01:00 |
|
Torkel Ödegaard
|
6ea00a4f7c
|
fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465
|
2015-12-10 13:01:41 +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 |
|
Torkel Ödegaard
|
aa4ac9fa05
|
fix(timerange): fixed broken unit tests
|
2015-12-09 13:38:53 +01:00 |
|
Torkel Ödegaard
|
0339a5ad01
|
fix(graph): removed experimental mockup code that was accidently merged master
|
2015-12-09 13:36:15 +01:00 |
|