diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index e8d2d256cc6..461521bb069 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -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. | | `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. | +| `annotationPermissionUpdate` | Separate annotation permissions from dashboard permissions to allow for more granular control. | ## Development feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 5930e99f6e7..16ffae92325 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -153,4 +153,5 @@ export interface FeatureToggles { alertmanagerRemoteSecondary?: boolean; alertmanagerRemotePrimary?: boolean; alertmanagerRemoteOnly?: boolean; + annotationPermissionUpdate?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index bc208d5803c..be7fbdf1bbe 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -945,5 +945,12 @@ var ( Stage: FeatureStageExperimental, Owner: grafanaAlertingSquad, }, + { + Name: "annotationPermissionUpdate", + Description: "Separate annotation permissions from dashboard permissions to allow for more granular control.", + Stage: FeatureStageExperimental, + RequiresDevMode: false, + Owner: grafanaAuthnzSquad, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index baefe3d59f7..b12ba83ea18 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -134,3 +134,4 @@ prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,false alertmanagerRemoteSecondary,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 +annotationPermissionUpdate,experimental,@grafana/grafana-authnz-team,false,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index be75b703819..621f20d1046 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -546,4 +546,8 @@ const ( // FlagAlertmanagerRemoteOnly // Disable the internal Alertmanager and only use the external one defined. FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly" + + // FlagAnnotationPermissionUpdate + // Separate annotation permissions from dashboard permissions to allow for more granular control. + FlagAnnotationPermissionUpdate = "annotationPermissionUpdate" )