Daniel Lee
bcc85862fe
dshttpsettings: Move whitelisted cookies to end of config page
2017-12-14 11:46:44 +01:00
Daniel Lee
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
Daniel Lee
592cb386e2
dshttpsettings: add field for cookies that should be kept
...
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
2017-12-14 11:46:44 +01:00
bergquist
43ac2b1dba
update version for packagecloud
2017-12-14 11:30:10 +01:00
bergquist
294a6a0046
add release date for 4.6.3
2017-12-14 11:20:34 +01:00
bergquist
75ecc019d3
changelog: adds note about closing #7481
2017-12-13 19:32:06 +01:00
bergquist
a7d746375d
Merge branch 'Thib17-master'
...
* Thib17-master:
alertmanager: endAt should only be used if we have the correct value
alertmanager: code style
alerting: reduce log level for notifiers
Alertmanager notifier: add "metric" labels if no tags
Alertmanager notifier: make it match the new notifier interface
support alertmanager
2017-12-13 19:17:10 +01:00
bergquist
ade734168c
alertmanager: endAt should only be used if we have the correct value
2017-12-13 19:17:00 +01:00
bergquist
3691faf136
alertmanager: code style
2017-12-13 19:17:00 +01:00
bergquist
1240db31d3
alerting: reduce log level for notifiers
2017-12-13 19:17:00 +01:00
Thibault Chataigner
a8264fe316
Alertmanager notifier: add "metric" labels if no tags
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-13 19:17:00 +01:00
Thibault Chataigner
3a7939c930
Alertmanager notifier: make it match the new notifier interface
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-13 19:17:00 +01:00
Mitsuhiro Tanda
20d94f9703
support alertmanager
2017-12-13 19:17:00 +01:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
bergquist
dfde6e75ed
changelog: adds note about closing #10151
2017-12-13 14:41:28 +01:00
bergquist
ee5f030ded
changelog: adds note about closing #9318
2017-12-13 13:53:38 +01:00
bergquist
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
bergquist
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
Daniel Lee
02d3a9f365
docs: SSL Mode config settings for Postgres
2017-12-13 10:55:58 +01:00
bergquist
355a12d7cb
Merge branch 'Thib17-master'
...
* Thib17-master:
removes verbose logging
Add a per-notifier ShouldNotify()
2017-12-13 10:26:35 +01:00
bergquist
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +01:00
Thibault Chataigner
fd633a1d5d
Add a per-notifier ShouldNotify()
...
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-12 17:35:54 +01:00
Torkel Ödegaard
a02086814e
graphite: remove check so that query is sent even for possible non leaf nodes
2017-12-12 17:00:00 +01:00
Torkel Ödegaard
a00af85f36
build: fixed unit test failure
2017-12-12 13:21:50 +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
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +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
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
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
Dan Cech
3a1700cbee
improve handling of query references
2017-12-09 16:27:05 -05:00
Dan Cech
4fcf79a3a6
demonstrate parseTarget issue
2017-12-09 11:17:34 -05:00
bergquist
0506cfdc1d
changelog: adds ntoe about closing #10111
2017-12-08 16:09:32 +01:00
Carl Bergquist
2408d8f09a
Merge pull request #10112 from adiletmaratov/master
...
Solves problem with Github authentication restriction by organization
2017-12-08 16:05:27 +01:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
bergquist
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
bergquist
c766802325
improve sample datasource.yaml
2017-12-08 10:28:38 +01:00
bergquist
80a852b00a
make gitignore more generic
2017-12-08 09:35:46 +01:00
bergquist
79d7213e11
fixes issue with datasource/dash as cfg and gitignore
2017-12-08 06:52:47 +01:00
