public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,898 Commits 655 Branches 650 Tags
7a96df875b7c272f7cf8cd366529ed056eb6a42e
Commit Graph

6373 Commits

Author SHA1 Message Date
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 bbdc1c0e64 Add custom header with grafana user and a config switch for it 2019-03-14 16:33:19 +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
Sean Lafferty f3c52710df Make recently used auth_module test more robust by adding another 'log in' 2019-03-14 08:40:19 -04: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
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
Sean Lafferty 8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04: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 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
Sean Lafferty f17307bb97 Always return most recently used auth_module from GetAuthInfo 2019-03-13 11:29:13 -04:00
Torkel Ödegaard 9e7d1f4275 Merge pull request #15466 from grafana/bar-gauge-poc 
New Bar Gauge panel
 2019-03-13 11:12:33 +01:00
bergquist f13263eb54 reduce loglevel to debug 2019-03-13 09:01:45 +01:00
Torkel Ödegaard 71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
Sean Lafferty d922285ab8 Move oauth token migrations in user_auth_mig 2019-03-11 09:31:03 -04:00
Torkel Ödegaard 647cb6ddae Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master 2019-03-11 13:10:45 +01:00
bergquist 7aeab0a235 use Get instead of Find 2019-03-11 11:04:56 +01:00
Torkel Ödegaard 90a3bc2203 Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix 
Fix: #14706 Incorrect index pattern padding in alerting queries
 2019-03-11 11:01:22 +01:00
Torkel Ödegaard 5fab1e89d3 Merge pull request #15897 from grafana/revert-15608-fix-datasource-update 
Revert "Fix Datasource Update to no User/Password"
 2019-03-11 10:58:28 +01:00
bergquist b2967fbb37 avoid exposing cache client directly 2019-03-11 10:49:56 +01:00
bergquist 7e7427637c renames distcache -> remotecache 2019-03-11 10:49:55 +01:00
bergquist 66e71b66dd renames key to cache_key 
apparently key is a reserved keyword in mysql.
and the error messages doesnt mention that.
can I please have 6h back?
 2019-03-11 10:49:55 +01:00
bergquist daa3b17951 code layouts and comments 2019-03-11 10:49:42 +01:00
Torkel Ödegaard 3f574d3e57 Merge pull request #15685 from utkarshcmu/fix-#15562 
Fixed alias in Cloudwatch Expressions
 2019-03-11 10:49:30 +01:00
bergquist 9a78c23165 rename put -> set 2019-03-11 10:49:10 +01:00
bergquist 98f5432659 memcache -> memcached 
https://github.com/memcached/memcached
 2019-03-11 10:49:09 +01:00
bergquist 995647be2c removes memory as distcache option 
if database caching is to expensive if should
not use distcache in the first place.
 2019-03-11 10:49:09 +01:00
bergquist b933b4efc8 test redis and memcached during integration tests 2019-03-11 10:49:09 +01:00
bergquist 196cdf9710 adds config to default settings 2019-03-11 10:49:09 +01:00
bergquist f9f2d9fcf3 avoid exporting test helpers 2019-03-11 10:49:09 +01:00
bergquist 33935b09f0 uses set instead of add for memcache 
set always sets the value regardless.
 2019-03-11 10:49:09 +01:00
bergquist 8db2864fee adds memory as dist storage alt 2019-03-11 10:49:09 +01:00
bergquist a60bb83a70 extract tests into seperate files 2019-03-11 10:49:09 +01:00
bergquist c8ff698d90 avoid exposing internal structs and functions 2019-03-11 10:49:04 +01:00
Carl Bergquist f3753712e0 Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
genofire 6d578dd372 fix imageurl in notification test 
skip unnecessary http -> https redirect, which could make problems on some notifiers
 2019-03-11 00:23:07 +01:00
Torkel Ödegaard 570187384b Merge pull request #13825 from athurg/optimize_dingding_alert_message 
Optimize dingding alert message
 2019-03-08 15:33:24 +01:00
Marcus Efraimsson 0cd5a6772d feat(api): support list/revoke auth token in admin/current user api 2019-03-08 15:15:38 +01:00
Marcus Efraimsson 8029e48588 support get user tokens/revoke all user tokens in UserTokenService 2019-03-08 15:15:17 +01:00
Marcus Efraimsson 4f48ed3350 Merge pull request #15872 from grafana/15643_fix2 
fix allow anonymous server bind for ldap search
 2019-03-08 14:25:58 +01:00
Marcus Efraimsson e3b3062107 add nil/length check when delete old login attempts 2019-03-08 13:31:46 +01:00
Marcus Efraimsson c242d38301 fix allow anonymous server bind for ldap search 2019-03-08 13:16:35 +01:00