Torkel Ödegaard
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
Torkel Ödegaard
a00af85f36
build: fixed unit test failure
2017-12-12 13:21:50 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
bergquist
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
Torkel Ödegaard
871b98c06b
graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path
2017-12-12 12:56:40 +01:00
Torkel Ödegaard
bb52f3670e
Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget
2017-12-12 12:38:58 +01:00
Torkel Ödegaard
e98f573732
build: fixed broken test
2017-12-12 12:31:41 +01:00
Torkel Ödegaard
35c8cdf3a5
refactor: minor change to panel json fix PR #10156
2017-12-12 12:10:19 +01:00
Alexander Zobnin
86204abbfe
Move panel JSON editor to modal dialog ( #10156 )
...
* panel: fix JSON edit, #10149
* panel: show JSON editor in modal, #10149
2017-12-12 12:04:08 +01:00
Torkel Ödegaard
bbd0b98be9
Merge branch 'develop-settings' into develop
2017-12-12 12:03:10 +01:00
Torkel Ödegaard
7b0bbefb96
ux: minor updates to dashboard settings
2017-12-12 12:02:44 +01:00
Torkel Ödegaard
0a8bd5d289
ux: dashboard settings updated
2017-12-12 11:49:01 +01:00
Patrick O'Carroll
515faa9ec5
new dashboard and folder in search ( #10152 )
...
* new dashboard and folder in search
* code formatting fixes
2017-12-12 11:26:15 +01:00
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
Torkel Ödegaard
79d9b64f82
fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161
2017-12-12 11:00:16 +01:00
Carl Bergquist
ea2f65b4c3
Merge pull request #10110 from bwhaley/master
...
Fixes bug in cloudwatch regarding credentials
2017-12-12 10:16:53 +01:00
Torkel Ödegaard
cc046f03aa
ux: dashboard settings progress
2017-12-11 17:19:17 +01:00
Torkel Ödegaard
97bd00c520
ux: dashboard settings work progress
2017-12-11 16:46:10 +01:00
Daniel Lee
a37f1b77f1
dashfolders: new dashboard with folder selected
...
Fixes #10133
2017-12-11 16:37:40 +01:00
Torkel Ödegaard
008b9bb3e9
ux: dashboard settings work progress
2017-12-11 16:28:57 +01:00
Torkel Ödegaard
c4b759fe6d
ux: dashboard settings progress
2017-12-11 15:04:48 +01:00
Torkel Ödegaard
7f597283e8
ux: dashboard settings progress
2017-12-11 13:47:04 +01:00
Torkel Ödegaard
61dbcfd35b
ux: dashboard settings progress
2017-12-11 13:29:23 +01:00
Torkel Ödegaard
a682475152
fix: fixed failing test
2017-12-11 13:09:25 +01:00
Torkel Ödegaard
05ec7541c8
ux: dashboard settings progress
2017-12-11 13:04:06 +01:00
Torkel Ödegaard
8354c64ff5
Merge branch 'develop' into develop-settings
2017-12-11 12:15:59 +01:00
Torkel Ödegaard
09cc60ffe4
ux: dashboard settings progress
2017-12-11 12:13:45 +01:00
Torkel Ödegaard
795d9c0362
ux: fixed navbar and sidemenu z-index issue and improved responsive rules
2017-12-11 11:42:13 +01:00
Torkel Ödegaard
2ce4a8e4c5
fix: fixed build failure
2017-12-11 10:52:38 +01:00
Carl Bergquist
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +01:00
Carl Bergquist
43cff3a2bd
Merge pull request #10146 from noakup/master
...
hyphen
2017-12-11 10:18:00 +01:00
bergquist
66bc1fea2d
changelog: adds note about closing #10131
2017-12-11 09:45:47 +01:00
Carl Bergquist
a5b3f2b891
Merge pull request #10132 from bergquist/go_routine_management
...
Wait for all sub routines to finish before closing Grafana
2017-12-11 09:43:37 +01:00
Mikael Olenfalk
8e7166b5c4
Explicitly specify default region in CloudWatch datasource ( #9440 )
...
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.
This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
Torkel Ödegaard
502171fff1
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-11 09:18:03 +01:00
jomenxiao
ad2a69bff4
add encoding param
2017-12-11 16:01:17 +08:00
bergquist
f7ed24475c
wait for all sub routines to finish
...
simple solution for waiting for all go sub routines to
finish before closing Grafana. We would use errGroup
here as well but I dont like spreading context's all
over the place.
closes #10131
2017-12-11 08:53:06 +01:00
Dan Cech
588ce6606c
fix function re-ordering broken in #9436
2017-12-10 21:20:38 -05:00
noakup
e6bdccbb05
hyphenhyphen
2017-12-10 18:38:48 +02:00
Dan Cech
525ae4fdf5
support metric trees of varying depth, never send '.select metric' to graphite
2017-12-10 10:48:12 -05:00
Dan Cech
8dcfa18761
simplify function parameter addition
2017-12-10 10:45:41 -05:00
Torkel Ödegaard
511fa7dec1
ux: dashboard settings progress
2017-12-10 12:41:11 +01:00
Torkel Ödegaard
00c723f04a
ux: minor changes
2017-12-10 12:21:04 +01:00
Torkel Ödegaard
e1440dcc44
ux: navbar progress
2017-12-09 22:45:33 +01:00
Dan Cech
3a1700cbee
improve handling of query references
2017-12-09 16:27:05 -05:00
Torkel Ödegaard
1e5983b46c
Merge branch 'develop' into develop-settings
2017-12-09 21:50:26 +01:00
Torkel Ödegaard
47ecbbab8d
build: fix for tslint
2017-12-09 21:47:59 +01:00
Torkel Ödegaard
7f73fae6ae
ux: form styles polish, improvement but can be better
2017-12-09 21:46:30 +01:00
Dan Cech
4fcf79a3a6
demonstrate parseTarget issue
2017-12-09 11:17:34 -05:00
Torkel Ödegaard
55609382f1
fix: fixed panel size rerendering issues
2017-12-09 13:53:03 +01:00
