diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts index 8231bb4c252..0c49f3249bc 100644 --- a/packages/grafana-data/src/types/config.ts +++ b/packages/grafana-data/src/types/config.ts @@ -42,6 +42,7 @@ export interface LicenseInfo { stateInfo: string; edition: GrafanaEdition; enabledFeatures: { [key: string]: boolean }; + trialExpiry?: number; } /** diff --git a/public/app/features/admin/utils.ts b/public/app/features/admin/utils.ts index eea09437aa5..f4bdf531730 100644 --- a/public/app/features/admin/utils.ts +++ b/public/app/features/admin/utils.ts @@ -1,8 +1,8 @@ import { config } from '@grafana/runtime/src'; export function isTrial() { - const settings = (config as any).licensing; - return settings?.isTrial; + const expiry = config.licenseInfo?.trialExpiry; + return !!(expiry && expiry > 0); } export const highlightTrial = () => isTrial() && config.featureToggles.featureHighlights;