grafana

Commit Graph

Author	SHA1	Message	Date
Kristin Laemmert	2edfbb7767	sqlstore split: dashboard permissions (#49962 ) * backend/sqlstore split: remove unused GetDashboardPermissionsForUser from sqlstore * remove debugging line * backend/sqlstore: move dashboard permission related functions to dashboard service	4 years ago
Kat Yang	50c2b4682a	Chore: Rename integration tests (#49438 ) * Chore: Rename integration tests * Remove one Integration Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
Eric Leijonmarck	cbf71fbd7f	Serviceaccounts: Do not display service accounts assigned to team (#48995 ) * Add IsServiceAccount to query * test for excluding service accounts in query * align test * test update * added logging * should fix tests * moved test to bottom * add back setup function * Remove IsServiceAccount from query Instead use false for is_service_account and when the time comes to implement service accounts for team. we deal with it * missed teamtest * formatting	4 years ago
Ieva	f256f625d8	AccessControl: Enable RBAC by default (#48813 ) * Add RBAC section to settings * Default to RBAC enabled settings to true * Update tests to respect RBAC Co-authored-by: Karl Persson <kalle.persson@grafana.com>	4 years ago
Kat Yang	68478e908a	Chore: Remove x from team (#47905 ) * Chore: Remove x from team * Update pkg/services/sqlstore/team.go Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> * Update pkg/services/sqlstore/team.go Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> * Refactor dialects and add ISAdminOfTeams to Store * Add IsAdminOfTeams to mockstore Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>	4 years ago
Karl Persson	ee9badecdf	Access Control: Add test flag to enable access control (#46780 ) * Add feature flags options to test db	4 years ago
Selene	d5b98772ed	Dashboards: Refactor service to make it injectable by wire (#44588 ) * Add providers to folder and dashboard services * Refactor folder and dashboard services * Move store implementation to its own file due wire cannot allow us to cast to SQLStore * Add store in some places and more missing dependencies * Bad merge fix * Remove old functions from tests and few fixes * Fix provisioning * Remove store from http server and some test fixes * Test fixes * Fix dashboard and folder tests * Fix library tests * Fix provisioning tests * Fix plugins manager tests * Fix alert and org users tests * Refactor service package and more test fixes * Fix dashboard_test tets * Fix api tests * Some lint fixes * Fix lint * More lint :/ * Move dashboard integration tests to dashboards service and fix dependencies * Lint + tests * More integration tests fixes * Lint * Lint again * Fix tests again and again anda again * Update searchstore_test * Fix goimports * More go imports * More imports fixes * Fix lint * Move UnprovisionDashboard function into dashboard service and remove bus * Use search service instead of bus * Fix test * Fix go imports * Use nil in tests	4 years ago
Gabriel MABILLE	78fc0258b1	AccessControl: Implement SQL filters for team members filtering (#44898 ) * AccessControl: Filter team members * Modify GetTeamMembersByUser comment * Fix postgres failing test due to quoting * Rename GetTeamMembersByUser to GetUserTeamMemberships * Update TeamStore interface	4 years ago
Gabriel MABILLE	01b88adb3a	AccessControl: SQL filters for team search (#44557 ) * AccessControl: SQL filters for team search Set test config * Remove userIdFilter when FGAC is on	4 years ago
Gabriel MABILLE	d4f682190f	AccessControl: Implement teams resource service (#43951 ) * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * moving resourceservice to the main wire file pt2 * move team related actions so that they can be reused * PR feedback * fix * typo * Access Control: adding hooks for team member endpoints (#43991) * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * add access control to list and add team member endpoint, and hooks for adding team members * member permission type is 0 * add ID scope for team permission checks * add more team actions, use Member for member permission name * protect team member update endpoint with FGAC permissions * update SQL functions for teams and the corresponding tests * also protect team member removal endpoint with FGAC permissions and add a hook to permission service * a few small fixes, provide team permission service to test setup * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * remove resource services from wireexts * remove unneeded actions * linting fix * remove comments * feedback fixes * feedback * simplifying * remove team member within the same transaction * fix a mistake with the error * call the correct sql fction * linting * Access control: tests for team member endpoints (#44177) * tests for team member endpoints * clean up and fix the tests * fixing tests take 2 * don't import enterprise test license * don't import enterprise test license * remove unused variable Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>	4 years ago
Katarina Yang	92ca38bedf	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files (#43926 ) * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files * Refactor: Change .inTransaction in org.go file * Refactor: Update init() to proper SQLStore handlers * Refactor: Update funcs in tests to be sqlStore methods * Refactor: Update API funcs to receive HTTPServer * Fix: define methods on sqlstore * Adjust GetSignedInUser calls * Refactor: Add sqlStore to Service struct * Chore: Add back black spaces to remove file from PR Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
idafurjes	00c389933b	Chore: Remove bus from team (#44218 ) * Remove bus from team * Fix api team test * Remove bus from team members	4 years ago
idafurjes	5a087d2708	Chore: Add context to team (#40504 ) * Add ctx to team * Remove convey from team	4 years ago
Marcus Efraimsson	518a0d0458	Chore: Propagate context for dashboard guardian (#39201 ) Require guardian.New to take context.Context as first argument. Migrates the GetDashboardAclInfoListQuery to be dispatched using context. Ref #36734 Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: sam boyer <sam.boyer@grafana.com>	4 years ago
Serge Zaitsev	643c7fa0cb	Chore: update all +build statements (#38782 )	4 years ago
Leonard Gram	d51b2630c7	Auth: creates a hook in the user mapping flow (#37190 ) * wip * Auth Info: refactored out into it's own service * Auth: adds extension point where users are being mapped * Update pkg/services/login/authinfoservice/service.go Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> * Update pkg/services/login/authinfoservice/service.go Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> * Auth: simplified code * moved most authinfo stuff to its own package * added back code * linter * simplified Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	4 years ago
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	52c154a221	Backend: Rename variables for style conformance (#29097 ) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Sofia Papagiannaki	4937f0daab	SQLStore: Run tests as integration tests (#28265 ) * sqlstore: Run tests as integration tests * Truncate database instead of re-creating it on each test * Fix test description See https://github.com/grafana/grafana/pull/12129 * Fix lint issues * Fix postgres dialect after review suggestion * Rename and document functions after review suggestion * Add periods * Fix auto-increment value for mysql dialect Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903 ) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	2a78d2a61c	pkg/services: Check errors (#19712 ) * pkg/services: Check errors * pkg/services: Don't treat context.Canceled\|context.DeadlineExceeded as error	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
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	aedc478208	teams: test for update team member.	7 years ago
Leonard Gram	2a88052c14	teams: can update team members permission.	7 years ago
Marcus Efraimsson	9a6446c2b5	new column for team_member table	7 years ago
bergquist	1181e96799	merge create user handlers	8 years ago
Mario Trangoni	6eb00000fe	pkg/services: fix ineffassign issues	8 years ago
Daniel Lee	b9d572bdec	teams: adds some validation to the API	8 years ago
Torkel Ödegaard	fcaa8227a6	Dashboard acl query fixes (#10909 ) * initial fixes for dashboard permission acl list query, fixes #10864 * permissions: refactoring of acl api and query	8 years ago
Torkel Ödegaard	ec6f0f94b8	permissions: refactoring of acl api and query	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
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
Torkel Ödegaard	9c6c8c0f3f	acl fixes	9 years ago
Torkel Ödegaard	fcc8557dbb	dashboard acl work	9 years ago
Torkel Ödegaard	c4a1803060	refactoring more renaming	9 years ago
Torkel Ödegaard	e0b9ba7554	refactoring renaming dashboard folder operations	9 years ago
Torkel Ödegaard	b494fd7689	dashboard folders acl work	9 years ago
Daniel Lee	222a938cdf	WIP: delete dependent permissions on user group delete	9 years ago
Daniel Lee	fff7b706d6	WIP: user group additions	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

39 Commits (2edfbb776793da010a35ec87d09e55763ff84217)