From aa26cc42546afcb15597c779a83b535ef4d93fc3 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Mon, 17 Nov 2025 11:32:16 +0000 Subject: [PATCH] FS: Preserve buildInfo.edition from backend (#113967) --- pkg/services/frontend/index.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/services/frontend/index.html b/pkg/services/frontend/index.html index c8ba00870b9..688222f6577 100644 --- a/pkg/services/frontend/index.html +++ b/pkg/services/frontend/index.html @@ -288,16 +288,21 @@ user: [[.DefaultUser]], } - // tenant-specific config - // TODO split this into separate API calls + // Preserve a mix of values from the initial boot data, and from the backend + // - nav tree and user info come from the backend + // - merge settings from both. FS settings contains less values + // - build info edition comes from the backend const { navTree, settings, user } = await loadBootData(); window.grafanaBootData.settings = { ...settings, - ...window.grafanaBootData.settings, // preserve frontend-service settings + ...window.grafanaBootData.settings, } window.grafanaBootData.navTree = navTree; window.grafanaBootData.user = user; + if (settings?.buildInfo?.edition) { + window.grafanaBootData.settings.buildInfo.edition = settings.buildInfo.edition; + } // The per-theme CSS still contains some global styles needed // to render the page correctly.