diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 69175808369..a3544cf6938 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -679,10 +679,6 @@ export interface FeatureToggles { */ exploreLogsLimitedTimeRange?: boolean; /** - * Used in Home for users who want to return to the onboarding flow or quickly find popular config pages - */ - homeSetupGuide?: boolean; - /** * Enables the gRPC client to authenticate with the App Platform by using ID & access tokens */ appPlatformGrpcClientAuth?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 7437565e76d..a72ae57b7f6 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1163,13 +1163,6 @@ var ( FrontendOnly: true, Owner: grafanaObservabilityLogsSquad, }, - { - Name: "homeSetupGuide", - Description: "Used in Home for users who want to return to the onboarding flow or quickly find popular config pages", - Stage: FeatureStageExperimental, - FrontendOnly: true, - Owner: growthAndOnboarding, - }, { Name: "appPlatformGrpcClientAuth", Description: "Enables the gRPC client to authenticate with the App Platform by using ID & access tokens", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 5b5dd86153f..9e359fef7f9 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -151,7 +151,6 @@ alertingPrometheusRulesPrimary,experimental,@grafana/alerting-squad,false,false, exploreLogsShardSplitting,experimental,@grafana/observability-logs,false,false,true exploreLogsAggregatedMetrics,experimental,@grafana/observability-logs,false,false,true exploreLogsLimitedTimeRange,experimental,@grafana/observability-logs,false,false,true -homeSetupGuide,experimental,@grafana/growth-and-onboarding,false,false,true appPlatformGrpcClientAuth,experimental,@grafana/identity-access-team,false,false,false groupAttributeSync,privatePreview,@grafana/identity-access-team,false,false,false alertingQueryAndExpressionsStepMode,GA,@grafana/alerting-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 7157f7fa236..7b30101fb72 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -615,10 +615,6 @@ const ( // Used in Logs Drilldown to limit the time range FlagExploreLogsLimitedTimeRange = "exploreLogsLimitedTimeRange" - // FlagHomeSetupGuide - // Used in Home for users who want to return to the onboarding flow or quickly find popular config pages - FlagHomeSetupGuide = "homeSetupGuide" - // FlagAppPlatformGrpcClientAuth // Enables the gRPC client to authenticate with the App Platform by using ID & access tokens FlagAppPlatformGrpcClientAuth = "appPlatformGrpcClientAuth" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index a99defd2459..bcbe952df23 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1517,7 +1517,8 @@ "metadata": { "name": "homeSetupGuide", "resourceVersion": "1743693517832", - "creationTimestamp": "2024-09-25T17:20:04Z" + "creationTimestamp": "2024-09-25T17:20:04Z", + "deletionTimestamp": "2025-05-20T16:08:36Z" }, "spec": { "description": "Used in Home for users who want to return to the onboarding flow or quickly find popular config pages", diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index 8a31154d8fb..5f31b4b7205 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -225,13 +225,13 @@ func (s *ServiceImpl) getHomeNode(c *contextmodel.ReqContext, prefs *pref.Prefer SortWeight: navtree.WeightHome, } ctx := c.Req.Context() - if s.features.IsEnabled(ctx, featuremgmt.FlagHomeSetupGuide) { + if _, exists := s.pluginStore.Plugin(ctx, "grafana-setupguide-app"); exists { var children []*navtree.NavLink // setup guide (a submenu item under Home) children = append(children, &navtree.NavLink{ Id: "home-setup-guide", - Text: "Setup guide", - Url: homeUrl + "/setup-guide", + Text: "Getting started guide", + Url: "/a/grafana-setupguide-app/getting-started", SortWeight: navtree.WeightHome, }) homeNode.Children = children diff --git a/public/app/core/utils/navBarItem-translations.ts b/public/app/core/utils/navBarItem-translations.ts index 6c78e1de1e6..d32ffcc1840 100644 --- a/public/app/core/utils/navBarItem-translations.ts +++ b/public/app/core/utils/navBarItem-translations.ts @@ -12,7 +12,7 @@ export function getNavTitle(navId: string | undefined) { case 'home': return t('nav.home.title', 'Home'); case 'home-setup-guide': - return t('nav.setup-guide.title', 'Setup guide'); + return t('nav.setup-guide.title', 'Getting started guide'); case 'new': return t('nav.new.title', 'New'); case 'create': diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index a23feb9ab67..612002cf70d 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -6866,7 +6866,7 @@ "title": "Service accounts" }, "setup-guide": { - "title": "Setup guide" + "title": "Getting started guide" }, "shared-dashboard": { "subtitle": "Manage your organization's externally shared dashboards",