Commits · 1bb0530c6979586c0a10de820be69aabbcb7c184 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

10 Dec, 2015 5 commits
- feat(elasticsearch): metric options alignement · 1bb0530c
  Torkel Ödegaard committed Dec 10, 2015
  
  1bb0530c Browse Files
- feat(elasticsearch): added pipleline aggregation derivative · b36f6446
  Torkel Ödegaard committed Dec 10, 2015
  
  b36f6446 Browse Files
- Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana… · 2dee9c8d
```
Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support
```
  Torkel Ödegaard committed Dec 10, 2015
  2dee9c8d Browse Files
- move pipeline options outside main switch · 9c6eb773
  Carl Bergquist committed Dec 10, 2015
  
  9c6eb773 Browse Files
- rename mavgoptions to more generic pipelineaggs · e86dfcf5
  Carl Bergquist committed Dec 10, 2015
  
  e86dfcf5 Browse Files
09 Dec, 2015 20 commits
- Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana… · d6311aef
```
Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support
```
  Torkel Ödegaard committed Dec 09, 2015
  d6311aef Browse Files
- refactor es pipeline aggregation variables to match ES · 8e18f2c5
  carl bergquist committed Dec 09, 2015
  
  8e18f2c5 Browse Files
- improves timeseries naming for moving average series · 0644bfe2
  carl bergquist committed Dec 09, 2015
  
  0644bfe2 Browse Files
- adds spec for query builder · 0b285845
  carl bergquist committed Dec 09, 2015
  
  0b285845 Browse Files
- changes to using an array for mavg options · d3ff4bf7
  carl bergquist committed Dec 09, 2015
  
  d3ff4bf7 Browse Files
- fix(timerange): fixed broken unit tests · aa4ac9fa
  Torkel Ödegaard committed Dec 09, 2015
  
  aa4ac9fa Browse Files
- fix(graph): removed experimental mockup code that was accidently merged master · 0339a5ad
  Torkel Ödegaard committed Dec 09, 2015
  
  0339a5ad Browse Files
- fix(panel): removed accidentally commited test markup · bffb217d
  Torkel Ödegaard committed Dec 09, 2015
  
  bffb217d Browse Files
- refactor(http data source options): #3473 · 40f85e5c
  Torkel Ödegaard committed Dec 09, 2015
  
  40f85e5c Browse Files
- Merge branch 'with_credentials' of https://github.com/mtanda/grafana into mtanda-with_credentials · 2dba2f4a
  Torkel Ödegaard committed Dec 09, 2015
  
  2dba2f4a Browse Files
- refactor(table views): #3466 · 70542fb7
  Torkel Ödegaard committed Dec 09, 2015
  
  70542fb7 Browse Files
- add withCredentials checkbox · cd742979
  Mitsuhiro Tanda committed Dec 09, 2015
  
  cd742979 Browse Files
- Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into… · 736d58e3
```
Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views
```
  Torkel Ödegaard committed Dec 09, 2015
  736d58e3 Browse Files
- fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week… · 64138bd4
```
fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week so far, closes #3465
```
  Torkel Ödegaard committed Dec 09, 2015
  64138bd4 Browse Files
- change the way options are added · f51d74fa
  carl bergquist committed Dec 09, 2015
  
  f51d74fa Browse Files
- revert elastic response parser · 78c6ce84
  carl bergquist committed Dec 09, 2015
  
  78c6ce84 Browse Files
- changes implementation direction · ad79df9b
```
moving average will now be based on another metric
instead of having moving average on itself
```
  carl bergquist committed Dec 09, 2015
  ad79df9b Browse Files
- move target extraction logic to query def · b4763290
  carl bergquist committed Dec 09, 2015
  
  b4763290 Browse Files
- add separate datasource parameter withCredentials · 8264c766
  Mitsuhiro Tanda committed Dec 09, 2015
  
  8264c766 Browse Files
- add with_credentials to datasource model · 6edd6c8f
  Mitsuhiro Tanda committed Dec 09, 2015
  
  6edd6c8f Browse Files
08 Dec, 2015 9 commits
- Merge branch 'cloudwatch_aws-sdk-go-v1.0.0' of https://github.com/mtanda/grafana… · f1bc8713
```
Merge branch 'cloudwatch_aws-sdk-go-v1.0.0' of https://github.com/mtanda/grafana into mtanda-cloudwatch_aws-sdk-go-v1.0.0
```
  Torkel Ödegaard committed Dec 08, 2015
  f1bc8713 Browse Files
- adds null check for response parser · dd7a1393
  Carl Bergquist committed Dec 08, 2015
  
  dd7a1393 Browse Files
- adds basic support for moving avg in es queries · 8ad10149
  Carl Bergquist committed Dec 08, 2015
  
  8ad10149 Browse Files
- adds support for moving avg support in es queries · 07310643
  Carl Bergquist committed Dec 08, 2015
  
  07310643 Browse Files
- feat(grunt watch): optimized grunt watch, now only operates on changed files · e1944614
  Torkel Ödegaard committed Dec 08, 2015
  
  e1944614 Browse Files
- fix(influxdb): fixed issue where Group By label was only showed on first query, fixes #3453 · 45c69fa6
  Torkel Ödegaard committed Dec 08, 2015
  
  45c69fa6 Browse Files
- Updated version · cdc36dd1
  Torkel Ödegaard committed Dec 08, 2015
  
  cdc36dd1 Browse Files
- Merge pull request #3448 from utkarshcmu/tips · a1d66d98
```
Fixed closing tags
```
  Torkel Ödegaard committed Dec 08, 2015
  a1d66d98 Browse Files
- Merge pull request #3449 from EricSmekens/patch-1 · dd3295da
```
Cleaned up jquery.flot.events.js
```
  Torkel Ödegaard committed Dec 08, 2015
  dd3295da Browse Files
07 Dec, 2015 6 commits
- Merge branch 'master' into updated-list-views · 282aaa5c
  Nick Christus committed Dec 07, 2015
  
  282aaa5c Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 462a9394
  Nick Christus committed Dec 07, 2015
  
  462a9394 Browse Files
- removed redundant labels · 030f902c
  Nick Christus committed Dec 07, 2015
  
  030f902c Browse Files
- Cleaned up jquery.flot.events.js · 58093941
```
_lastRange was confused with lastRange. This declared '_lastRange' somewhere globally.

Was also not used, so removed both.

(I know this is a library, but it was heavily adjusted anyway.)
```
  Eric Smekens committed Dec 07, 2015
  58093941 Browse Files
- Fixed missing closing tag · 005271d2
  utkarshcmu committed Dec 07, 2015
  
  005271d2 Browse Files
- Fixed closing tag · 2b263bcb
  utkarshcmu committed Dec 07, 2015
  
  2b263bcb Browse Files