Leonard Gram
|
adf0390b2c
|
teams: local access to bus, moving away from dep on global.
|
2019-03-19 14:01:20 +01:00 |
|
Leonard Gram
|
6589a4e55f
|
teams: better names for api permissions.
|
2019-03-19 14:01:20 +01:00 |
|
Leonard Gram
|
9f33f00343
|
teams: refactor.
|
2019-03-19 14:01:19 +01:00 |
|
Leonard Gram
|
9f8e43916d
|
permissions: refactor.
|
2019-03-19 14:01:19 +01:00 |
|
Leonard Gram
|
b796027bc6
|
teams: refactor.
|
2019-03-19 14:01:19 +01:00 |
|
Leonard Gram
|
d1481cac50
|
teams: refactored db code.
|
2019-03-19 14:01:18 +01:00 |
|
Hugo Häggmark
|
6a63725df0
|
teams: comment explaining input validation
Co-Authored-By: xlson <leo@xlson.com>
|
2019-03-19 14:01:17 +01:00 |
|
Leonard Gram
|
3f57a81c47
|
teams: cleanup.
|
2019-03-19 14:01:16 +01:00 |
|
Leonard Gram
|
ccfd6789ca
|
teams: cleanup.
|
2019-03-19 14:01:16 +01:00 |
|
Leonard Gram
|
fc0461134f
|
dashboards: simplified code.
|
2019-03-19 14:01:15 +01:00 |
|
Hugo Häggmark
|
b60e71c28b
|
teams: moved logic for searchteams to backend
|
2019-03-19 14:01:15 +01:00 |
|
Hugo Häggmark
|
782b5b6a3a
|
teams: viewers and editors can view teams
|
2019-03-19 14:01:14 +01:00 |
|
Leonard Gram
|
c420af16b1
|
teams: editor/viewer team admin cant remove the last admin.
|
2019-03-19 14:01:14 +01:00 |
|
Hugo Häggmark
|
246e128048
|
teams: changed permission to permission type instead of int
|
2019-03-19 14:01:14 +01:00 |
|
Hugo Häggmark
|
c826f39a8b
|
teams: defaulting invalid permission level to member permission level
|
2019-03-19 14:01:13 +01:00 |
|
Leonard Gram
|
c823ad5de7
|
team: uses PermissionType instead of int64 for permissions.
|
2019-03-19 14:01:13 +01:00 |
|
Leonard Gram
|
21d3d27452
|
teams: editors can't remove the last admin from a team.
|
2019-03-19 14:01:13 +01:00 |
|
Leonard Gram
|
b783fa7039
|
team: renames teams.CanUpdate teamguardian.CanAdmin
|
2019-03-19 14:01:12 +01:00 |
|
Hugo Häggmark
|
a90b3e331e
|
config: updated feature toggle name
|
2019-03-19 13:59:39 +01:00 |
|
Leonard Gram
|
a6a3d698da
|
teams: cleanup.
|
2019-03-19 13:57:30 +01:00 |
|
Leonard Gram
|
0b209de5d1
|
dashboard: only admin permission added to dashboard in folder.
|
2019-03-19 13:57:30 +01:00 |
|
Leonard Gram
|
d593ffe3c1
|
dashboards: better error handling
|
2019-03-19 13:57:30 +01:00 |
|
Leonard Gram
|
89d4db8eb6
|
teams: team listing shows only your teams (editors).
|
2019-03-19 13:57:29 +01:00 |
|
Leonard Gram
|
1f949e58e1
|
teams: teams guard on all teams update methods.
|
2019-03-19 13:57:29 +01:00 |
|
Leonard Gram
|
23231e6d51
|
teams: added delete team guard
|
2019-03-19 13:57:29 +01:00 |
|
Leonard Gram
|
8e7a8282c1
|
teams: removed feature toggle as it is already in middleware
|
2019-03-19 13:57:28 +01:00 |
|
Leonard Gram
|
d668550aa2
|
teams: added feature toggle and refactor tests
|
2019-03-19 13:57:28 +01:00 |
|
Leonard Gram
|
0d61f89577
|
teams: cleanup.
|
2019-03-19 13:57:28 +01:00 |
|
Leonard Gram
|
3be1d71f1f
|
teams: test refactorings.
|
2019-03-19 13:57:27 +01:00 |
|
Leonard Gram
|
319879cfa8
|
teams: bugfix, user pointer.
|
2019-03-19 13:57:27 +01:00 |
|
Leonard Gram
|
90e9fda90c
|
teams: start of team update guardian for editors
|
2019-03-19 13:57:26 +01:00 |
|
Hugo Häggmark
|
5adde259d3
|
teams: team update test
|
2019-03-19 13:57:26 +01:00 |
|
Hugo Häggmark
|
3c46b786d2
|
teams: change back to permissionlevel for Member to 0
|
2019-03-19 13:57:26 +01:00 |
|
Hugo Häggmark
|
3c74ac3044
|
teams: update only the selected user
|
2019-03-19 13:57:25 +01:00 |
|
Hugo Häggmark
|
074ebf0f48
|
teams: only write error message if error
|
2019-03-19 13:57:25 +01:00 |
|
Leonard Gram
|
aedc478208
|
teams: test for update team member.
|
2019-03-19 13:57:24 +01:00 |
|
Leonard Gram
|
2a88052c14
|
teams: can update team members permission.
|
2019-03-19 13:57:23 +01:00 |
|
Hugo Häggmark
|
7888457aae
|
teams: basic ui for permission in team members view
|
2019-03-19 13:57:23 +01:00 |
|
Leonard Gram
|
af4994ba16
|
teams: editor added as admin for created teams.
|
2019-03-19 13:57:22 +01:00 |
|
Leonard Gram
|
22e098b830
|
teams: editors can work with teams.
|
2019-03-19 13:57:22 +01:00 |
|
Hugo Häggmark
|
efbd93f824
|
teams: show teams and plugins for editors that can own
|
2019-03-19 13:57:22 +01:00 |
|
Hugo Häggmark
|
124fb743e8
|
teams: make test cases pass again
|
2019-03-19 13:57:21 +01:00 |
|
Leonard Gram
|
da3dcd1918
|
folder: uses service to make user admin of created folder.
|
2019-03-19 13:57:21 +01:00 |
|
Leonard Gram
|
c8c004095c
|
permissions: broken out func for making creator admin.
|
2019-03-19 13:57:21 +01:00 |
|
Leonard Gram
|
e174f7c20b
|
folders: admin for created folders
|
2019-03-19 13:57:20 +01:00 |
|
Leonard Gram
|
e294252e92
|
dashboards: user automatically becomes admin for created dashboards
|
2019-03-19 13:57:20 +01:00 |
|
ryan
|
bd811b4a95
|
dont test exists in the test... it will fail if not found
|
2019-03-15 12:36:55 -07:00 |
|
ryan
|
24ead3a4a4
|
add random_walk_table scenario
|
2019-03-15 12:33:45 -07:00 |
|
ryan
|
2b5ac6bafa
|
add test file
|
2019-03-15 11:07:20 -07:00 |
|
ryan
|
e787176bca
|
add startAt to random walk scenario
|
2019-03-15 11:02:41 -07:00 |
|
Andrej Ocenas
|
09b9b595b2
|
Add check for Env before log
|
2019-03-15 11:53:30 +01: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
|
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 |
|