public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard bffb217d37 fix(panel): removed accidentally commited test markup 2015-12-09 13:08:47 +01:00
Torkel Ödegaard 40f85e5ca3 refactor(http data source options): #3473 2015-12-09 13:05:05 +01:00
Torkel Ödegaard 2dba2f4a95 Merge branch 'with_credentials' of https://github.com/mtanda/grafana into mtanda-with_credentials 2015-12-09 12:54:00 +01:00
Torkel Ödegaard 70542fb730 refactor(table views): #3466 2015-12-09 12:04:51 +01:00
Mitsuhiro Tanda cd742979b1 add withCredentials checkbox 2015-12-09 19:43:59 +09:00
Torkel Ödegaard 736d58e35f Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views 2015-12-09 10:43:51 +01:00
Torkel Ödegaard 64138bd424 fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week so far, closes #3465 2015-12-09 10:35:39 +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
Mitsuhiro Tanda 6edd6c8f03 add with_credentials to datasource model 2015-12-09 14:44:28 +09:00
Torkel Ödegaard f1bc87133d Merge branch 'cloudwatch_aws-sdk-go-v1.0.0' of https://github.com/mtanda/grafana into mtanda-cloudwatch_aws-sdk-go-v1.0.0 2015-12-08 18:09:40 +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
Carl Bergquist 0731064375 adds support for moving avg support in es queries 2015-12-08 18:04:30 +01:00
Torkel Ödegaard e194461420 feat(grunt watch): optimized grunt watch, now only operates on changed files 2015-12-08 17:56:02 +01:00
Daniel Low b97b23647e memcache files in godep 2015-12-08 16:32:27 +00:00
Daniel Low 7bdeceff36 add memcache as godep 2015-12-08 16:18:40 +00:00
Torkel Ödegaard 45c69fa638 fix(influxdb): fixed issue where Group By label was only showed on first query, fixes #3453 2015-12-08 16:40:41 +01:00
Daniel Low d7f3869959 gofmt 2015-12-08 14:59:54 +00:00
Torkel Ödegaard cdc36dd171 Updated version 2015-12-08 15:41:34 +01:00
Daniel Low ed16914715 Add memcache as session provider 2015-12-08 13:35:09 +00:00
Torkel Ödegaard a1d66d98dc Merge pull request #3448 from utkarshcmu/tips 
Fixed closing tags
 2015-12-08 12:10:05 +01:00
Torkel Ödegaard dd3295da60 Merge pull request #3449 from EricSmekens/patch-1 
Cleaned up jquery.flot.events.js
 2015-12-08 12:09:47 +01:00
Nick Christus 282aaa5cf0 Merge branch 'master' into updated-list-views 2015-12-07 16:30:02 -06:00
Nick Christus 462a939438 Merge branch 'master' of github.com:grafana/grafana 2015-12-07 16:29:51 -06:00
Nick Christus 030f902ca5 removed redundant labels 2015-12-07 16:26:18 -06:00
Eric Smekens 58093941c0 Cleaned up jquery.flot.events.js 
_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.)
 2015-12-07 20:16:52 +01:00
utkarshcmu 005271d24b Fixed missing closing tag 2015-12-07 05:41:18 -08:00
utkarshcmu 2b263bcb5d Fixed closing tag 2015-12-07 05:06:52 -08:00
utkarshcmu 79d0f47ee7 Added columns in dashboard_snapshot 2015-12-07 04:24:29 -08:00
Torkel Ödegaard 1ebb18ae57 Merge pull request #3432 from toni-moreno/add_rpm_deb_separate_commands 
add option pkg-rpm and pkg-deb to create separately both packages #3407
 2015-12-07 11:46:00 +01:00
Torkel Ödegaard fad4875f11 Merge pull request #3436 from utkarshcmu/templating 
Removed if condition to fix 3370
 2015-12-07 11:45:32 +01:00
utkarshcmu 42d1205260 Fixed gofmt checks 2015-12-06 23:59:58 -08:00
utkarshcmu 3d90340446 Added new columns to dashboard table 2015-12-06 23:51:43 -08:00
Torkel Ödegaard d68e1fd308 Merge pull request #3444 from mtanda/cloudwatch_fix_period 
(cloudwatch) fix period overwrite
 2015-12-07 06:43:33 +01:00
Mitsuhiro Tanda 217d5df276 (cloudwatch) fix period overwrite 2015-12-07 13:40:54 +09:00
Mitsuhiro Tanda d1ccf83236 (cloudwatch) use paging 2015-12-06 21:35:20 +09:00
Mitsuhiro Tanda 28968144d6 update aws-sdk-go v1.0.0 2015-12-06 21:35:19 +09:00
Torkel Ödegaard 4c5cfd51d7 fix(metric_editors): Fixes clicking timing issue for typeahead auto dropdown option, fixes #3428 2015-12-06 10:13:47 +01:00
utkarshcmu b6044910ec Removed if condition to fix 3370 2015-12-05 06:34:03 -08:00