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: Enable annotation permission update by default (#84787)

Browse Source 
* display teams to team reader if they also have the access to list team permissions

* fix a typo in the docs

* enable annotationPermissionUpdate by default

* update wording
This commit is contained in:
Ieva
2024-03-21 23:45:23 +01:00
committed by GitHub
parent 15122bc71c
commit 9772ed6526
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ Some features are enabled by default. You can disable these feature by setting t
| `recoveryThreshold` | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression | Yes |
| `lokiStructuredMetadata` | Enables the loki data source to request structured metadata from the Loki server | Yes |
| `managedPluginsInstall` | Install managed plugins directly from plugins catalog | Yes |
| `annotationPermissionUpdate` | Change the way annotation permissions work by scoping them to folders and dashboards. | Yes |
| `logRowsPopoverMenu` | Enable filtering menu displayed when text of a log line is selected | Yes |
| `lokiQueryHints` | Enables query hints for Loki | Yes |
| `alertingQueryOptimization` | Optimizes eligible queries in order to reduce load on datasources | |
@@ -153,7 +154,6 @@ 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. |
| `extractFieldsNameDeduplication` | Make sure extracted field names are unique in the dataframe |
| `dashboardSceneForViewers` | Enables dashboard rendering using Scenes for viewer roles |
| `dashboardSceneSolo` | Enables rendering dashboards using scenes for solo panels |

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

@@ -885,9 +885,10 @@ var (
},
{
Name: "annotationPermissionUpdate",
Description: "Separate annotation permissions from dashboard permissions to allow for more granular control.",
Stage: FeatureStageExperimental,
Description: "Change the way annotation permissions work by scoping them to folders and dashboards.",
Stage: FeatureStageGeneralAvailability,
RequiresDevMode: false,
Expression: "true", // enabled by default
Owner: identityAccessTeam,
},
{

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

@@ -118,7 +118,7 @@ addFieldFromCalculationStatFunctions,preview,@grafana/dataviz-squad,false,false,
alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false
alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false
alertmanagerRemoteOnly,experimental,@grafana/alerting-squad,false,false,false
annotationPermissionUpdate,experimental,@grafana/identity-access-team,false,false,false
annotationPermissionUpdate,GA,@grafana/identity-access-team,false,false,false
extractFieldsNameDeduplication,experimental,@grafana/dataviz-squad,false,false,true
dashboardSceneForViewers,experimental,@grafana/dashboards-squad,false,false,true
dashboardSceneSolo,experimental,@grafana/dashboards-squad,false,false,true
1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
118 alertmanagerRemoteSecondary experimental @grafana/alerting-squad false false false
119 alertmanagerRemotePrimary experimental @grafana/alerting-squad false false false
120 alertmanagerRemoteOnly experimental @grafana/alerting-squad false false false
121 annotationPermissionUpdate experimental GA @grafana/identity-access-team false false false
122 extractFieldsNameDeduplication experimental @grafana/dataviz-squad false false true
123 dashboardSceneForViewers experimental @grafana/dashboards-squad false false true
124 dashboardSceneSolo experimental @grafana/dashboards-squad false false true

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

@@ -484,7 +484,7 @@ const (
FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly"
// FlagAnnotationPermissionUpdate
// Separate annotation permissions from dashboard permissions to allow for more granular control.
// Change the way annotation permissions work by scoping them to folders and dashboards.
FlagAnnotationPermissionUpdate = "annotationPermissionUpdate"
// FlagExtractFieldsNameDeduplication

11
pkg/services/featuremgmt/toggles_gen.json
View File

@@ -780,12 +780,15 @@
{
"metadata": {
"name": "annotationPermissionUpdate",
"resourceVersion": "1709648236447",
"creationTimestamp": "2024-03-05T14:17:16Z"
"resourceVersion": "1710885868422",
"creationTimestamp": "2024-03-05T14:17:16Z",
"annotations": {
"grafana.app/updatedTimestamp": "2024-03-19 22:04:28.422555 +0000 UTC"
}
},
"spec": {
"description": "Separate annotation permissions from dashboard permissions to allow for more granular control.",
"stage": "experimental",
"description": "Change the way annotation permissions work by scoping them to folders and dashboards.",
"stage": "GA",
"codeowner": "@grafana/identity-access-team"
}
},