Commit Graph

5046 Commits

Author SHA1 Message Date
Mitsuhiro Tanda c8e894e8f8 sort metrics and dimensions 2015-12-11 17:56:35 +09: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
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
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 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
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
Torkel Ödegaard e194461420 feat(grunt watch): optimized grunt watch, now only operates on changed files 2015-12-08 17:56:02 +01: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
Torkel Ödegaard cdc36dd171 Updated version 2015-12-08 15:41:34 +01: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
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
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
Torkel Ödegaard 5aa90eb086 Merge branch 'master' of github.com:grafana/grafana 2015-12-05 14:22:54 +01:00
Torkel Ödegaard ce58486850 fix(html): removed unneeded tag 2015-12-05 14:22:39 +01:00
toni-moreno 7e63978a3f fix formatting for CircleCI test 2015-12-04 22:55:23 +01:00
toni-moreno c9674f84e8 add option pkg-rpm and pkg-deb to create separately both packages #3407 2015-12-04 22:36:38 +01:00
Torkel Ödegaard 654d1f939e Merge pull request #3424 from grafana/code-tag
add variable for codeTagBackground to control look for both themes.
2015-12-04 18:17:24 +01:00
Trent White 477b876a1f add variable for codeTagBackground to control look for both themes. Fixes #3399 2015-12-04 11:55:20 -05:00
Torkel Ödegaard df0a5cf52f updated appveyor again 2015-12-04 16:56:37 +01:00
Torkel Ödegaard caa6337952 updated appveyor 2015-12-04 16:48:35 +01:00
Torkel Ödegaard 700a3f9f84 Merge branch 'master' of github.com:grafana/grafana v2.6.0-beta1 2015-12-04 15:45:06 +01:00
Torkel Ödegaard f9b13791de change(table panel): changed default transform mode 2015-12-04 15:38:49 +01:00
Torkel Ödegaard 7886318341 Merge pull request #3417 from mtanda/cloudwatch_dimension_filter_fix
(cloudwatch) null check of dimension
2015-12-04 12:30:13 +01:00
Mitsuhiro Tanda 573632012e cloudwatch dimension null check 2015-12-04 20:16:31 +09:00
Torkel Ödegaard 002455da07 fix(table): minor fix to table panel and transform time series to aggregations 2015-12-04 12:15:42 +01:00