Sean Lafferty
dba2df19e8
Make all http auth setting labels the same width
2019-03-20 14:19:29 -04:00
Sean Lafferty
3f9a19dcd5
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-14 13:18:00 -04:00
Andrej Ocenas
8221c4273f
Merge pull request #15998 from grafana/add-grafana-user-proxy-header
...
Add custom header with grafana user when using proxy
2019-03-14 17:29:06 +01:00
Carl Bergquist
23852b59c9
Merge pull request #15839 from grafana/15836_revoke_auth_tokens
...
Support list and revoke of user auth tokens in HTTP API
2019-03-14 17:12:49 +01:00
Andrej Ocenas
697a87b7b2
Add check so that header is not sent for anonymous users
2019-03-14 16:33:21 +01:00
Andrej Ocenas
6587a967eb
Update config docs
2019-03-14 16:33:20 +01:00
Andrej Ocenas
bbdc1c0e64
Add custom header with grafana user and a config switch for it
2019-03-14 16:33:19 +01:00
bergquist
191a7e4b8d
changelog: adds note about closing #10816
2019-03-14 16:19:12 +01:00
Carl Bergquist
291ffcb75b
Merge pull request #15457 from bergquist/distributed_cache
...
Distributed cache
2019-03-14 16:16:39 +01:00
bergquist
6d42d43b22
use constants for cache type
2019-03-14 15:48:20 +01:00
bergquist
5f059038c6
makes variables template prettier complient
2019-03-14 13:52:36 +01:00
Sean Lafferty
f3c52710df
Make recently used auth_module test more robust by adding another 'log in'
2019-03-14 08:40:19 -04:00
Torkel Ödegaard
12219a1d7e
Merge pull request #15957 from ryantxu/panel-options-init
...
improve the new PreservePanelOptionsHandler
2019-03-14 13:05:09 +01:00
bergquist
f059c25f95
white space formating
2019-03-14 10:59:13 +01:00
bergquist
7b692c1cfd
changelog: adds note about #15744
2019-03-14 10:10:58 +01:00
Carl Bergquist
11d9122cf5
Merge pull request #15916 from zhulongcheng/victorops-noti
...
Add more info to victorOps alert notifications
2019-03-14 10:02:44 +01:00
bergquist
0a86a1d7b6
updates old distcache names
2019-03-14 09:23:35 +01:00
bergquist
c001cfe1d9
dont allow inifinite expiration
2019-03-14 09:22:03 +01:00
bergquist
5186273731
return error if cache type is invalid
2019-03-14 08:57:38 +01:00
zhulongcheng
755f60358b
Add more info to victorOps alert notifications
2019-03-14 15:47:11 +08:00
Carl Bergquist
9ac69fefc6
Merge pull request #15987 from fetzerch/tags
...
docs: Change type of 'tags' in annotationQuery result example to list
2019-03-14 07:48:38 +01:00
Carl Bergquist
89709e34e4
Merge pull request #15989 from utkarshcmu/fix-#15665
...
Added cloudwatch metric math docs
2019-03-14 07:47:33 +01:00
utkarshcmu
78e08da2ef
Added metric math docs
2019-03-13 15:00:41 -07:00
ryan
68f7e046ab
check types better
2019-03-13 13:11:49 -07:00
ryan
0c086795e3
check types better
2019-03-13 13:07:01 -07:00
Christian Fetzer
0cd59fdbcc
docs: Change type of 'tags' in annotationQuery result example to list
...
A datasource plugin must return a list of tags in the 'tags' field of
the annotationQuery result. A string 'test' would otherwise result in
4 tags in Grafana: 't','e','s','t'.
2019-03-13 20:48:49 +01:00
ryan
75022ebd63
single hook
2019-03-13 12:46:04 -07:00
Torkel Ödegaard
9c4abc9d0c
Merge pull request #15982 from steven-sheehy/hide-duplicate-column
...
explore/logs: Hide empty duplicates column
2019-03-13 20:38:18 +01:00
Torkel Ödegaard
010b45d75e
Merge pull request #15981 from srid12/firefox-checkbox-15854
...
Fix for firefox checkboxes not appearing properly
2019-03-13 20:36:25 +01:00
Torkel Ödegaard
bfc84c0f2b
Merge pull request #15980 from srid12/custom-variable-issue-15921
...
used regex instead of string replacing
2019-03-13 20:34:56 +01:00
Torkel Ödegaard
614b4251de
Merge pull request #15985 from ryantxu/generic-viz-repeat
...
VisRepeater should not care about the value type
2019-03-13 20:33:16 +01:00
Sean Lafferty
fcc18d8121
Change import path for social in the tests
2019-03-13 14:55:22 -04:00
Sean Lafferty
8d8119aa98
Change import path for social since it has moved
2019-03-13 14:34:55 -04:00
ryan
6472c2bcd9
generic repeater
2019-03-13 11:30:52 -07:00
Sean Lafferty
8d19ca005f
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-13 14:25:43 -04:00
ryan
36d67f22e9
generic repeater
2019-03-13 11:24:18 -07:00
Sean Lafferty
de338338bf
Remove todo about index on user_id in user_auth because it exists
2019-03-13 13:46:49 -04:00
Sean Lafferty
7e62394d01
Add function in ds_proxy to handle oauthPassThru headers
2019-03-13 13:45:32 -04:00
Sean Lafferty
f79dc0a89b
Remove auth_module settings from oauthPassThru ui
2019-03-13 13:34:10 -04:00
Sean Lafferty
4324a7f51a
Remove auth module from ds_proxy oauth test
2019-03-13 13:28:49 -04:00
Sean Lafferty
3b15e110a5
Get most recent oauth token from db, rather than lookup by auth_module
2019-03-13 13:22:22 -04:00
Steven Sheehy
17184257af
explore/logs: Hide empty duplicates column
...
Signed-off-by: Steven Sheehy <ssheehy@firescope.com >
2019-03-13 11:12:29 -05:00
sridhar-komati
8acc00aa66
fix for firefox checkboxes not appearing properly, added appearance as none
2019-03-13 21:38:16 +05:30
ryan
b933c57c62
merge master
2019-03-13 08:36:51 -07:00
Sean Lafferty
f17307bb97
Always return most recently used auth_module from GetAuthInfo
2019-03-13 11:29:13 -04:00
sridhar-komati
03d4b61208
used regex instead of string replacing
2019-03-13 20:42:19 +05:30
Torkel Ödegaard
4bbd6ab79c
Merge pull request #15975 from grafana/fixed-alert-link-issue
...
Fixed issue with AlertList panel links resulting in panel not found errors
2019-03-13 15:52:14 +01:00
Torkel Ödegaard
91fc73bf82
Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
2019-03-13 13:51:22 +01:00
Andrej Ocenas
f7a8df6ebd
Merge pull request #15926 from grafana/create-color-picker-trigger-component
...
Create default ColorPickerTrigger component
2019-03-13 12:47:52 +01:00
Andrej Ocenas
fc199a35ca
Add comments
2019-03-13 12:23:41 +01:00
