Configuration: Add an option to hide certain users in the UI #28942

AgnesToulet · 2020-11-09T16:39:16Z

What this PR does / why we need it:
Add an option in the configuration to hide certain users in the UI.
Hidden users are not hidden for themselves and for Grafana admins.

Special notes for your reviewer:
As Grafana admins will continue to see all users, admin routes are not impacted by this change (except for /api/orgs/:orgId/users that uses a helper function shared with non-admin routes - but the behavior will not change)

sakjur

This looks really nice 👍

I left some Go specific feedback. I'll have to spend some more time examining the SQL to see if I can find something there.

pkg/setting/setting.go

pkg/api/dtos/models.go

pkg/api/org_users.go

pkg/api/team_members.go

pkg/api/user.go

pkg/services/sqlstore/user.go

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

torkelo

Looks good!

but there are some issues adding more global variables (something we are trying to stop with), and the extra query to get hidden user ids seems unnecessary

pkg/api/dtos/models.go

pkg/setting/setting.go

pkg/services/sqlstore/team.go

conf/defaults.ini

torkelo

Looks good now, but I will leave @sakjur to leave final ok, as I did not go through the SQL, sounded like he wanted to take a close look at that

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

sakjur

I have one question about the order of params in one of the queries, other than that it looks good

pkg/services/sqlstore/team.go

…grafana into config-hidden-users

sakjur

LGTM, we should add tests for this (but I get that we want this out asap, so we can take that in a separate PR)

AgnesToulet · 2020-11-18T08:16:29Z

I added automated tests and refactored what you suggested, thanks for the feedback! It's ready for a final review.

xlson

Great work on adding tests! Looks good to go. I'm going to test it manually now.

* master: (71 commits) Security: Fixes minor security issue with alert notification webhooks that allowed GET & DELETE requests grafana#29330 Chore: Bump storybook to v6 (grafana#28926) ReleaseNotes: Updates release notes link in package.json (master) (grafana#29329) Docs: Accurately reflecting available variables (grafana#29302) Heatmap: Fixes issue introduced by new eventbus (grafana#29322) Dashboard Schemas (grafana#28793) devenv: Add docker load test which authenticates with API key (grafana#28905) Login: Fixes redirect url encoding issues of # %23 being unencoded after login (grafana#29299) InfluxDB: update flux library and support boolean label values (grafana#29310) Explore/Logs: Update Parsed fields to Detected fields (grafana#28881) GraphNG: Init refactorings and fixes (grafana#29275) fixing a broken relref link (grafana#29312) Drone: Upgrade build pipeline tool (grafana#29308) decreasing frontend docs threshold. (grafana#29304) Docker: update docker root group docs and docker image (grafana#29222) WebhookNotifier: Convert tests away from goconvey (grafana#29291) Annotations: fixing so when changing annotations query links submenu will be updated. (grafana#28990) [graph-ng] add temporal DataFrame alignment/outerJoin & move null-asZero pass inside (grafana#29250) Dashboard: Fixes kiosk state after being redirected to login page and back (grafana#29273) make it possible to hide change password link in profile menu (grafana#29246) ...

