IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

RBAC: add a feature toggle for annotation permission changes (#77432)

Browse Source 
add a feature toggle for annotation permission changes
This commit is contained in:
Ieva
2023-10-31 13:30:13 +00:00
committed by GitHub
parent 9c47161c14
commit c51c51458e
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
View File

@@ -159,6 +159,7 @@ Experimental features might be changed or removed without prior notice.
| `alertmanagerRemoteSecondary` | Enable Grafana to sync configuration and state with a remote Alertmanager. | | `alertmanagerRemoteSecondary` | Enable Grafana to sync configuration and state with a remote Alertmanager. |
| `alertmanagerRemotePrimary` | Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager. | | `alertmanagerRemotePrimary` | Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager. |
| `alertmanagerRemoteOnly` | Disable the internal Alertmanager and only use the external one defined. | | `alertmanagerRemoteOnly` | Disable the internal Alertmanager and only use the external one defined. |
| `annotationPermissionUpdate` | Separate annotation permissions from dashboard permissions to allow for more granular control. |
## Development feature toggles ## Development feature toggles

1
packages/grafana-data/src/types/featureToggles.gen.ts
View File

@@ -153,4 +153,5 @@ export interface FeatureToggles {
alertmanagerRemoteSecondary?: boolean; alertmanagerRemoteSecondary?: boolean;
alertmanagerRemotePrimary?: boolean; alertmanagerRemotePrimary?: boolean;
alertmanagerRemoteOnly?: boolean; alertmanagerRemoteOnly?: boolean;
annotationPermissionUpdate?: boolean;
} }

7
pkg/services/featuremgmt/registry.go
View File

@@ -945,5 +945,12 @@ var (
Stage: FeatureStageExperimental, Stage: FeatureStageExperimental,
Owner: grafanaAlertingSquad, Owner: grafanaAlertingSquad,
}, },
{
Name: "annotationPermissionUpdate",
Description: "Separate annotation permissions from dashboard permissions to allow for more granular control.",
Stage: FeatureStageExperimental,
RequiresDevMode: false,
Owner: grafanaAuthnzSquad,
},
} }
) )

1
pkg/services/featuremgmt/toggles_gen.csv
View File

@@ -134,3 +134,4 @@ prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,false
alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false,false alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false,false
alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false,false alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false,false
alertmanagerRemoteOnly,experimental,@grafana/alerting-squad,false,false,false,false alertmanagerRemoteOnly,experimental,@grafana/alerting-squad,false,false,false,false
annotationPermissionUpdate,experimental,@grafana/grafana-authnz-team,false,false,false,false
1 Name Stage Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
134 alertmanagerRemoteSecondary experimental @grafana/alerting-squad false false false false
135 alertmanagerRemotePrimary experimental @grafana/alerting-squad false false false false
136 alertmanagerRemoteOnly experimental @grafana/alerting-squad false false false false
137 annotationPermissionUpdate experimental @grafana/grafana-authnz-team false false false false

4
pkg/services/featuremgmt/toggles_gen.go
View File

@@ -546,4 +546,8 @@ const (
// FlagAlertmanagerRemoteOnly // FlagAlertmanagerRemoteOnly
// Disable the internal Alertmanager and only use the external one defined. // Disable the internal Alertmanager and only use the external one defined.
FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly" FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly"
// FlagAnnotationPermissionUpdate
// Separate annotation permissions from dashboard permissions to allow for more granular control.
FlagAnnotationPermissionUpdate = "annotationPermissionUpdate"
) )