diff --git a/conf/defaults.ini b/conf/defaults.ini index e2e58ed8445..cbe9b4d6878 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1253,18 +1253,6 @@ license_path = # enable = feature1,feature2 enable = -# The new prometheus visual query builder -promQueryBuilder = true - -# Experimental Explore to Dashboard workflow -explore2Dashboard = true - -# Command Palette -commandPalette = true - -# Use dynamic labels in CloudWatch datasource -cloudWatchDynamicLabels = true - # feature1 = true # feature2 = false diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index b5aa97e742a..f6c943a949d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -17,6 +17,7 @@ export interface FeatureToggles { [name: string]: boolean | undefined; // support any string value alertingBigTransactions?: boolean; + promQueryBuilder?: boolean; trimDefaults?: boolean; disableEnvelopeEncryption?: boolean; database_metrics?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a100ba302dc..f9220629234 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -14,6 +14,13 @@ var ( Description: "Use big transactions for alerting database writes", State: FeatureStateAlpha, }, + { + Name: "promQueryBuilder", + Description: "Show prometheus query builder", + State: FeatureStateStable, + Expression: "true", // on by default + FrontendOnly: true, + }, { Name: "trimDefaults", Description: "Use cue schema to remove values that will be applied automatically", @@ -162,7 +169,8 @@ var ( { Name: "explore2Dashboard", Description: "Experimental Explore to Dashboard workflow", - State: FeatureStateBeta, + State: FeatureStateStable, + Expression: "true", // enabled by default FrontendOnly: true, }, { @@ -178,9 +186,11 @@ var ( FrontendOnly: true, }, { - Name: "commandPalette", - Description: "Enable command palette", - State: FeatureStateAlpha, + Name: "commandPalette", + Description: "Enable command palette", + State: FeatureStateStable, + Expression: "true", // enabled by default + FrontendOnly: true, }, { Name: "correlations", @@ -191,6 +201,7 @@ var ( Name: "cloudWatchDynamicLabels", Description: "Use dynamic labels instead of alias patterns in CloudWatch datasource", State: FeatureStateStable, + Expression: "true", // enabled by default }, { Name: "datasourceQueryMultiStatus", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index b61653916a8..44193087731 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -11,6 +11,10 @@ const ( // Use big transactions for alerting database writes FlagAlertingBigTransactions = "alertingBigTransactions" + // FlagPromQueryBuilder + // Show prometheus query builder + FlagPromQueryBuilder = "promQueryBuilder" + // FlagTrimDefaults // Use cue schema to remove values that will be applied automatically FlagTrimDefaults = "trimDefaults"