38 Commits (e639b220ce73068ee2d8877532dd04cbbd51a150)

Author	SHA1	Message	Date
Arve Knudsen	87c3a2b790	PluginManager: Make Plugins, Renderer and DataSources non-global (#31866) ... * PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Agnès Toulet	22788d1d86	Add an option to hide certain users in the UI (#28942) ... * Add an option to hide certain users in the UI * revert changes for admin users routes * fix sqlstore function name * Improve slice management Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Hidden users: convert slice to map * filter with user logins instead of IDs * put HiddenUsers in Cfg struct * hide hidden users from dashboards/folders permissions list * Update conf/defaults.ini Co-authored-by: Torkel Ödegaard <torkel@grafana.com> * fix params order * fix tests * fix dashboard/folder update with hidden user * add team tests * add dashboard and folder permissions tests * fixes after merge * fix tests * API: add test for org users endpoints * update hidden users management for dashboard / folder permissions * improve dashboard / folder permissions tests * fixes after merge * Guardian: add hidden acl tests * API: add team members tests * fix team sql syntax for postgres * api tests update * fix linter error * fix tests errors after merge Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	5 years ago
Arve Knudsen	b5379c5335	Chore: Fix SQL related Go variable naming (#28887) ... * Chore: Fix variable naming Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Eric Leijonmarck	f05607d4c0	UserTableView: Show user name in table view (#18108) ... * refactor to multiple rows * added name for org user struct * added name getorgusers * added user name to tableview * made test pass * updated userMocks to user name field * added missing UsersTable snapshot * added name on teammembers page, be able to search query for name, login and email * added the updated snapshots * conform to same sorting as output form * conform to previous way of using it * sort first by login and after by email, as it was before	6 years ago
Marcus Efraimsson	8fd153edb7	API: Restrict anonymous user information access (#18422) ... Existing /api/alert-notifications now requires at least editor access. Existing /api/alert-notifiers now requires at least editor access. New /api/alert-notifications/lookup returns less information than /api/alert-notifications and can be access by any authenticated user. Existing /api/org/users now requires org admin role. New /api/org/users/lookup returns less information than /api/org/users and can be access by users that are org admins, admin in any folder or admin of any team. UserPicker component now uses /api/org/users/lookup instead of /api/org/users. Fixes #17318	6 years ago
Alexander Zobnin	3d848d0fdf	Teams: show proper label for each auth provider (#17860) ... * Teams: show proper label for each auth provider Teams: don't sore AuthModule in team_member table, use JOIN to get it instead * Teams: fix AddTeamMember after last changes * Teams: add more auth provider labels * Teams: show external sync badge if LDAP is not enabled * Teams: tests for getting auth module	7 years ago
Hugo Häggmark	53c74fa2f5	teams: refactor so that you can only delete teams if you are team admin	7 years ago
Leonard Gram	9f33f00343	teams: refactor.	7 years ago
Leonard Gram	b796027bc6	teams: refactor.	7 years ago
Hugo Häggmark	6a63725df0	teams: comment explaining input validation ... Co-Authored-By: xlson <leo@xlson.com>	7 years ago
Leonard Gram	c420af16b1	teams: editor/viewer team admin cant remove the last admin.	7 years ago
Hugo Häggmark	246e128048	teams: changed permission to permission type instead of int	7 years ago
Hugo Häggmark	c826f39a8b	teams: defaulting invalid permission level to member permission level	7 years ago
Leonard Gram	c823ad5de7	team: uses PermissionType instead of int64 for permissions.	7 years ago
Leonard Gram	21d3d27452	teams: editors can't remove the last admin from a team.	7 years ago
Leonard Gram	a6a3d698da	teams: cleanup.	7 years ago
Leonard Gram	89d4db8eb6	teams: team listing shows only your teams (editors).	7 years ago
Hugo Häggmark	3c46b786d2	teams: change back to permissionlevel for Member to 0	7 years ago
Hugo Häggmark	3c74ac3044	teams: update only the selected user	7 years ago
Leonard Gram	2a88052c14	teams: can update team members permission.	7 years ago
Hugo Häggmark	7888457aae	teams: basic ui for permission in team members view	7 years ago
Leonard Gram	af4994ba16	teams: editor added as admin for created teams.	7 years ago
Marcus Efraimsson	f845a3b841	upgrade xorm packages to latest versions	7 years ago
Mario Trangoni	e85d0e8d6b	pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID alert.go:193:15⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) alert.go:252:18⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead (SA1019) (megacheck) org.go:136:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org.go:169:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:119:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:221:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) team.go:77:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:243:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:267:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:282:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:313:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:475:3⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:479:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:493:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck)	7 years ago
Mario Trangoni	f73236f8f4	pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:172:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:199:17⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:223:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck)	7 years ago
Marcus Efraimsson	9a6446c2b5	new column for team_member table	7 years ago
Torkel Ödegaard	c03764ff8a	Refactor team pages to react & design change (#12574) ... * Rewriting team pages in react * teams to react progress * teams: getting team by id returns same DTO as search, needed for AvatarUrl * teams: progress on new team pages * fix: team test * listing team members and removing team members now works * teams: team member page now works * ux: fixed adding team member issue * refactoring TeamPicker to conform to react coding styles better * teams: very close to being done with team page rewrite * minor style tweak * ux: polish to team pages * feature: team pages in react & everything working * fix: removed flickering when changing tabs by always rendering PageHeader	8 years ago
Carl Bergquist	861af4cb97	Improve extensions build. (#12461) ... * enable ee build on pr/master * step1: of including group sync * disable commit pinning for now * fixes broken build * enable team to ldap group sync * avoid returning error for missing external handler * services: allow routes to be added before http server start * services: allows services to add their own migrations * moves db migrations to ee code base * build using master branch in ee * disable enterprise build in .bra.toml [skip ci] * removes team sync extensions * removes commented line	8 years ago
Dan Cech	1dfff74da9	move database-specific code into dialects (#11884)	8 years ago
Karsten Weiss	be2d635078	Simplify error returns (gosimple) ... This fixes: pkg/api/avatar/avatar.go:261:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/log/file.go:102:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/metrics/graphitebridge/graphite.go:298:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/provisioning/provisioning.go:23:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:351:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:435:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/stats.go:22:2: 'if err != nil { return err }; return err' can be simplified to 'return err' (S1013) pkg/services/sqlstore/team.go:213:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)	8 years ago
Daniel Lee	b9d572bdec	teams: adds some validation to the API	8 years ago
Marcus Efraimsson	e1e0b5f951	teams: use orgId in all team and team member operations (#10862) ... Also fixes issue in org users tests for postgres	8 years ago
Marcus Efraimsson	af34f9977e	Add avatar to team and team members page (#10305) ... * teams: add db migration for email column in teams table * teams: /teams should render index page with a 200 OK * teams: additional backend functionality for team and team members Possibility to save/update email for teams. Possibility to retrive avatar url when searching for teams. Possibility to retrive avatar url when searching for team members. * teams: display team avatar and team member avatars Possibility to save and update email for a team * teams: create team on separate page instead of modal dialog	8 years ago
bergquist	256f7176a2	teams: add team count when searching for team ... closes #10207	8 years ago
Alexander Zobnin	26281dd9d8	refactor: format files by gofmt	8 years ago
Alexander Zobnin	5d3bfee2f1	refactor: user groups to teams, rename backend files	8 years ago
Alexander Zobnin	d8612380e9	refactor: rename User Groups to Teams	8 years ago
Daniel Lee	01ac3a49bd	dashfolders: fix user group picker + cleanup	9 years ago
Daniel Lee	222a938cdf	WIP: delete dependent permissions on user group delete	9 years ago
Daniel Lee	b4576edc90	WIP: fix after upstream sqlstore refactoring	9 years ago
Daniel Lee	fff7b706d6	WIP: user group additions	9 years ago
Daniel Lee	552935031b	WIP: API methods for add/remove members to user group	9 years ago
Daniel Lee	0a1df0905e	WIP: add update user group command	9 years ago
Daniel Lee	233cd7af4a	WIP: add user group search	9 years ago
Daniel Lee	af67aea2a9	WIP: add usergroup commands and queries	9 years ago