IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Use notifications:read permission for contact points and policies export (#76954)

Browse Source
This commit is contained in:
Konrad Lalik 2023-10-31 11:51:20 +01:00 committed by GitHub
parent b65aa6afec
commit ba7a8fb75f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/features/alerting/unified/components/receivers/ReceiversTable.test.tsx
View File

@ -183,29 +183,13 @@ describe('ReceiversTable', () => {
const notifiers: NotifierDTO[] = [mockNotifier('googlechat', 'Google Chat'), mockNotifier('sensugo', 'Sensu Go')];
it('should be visible when user has permissions to read provisioning', async () => {
grantUserPermissions([AccessControlAction.AlertingProvisioningRead]);
await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
expect(buttons).toHaveLength(2);
});
it('should be visible when user has permissions to read provisioning with secrets', async () => {
grantUserPermissions([AccessControlAction.AlertingProvisioningReadSecrets]);
await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
expect(buttons).toHaveLength(2);
});
it('should not be visible when user has no provisioning permissions', async () => {
it('should be visible when user has permissions to read notifications', async () => {
grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
await renderReceieversTable(receivers, [], GRAFANA_RULES_SOURCE_NAME);
await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
const buttons = within(screen.getByTestId('dynamic-table')).queryAllByTestId('export');
expect(buttons).toHaveLength(0);
const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
expect(buttons).toHaveLength(2);
});
});
});
@ -232,7 +216,7 @@ describe('ReceiversTable', () => {
const notifiers: NotifierDTO[] = [mockNotifier('googlechat', 'Google Chat'), mockNotifier('sensugo', 'Sensu Go')];
grantUserPermissions([AccessControlAction.AlertingProvisioningRead]);
grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
// Act
await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);

8
public/app/features/alerting/unified/hooks/__snapshots__/useAbilities.test.tsx.snap
View File

@ -153,11 +153,11 @@ exports[`alertmanager abilities should report everything except exporting for Mi
],
"export-contact-point": [
false,
false,
true,
],
"export-notification-policies": [
false,
false,
true,
],
"update-external-configuration": [
true,
@ -254,11 +254,11 @@ exports[`alertmanager abilities should report everything is supported for builti
],
"export-contact-point": [
true,
false,
true,
],
"export-notification-policies": [
true,
false,
true,
],
"update-external-configuration": [
true,

2
public/app/features/alerting/unified/hooks/useAbilities.test.tsx
View File

@ -128,7 +128,7 @@ describe('alertmanager abilities', () => {
expect(abilities.result.current).toHaveLength(3);
expect(abilities.result.current[0]).toStrictEqual([true, true]);
expect(abilities.result.current[1]).toStrictEqual([true, false]);
expect(abilities.result.current[2]).toStrictEqual([true, false]);
expect(abilities.result.current[2]).toStrictEqual([true, true]);
});
});

6
public/app/features/alerting/unified/hooks/useAbilities.ts
View File

@ -131,8 +131,7 @@ export function useAllAlertmanagerAbilities(): Abilities<AlertmanagerAction> {
// only Grafana flavored alertmanager supports exporting
[AlertmanagerAction.ExportContactPoint]: [
isGrafanaFlavoredAlertmanager,
ctx.hasPermission(notificationsPermissions.provisioning.read) ||
ctx.hasPermission(notificationsPermissions.provisioning.readSecrets),
ctx.hasPermission(notificationsPermissions.read),
],
// -- notification templates --
[AlertmanagerAction.CreateNotificationTemplate]: [
@ -167,8 +166,7 @@ export function useAllAlertmanagerAbilities(): Abilities<AlertmanagerAction> {
],
[AlertmanagerAction.ExportNotificationPolicies]: [
isGrafanaFlavoredAlertmanager,
ctx.hasPermission(notificationsPermissions.provisioning.read) ||
ctx.hasPermission(notificationsPermissions.provisioning.readSecrets),
ctx.hasPermission(notificationsPermissions.read),
],
[AlertmanagerAction.DecryptSecrets]: [
isGrafanaFlavoredAlertmanager,

3
public/app/features/alerting/unified/utils/access-control.ts
View File

@ -124,9 +124,6 @@ export function getRulesAccess() {
canEditRules: (rulesSourceName: string) => {
return contextSrv.hasPermission(getRulesPermissions(rulesSourceName).update);
},
canReadProvisioning:
contextSrv.hasPermission(provisioningPermissions.read) ||
contextSrv.hasPermission(provisioningPermissions.readSecrets),
};
}