* master: Guardian: Rewrite tests from goconvey (grafana#29292) Docs: Fix editor role and alert notification channel description (grafana#29301) Docs: Improve custom Docker image instructions (grafana#29263)

grafanabot · 2020-11-24T11:11:30Z

The backport to v7.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-28942-to-v7.3.x origin/v7.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 22788d1d861094170b993d3f1a659d2a79876826
# Push it to GitHub
git push --set-upstream origin backport-28942-to-v7.3.x
git switch master
# Remove the local backport branch
git branch -D backport-28942-to-v7.3.x

Then, create a pull request where the base branch is v7.3.x and the compare/head branch is backport-28942-to-v7.3.x.

AgnesToulet added 2 commits November 9, 2020 17:24

Add an option to hide certain users in the UI

7bf8601

revert changes for admin users routes

b68cf02

AgnesToulet requested review from xlson and sakjur November 9, 2020 16:39

fix sqlstore function name

affa394

sakjur reviewed Nov 9, 2020

View reviewed changes

AgnesToulet and others added 2 commits November 10, 2020 08:24

Improve slice management

403ba09

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

Hidden users: convert slice to map

dff0bf2

AgnesToulet marked this pull request as ready for review November 10, 2020 07:43

AgnesToulet requested a review from a team as a code owner November 10, 2020 07:43

AgnesToulet requested review from wbrowne, jessabe and marefr and removed request for a team November 10, 2020 07:43

torkelo requested changes Nov 10, 2020

View reviewed changes

pkg/api/dtos/models.go Outdated Show resolved Hide resolved

pkg/setting/setting.go Outdated Show resolved Hide resolved

pkg/services/sqlstore/team.go Outdated Show resolved Hide resolved

AgnesToulet added 2 commits November 10, 2020 10:17

filter with user logins instead of IDs

a247aa7

put HiddenUsers in Cfg struct

22e0faa

AgnesToulet requested a review from torkelo November 10, 2020 09:52

torkelo reviewed Nov 10, 2020

View reviewed changes

conf/defaults.ini Outdated Show resolved Hide resolved

torkelo approved these changes Nov 10, 2020

View reviewed changes

AgnesToulet and others added 2 commits November 10, 2020 11:16

hide hidden users from dashboards/folders permissions list

ec5e6d4

Update conf/defaults.ini

78b3f52

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

sakjur suggested changes Nov 10, 2020

View reviewed changes

AgnesToulet added 2 commits November 10, 2020 11:47

fix params order

11c48d8

Merge branch 'config-hidden-users' of https://github.com/AgnesToulet/…

85766f2

…grafana into config-hidden-users

sakjur approved these changes Nov 10, 2020

View reviewed changes

fix tests

ba41f68

xlson added the old backport v7.3.x Mark PR to be automatically backported to v7.3.x label Nov 10, 2020

xlson added this to the 7.3.2 milestone Nov 10, 2020

Merge branch 'master' into config-hidden-users

69f5f88

AgnesToulet added 6 commits November 17, 2020 18:09

Merge branch 'master' into config-hidden-users

319b968

fixes after merge

6661337

Guardian: add hidden acl tests

b6d7d44

API: add team members tests

674a514

fix team sql syntax for postgres

868ff29

api tests update

7461502

AgnesToulet marked this pull request as ready for review November 18, 2020 08:15

AgnesToulet requested a review from sakjur November 18, 2020 08:16

fix linter error

578647b

torkelo modified the milestones: 7.3.4, 7.3.5 Nov 24, 2020

xlson approved these changes Nov 24, 2020

View reviewed changes

xlson and others added 3 commits November 24, 2020 11:00

fix tests errors after merge

9e91d73

Merge branch 'master' into config-hidden-users

0f05c1a

* master: Guardian: Rewrite tests from goconvey (grafana#29292) Docs: Fix editor role and alert notification channel description (grafana#29301) Docs: Improve custom Docker image instructions (grafana#29263)

xlson modified the milestones: 7.3.5, 7.3.4 Nov 24, 2020

xlson added the old backport v7.3.x Mark PR to be automatically backported to v7.3.x label Nov 24, 2020

xlson merged commit 22788d1 into grafana:master Nov 24, 2020

xlson modified the milestones: 7.3.4, 7.4.0 Nov 24, 2020

xlson removed the old backport v7.3.x Mark PR to be automatically backported to v7.3.x label Nov 24, 2020

mjseaman added this to the 7.4.0 milestone Jan 8, 2021

AgnesToulet added add to changelog and removed add to changelog labels Jan 19, 2021

ivanahuckova changed the title ~~Add an option to hide certain users in the UI~~ Config: Add an option to hide certain users in the UI Jan 20, 2021

ivanahuckova changed the title ~~Config: Add an option to hide certain users in the UI~~ Configuration: Add an option to hide certain users in the UI Jan 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Configuration: Add an option to hide certain users in the UI #28942

Configuration: Add an option to hide certain users in the UI #28942

AgnesToulet commented Nov 9, 2020 •

edited

sakjur left a comment

torkelo left a comment

torkelo left a comment

sakjur left a comment

sakjur left a comment

AgnesToulet commented Nov 18, 2020

xlson left a comment

grafanabot commented Nov 24, 2020

Configuration: Add an option to hide certain users in the UI #28942

Configuration: Add an option to hide certain users in the UI #28942

Conversation

AgnesToulet commented Nov 9, 2020 • edited

sakjur left a comment

Choose a reason for hiding this comment

torkelo left a comment

Choose a reason for hiding this comment

torkelo left a comment

Choose a reason for hiding this comment

sakjur left a comment

Choose a reason for hiding this comment

sakjur left a comment

Choose a reason for hiding this comment

AgnesToulet commented Nov 18, 2020

xlson left a comment

Choose a reason for hiding this comment

grafanabot commented Nov 24, 2020

AgnesToulet commented Nov 9, 2020 •

edited