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 cb89be7135e..d66777eb8ce 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -115,7 +115,6 @@ Experimental features might be changed or removed without prior notice. | `storage` | Configurable storage for dashboards, datasources, and resources | | `datasourceQueryMultiStatus` | Introduce HTTP 207 Multi Status for api/ds/query | | `canvasPanelNesting` | Allow elements nesting | -| `scenes` | Experimental framework to build interactive dashboards | | `disableSecretsCompatibility` | Disable duplicated secret storage in legacy tables | | `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown | | `unifiedStorage` | SQL-based k8s storage | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index c7604419577..30fd6997a52 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -39,7 +39,6 @@ export interface FeatureToggles { autoMigrateXYChartPanel?: boolean; disableAngular?: boolean; canvasPanelNesting?: boolean; - scenes?: boolean; disableSecretsCompatibility?: boolean; logRequestsInstrumentedAsUnknown?: boolean; topnav?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 1e9bde2a67d..68c11c6def8 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -170,13 +170,6 @@ var ( Owner: grafanaDatavizSquad, HideFromAdminPage: true, }, - { - Name: "scenes", - Description: "Experimental framework to build interactive dashboards", - Stage: FeatureStageExperimental, - FrontendOnly: true, - Owner: grafanaDashboardsSquad, - }, { Name: "disableSecretsCompatibility", Description: "Disable duplicated secret storage in legacy tables", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 737cf020a6f..c3fb9ac3a46 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -20,7 +20,6 @@ autoMigrateStatPanel,preview,@grafana/dataviz-squad,false,false,true autoMigrateXYChartPanel,preview,@grafana/dataviz-squad,false,false,true disableAngular,preview,@grafana/dataviz-squad,false,false,true canvasPanelNesting,experimental,@grafana/dataviz-squad,false,false,true -scenes,experimental,@grafana/dashboards-squad,false,false,true disableSecretsCompatibility,experimental,@grafana/hosted-grafana-team,false,true,false logRequestsInstrumentedAsUnknown,experimental,@grafana/hosted-grafana-team,false,false,false topnav,deprecated,@grafana/grafana-frontend-platform,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 97679d3ca76..3891a5c1441 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -91,10 +91,6 @@ const ( // Allow elements nesting FlagCanvasPanelNesting = "canvasPanelNesting" - // FlagScenes - // Experimental framework to build interactive dashboards - FlagScenes = "scenes" - // FlagDisableSecretsCompatibility // Disable duplicated secret storage in legacy tables FlagDisableSecretsCompatibility = "disableSecretsCompatibility" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6afe36b7a5f..f9f6320eae2 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2098,7 +2098,8 @@ "metadata": { "name": "scenes", "resourceVersion": "1718727528075", - "creationTimestamp": "2022-07-07T06:53:02Z" + "creationTimestamp": "2022-07-07T06:53:02Z", + "deletionTimestamp": "2024-06-26T11:58:18Z" }, "spec": { "description": "Experimental framework to build interactive dashboards", diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx index 2e0c1122221..04415bdeb94 100644 --- a/public/app/features/dashboard/components/DashNav/DashNav.tsx +++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx @@ -185,6 +185,8 @@ export const DashNav = memo((props) => { }; const renderLeftActions = () => { + const isDevEnv = config.buildInfo.env === 'development'; + const { dashboard, kioskMode } = props; const { canStar, isStarred } = dashboard.meta; const buttons: ReactNode[] = []; @@ -222,7 +224,7 @@ export const DashNav = memo((props) => { ); } - if (config.featureToggles.scenes) { + if (isDevEnv && config.featureToggles.dashboardScene) { buttons.push(