Commit Graph

243 Commits

Author SHA1 Message Date
bergquist
e348822190 Merge branch 'template_sort' of https://github.com/mtanda/grafana into mtanda-template_sort 2016-09-13 07:16:34 +02:00
bergquist
4d0982a21c Merge branch 'master' into alerting 2016-08-15 07:58:30 +02:00
Torkel Ödegaard
58df60f670 fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795 2016-08-14 14:45:49 +02:00
Torkel Ödegaard
bdb8d77562 feat(thresholds): migration from previous threshold schema 2016-08-10 20:41:21 +02:00
Torkel Ödegaard
a4d27083d0 fix(tests): fixed unit test broken in recent dynamic dashboard fix 2016-08-01 12:20:16 +02:00
Mitsuhiro Tanda
16dc095329 (templating) support asc/desc sort 2016-06-23 11:26:41 +09:00
Mitsuhiro Tanda
8987cfe0a2 (templating) add sort order option 2016-06-23 11:26:41 +09:00
Torkel Ödegaard
c739428c30 feat(profiling): refactorign profiling code, #5286 2016-06-08 06:51:10 +02:00
Torkel Ödegaard
696fad702f Merge branch 'v3.0.x'
Conflicts:
	public/app/features/templating/templateValuesSrv.js
2016-05-26 14:21:17 +02:00
Torkel Ödegaard
724a511995 fix(templating): fixed issue with value being shown instead of it's text representation, fixes #5172 2016-05-26 13:18:02 +02:00
Torkel Ödegaard
1060eeb197 feat(dashboard): include org id query parameter in dashboard url, #1613 2016-05-25 17:06:41 +02:00
Torkel Ödegaard
2cd6c2e7e0 Merge branch 'v3.0.x' 2016-05-25 11:04:12 +02:00
Torkel Ödegaard
0daadc954c fix(templating): fixed issue with detecting data source variable in other template variable definition, fixes #5165 2016-05-25 10:46:55 +02:00
Torkel Ödegaard
e81614b9e9 Merge branch 'v3.0.x' 2016-05-24 09:50:41 +02:00
Torkel Ödegaard
6f094ef215 fix(templating): fixed issue with nested template variables and multi select, the child variable selection state is now updated like single select variables, so if none matches the first option is selected, fixes #4861 2016-05-24 09:50:23 +02:00
Torkel Ödegaard
58a9324db0 Merge branch 'v3.0.x' 2016-05-20 10:24:54 +02:00
Torkel Ödegaard
e0e8fd6637 fix(templating): fixed handling of numeric values in tempalting query results, fixes #5097 2016-05-20 10:24:24 +02:00
Torkel Ödegaard
2416ee04c8 fix(templating): fixed detection of nested template variables, fixes #5103 2016-05-20 09:58:07 +02:00
Torkel Ödegaard
1bb4ca22e7 fix(test): fixed failing unsaved changes test 2016-05-19 07:58:44 +02:00
Mitsuhiro Tanda
66bcae353c (prometheus) pass dashboard time range to template query (#5007)
* (prometheus) pass dashboard time range to template query

* (prometheus) add passing time test of templating
2016-05-18 07:56:23 +02:00
Torkel Ödegaard
35f55cabf0 fix(templating): improved detection of nested template variables, fixes #4986, fixes #4987 2016-05-12 10:41:15 +02:00
Torkel Ödegaard
0201ac24e7 fix(templating): fixed issue with mixing repeated row and repeated panel, fixes #4988 2016-05-12 10:31:36 +02:00
Torkel Ödegaard
040dd91d2e fix(templating): fixed issue with current data source variable value, fixes #4934 2016-05-09 10:17:30 +02:00
Torkel Ödegaard
7349427189 feat(data source variable): progress on data source as variable 2016-04-28 19:08:35 +02:00
Torkel Ödegaard
1dfeb192a3 fix(templating): another fix for templating and custom all value escaping, fixes #4787 2016-04-22 13:59:54 +02:00
Torkel Ödegaard
bd21a08bc9 fix(templating): fixed encoding of all value for regex, and custom all value, fixes #4755, fixes #4736 2016-04-18 17:33:51 -04:00
Torkel Ödegaard
1cce5fdfe1 feat(templating): polished variable template edit forms, added new template variable type: datasource 2016-04-16 12:03:29 -04:00
Torkel Ödegaard
105a678d64 fix(): another test fix 2016-04-03 10:28:31 -04:00
Torkel Ödegaard
4871a8f43e refactor(graph): changed how graph stores panel yaxis options 2016-03-29 14:54:33 +02:00
Torkel Ödegaard
82ad5a632d tech(): fixed broken tests due to angularjs upgrade 2016-03-28 20:44:32 +02:00
Torkel Ödegaard
32a1d1445c refactor(): trying to move app events away from rootScope 2016-03-23 17:39:10 +01:00
simnv
dd5b4a25d1 Slash escaping test 2016-03-20 00:13:48 +06:00
NickG123
f11b4cb481 Added a select box to templates that allows template values to be refreshed on refresh 2016-03-09 00:40:33 +09:00
Torkel Ödegaard
3af4b1ff98 Merge pull request #4287 from grafana/raintank-issue4283
refactor how template vars are updated. fixes #4283
2016-03-08 11:33:37 +01:00
Torkel Ödegaard
6fac471415 feat(templating): fixed failing unit tests in PR #4287 2016-03-08 10:41:20 +01:00
bergquist
8e11f8dc21 feat(graph): add spacing above Series specific overrides 2016-03-08 10:30:38 +01:00
Torkel Ödegaard
2c8e35a933 fix(panel): fixed issues with png rendering, also fixed #4260 2016-03-06 12:51:36 +01:00
Torkel Ödegaard
260c731f6b fix(panel): fixes for panel height and alignment management and scrollable legends, closes #4266 2016-03-06 12:34:47 +01:00
Torkel Ödegaard
2cf1193b56 Merge branch 'variable-value-formatting-rethink' 2016-03-01 19:13:11 +01:00
Torkel Ödegaard
57315f1e27 feat(templating): updates to template variable forms 2016-03-01 19:12:54 +01:00
Torkel Ödegaard
d1bac6cde0 feat(templating): prometheus now works with new template variable formating/escaping, #2918 2016-03-01 16:11:05 +01:00
Torkel Ödegaard
fa73b1ce80 feat(templating): changed how the All templating value works 2016-03-01 13:47:02 +01:00
Torkel Ödegaard
8f5a7f1764 feat(templating): more work on context specific varaiable formats, #2918 2016-03-01 10:51:39 +01:00
utkarshcmu
8bc63e9029 Added spec tests for millisecond resolution 2016-03-01 01:09:14 -08:00
Torkel Ödegaard
f3ad71d751 feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now 2016-03-01 08:43:54 +01:00
Torkel Ödegaard
4ef79d250d feat(templating): initial work on rethink of value formating 2016-02-28 11:44:11 +01:00
Torkel Ödegaard
3a7ec2a26e fixed unit test 2016-02-22 19:00:48 +01:00
Daniel Lee
72415be2db fix(dashboard): fixes when panel repeat with templating removed
The original panel should clear all the templating variables and
    look like it did before repeat was selected. Fixes #3831. Also
cleans up after a row repeat is removed
2016-02-09 14:59:24 +01:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds
fixes #3878
2016-02-05 10:30:46 +01:00
Torkel Ödegaard
a167eb4fa1 fix(row repeat): fix for row repeat where repeated row was added to the bottom and not next to the source row, fixes #2942 2016-02-04 22:33:53 +01:00