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
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
a1d66d98dc
Merge pull request #3448 from utkarshcmu/tips
...
Fixed closing tags
2015-12-08 12:10:05 +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
fad4875f11
Merge pull request #3436 from utkarshcmu/templating
...
Removed if condition to fix 3370
2015-12-07 11:45:32 +01:00
Mitsuhiro Tanda
217d5df276
(cloudwatch) fix period overwrite
2015-12-07 13:40:54 +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
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
700a3f9f84
Merge branch 'master' of github.com:grafana/grafana
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
Torkel Ödegaard
36ab8ae19c
fix(table): minor fix for table panel
2015-12-04 10:44:17 +01:00
Torkel Ödegaard
0b4552a8e7
fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345
2015-12-04 10:32:23 +01:00
Torkel Ödegaard
2345b41a74
feat(elasticsearch): added min_doc_count option for date histogram, closes #3416
2015-12-04 10:06:44 +01:00
Torkel Ödegaard
141e395489
polish(influxdb): minor improvements to influxdb editor raw query editor
2015-12-04 09:20:29 +01:00
Nick Christus
91139672cc
merge with master, conflicts fixed
2015-12-03 20:34:05 -06:00
Nick Christus
3d178c8eb6
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 20:21:15 -06:00
Nick Christus
c9bd45ba13
removed filters and actions for now
2015-12-03 20:20:54 -06:00
Torkel Ödegaard
db9c288050
fix(elasticsearch): refactoring of #3321
2015-12-03 18:30:36 +01:00
Torkel Ödegaard
f1cb8f2f25
Merge branch 'keep_es_version' of https://github.com/replay/grafana into replay-keep_es_version
2015-12-03 18:08:26 +01:00
Torkel Ödegaard
7ec2c09249
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 18:05:19 +01:00
Torkel Ödegaard
354bfcea15
Merge branch 'master' of https://github.com/skbkontur/grafana
2015-12-03 18:03:55 +01:00
Torkel Ödegaard
891d7c134c
Merge pull request #3205 from mtanda/cloudwatch_suggest_fix
...
(cloudwatch) fix dimension value suggestion
2015-12-03 17:17:07 +01:00
Mitsuhiro Tanda
154d70e4e2
remove dimensionPart
2015-12-04 01:02:25 +09:00
Torkel Ödegaard
419251ed35
fix(elasticsearch): fixed issue with default state of elasticsearch query, result in error before query controller could set defaults, moved defaults to query builder, also removed raw query mode as it is pretty broken, fixes #3396
2015-12-03 16:32:35 +01:00
Torkel Ödegaard
cf1f43dc9d
feat(influxdb): support for table queries, closes #3409 , #3219
2015-12-03 15:09:39 +01:00
Alexey Larkov
d6935847b4
Web. Fix double slash
2015-12-03 17:36:29 +05:00
Nick Christus
d86b2c4fb4
Merge branch 'master' of github.com:grafana/grafana
2015-12-02 21:33:06 -06:00
Torkel Ödegaard
8eb3e48bc7
fix(build): fixed build issues with concat not including require_config
2015-12-02 18:22:47 +01:00
Torkel Ödegaard
24324939e1
Merge branch 'fix_refresh_variable_from_url' of https://github.com/toni-moreno/grafana into toni-moreno-fix_refresh_variable_from_url
2015-12-01 15:28:48 +01:00
Torkel Ödegaard
2436cda7ac
fix(graph panel): minor spelling change
2015-12-01 15:28:34 +01:00
