[RAM] [Rule Form v2] Add feature flag

src/plugins/discover/common/config.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  enableUiSettingsValidations: schema.boolean({ defaultValue: false }),
+  experimental: schema.maybe(
+    schema.object({
+      ruleFormV2Enabled: schema.maybe(schema.boolean({ defaultValue: false })),
+    })
+  ),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
+export type ExperimentalFeatures = ConfigSchema['experimental'];

src/plugins/discover/public/customizations/types.ts

@@ -57,4 +57,8 @@ export interface DiscoverCustomizationContext {
      */
     showLogsExplorerTabs: boolean;
   };
+  /*
+   * Whether or not to use the in-development Rule Form V2
+   */
+  ruleFormV2Enabled: boolean;
 }

src/plugins/discover/public/plugin.tsx

@@ -78,6 +78,7 @@ import {
 } from './components/discover_container';
 import { getESQLSearchProvider } from './global_search/search_provider';
 import { HistoryService } from './history_service';
+import { ConfigSchema, ExperimentalFeatures } from '../common/config';
 
 /**
  * @public
@@ -207,7 +208,10 @@ export interface DiscoverStartPlugins {
 export class DiscoverPlugin
   implements Plugin<DiscoverSetup, DiscoverStart, DiscoverSetupPlugins, DiscoverStartPlugins>
 {
-  constructor(private readonly initializerContext: PluginInitializerContext) {}
+  constructor(private readonly initializerContext: PluginInitializerContext<ConfigSchema>) {
+    this.experimentalFeatures =
+      initializerContext.config.get().experimental ?? this.experimentalFeatures;
+  }
 
   private appStateUpdater = new BehaviorSubject<AppUpdater>(() => ({}));
   private historyService = new HistoryService();
@@ -222,6 +226,9 @@ export class DiscoverPlugin
     enabled: false,
     showLogsExplorerTabs: false,
   };
+  private experimentalFeatures: ExperimentalFeatures = {
+    ruleFormV2Enabled: false,
+  };
 
   setup(
     core: CoreSetup<DiscoverStartPlugins, DiscoverStart>,
@@ -354,6 +361,7 @@ export class DiscoverPlugin
           customizationContext: {
             displayMode: 'standalone',
             inlineTopNav: this.inlineTopNav,
+            ruleFormV2Enabled: this.experimentalFeatures?.ruleFormV2Enabled ?? false,
           },
         });
 

src/plugins/discover/server/config.ts

@@ -6,15 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core-plugins-server';
-
-const configSchema = schema.object({
-  enableUiSettingsValidations: schema.boolean({ defaultValue: false }),
-});
-
-export type ConfigSchema = TypeOf<typeof configSchema>;
+import { configSchema, type ConfigSchema } from '../common/config';
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
   schema: configSchema,
+  exposeToBrowser: {
+    experimental: true,
+  },
 };

x-pack/plugins/ml/common/constants/app.ts

@@ -19,12 +19,16 @@ export const ML_EXTERNAL_BASE_PATH = '/api/ml';
 
 export type MlFeatures = Record<'ad' | 'dfa' | 'nlp', boolean>;
 export type CompatibleModule = 'security' | 'observability' | 'search';
+export type ExperimentalFeatures = Record<'ruleFormV2', boolean>;
 
 export interface ConfigSchema {
   ad?: { enabled: boolean };
   dfa?: { enabled: boolean };
   nlp?: { enabled: boolean };
   compatibleModuleType?: CompatibleModule;
+  experimental?: {
+    ruleFormV2?: { enabled: boolean };
+  };
 }
 
 export function initEnabledFeatures(enabledFeatures: MlFeatures, config: ConfigSchema) {
@@ -38,3 +42,12 @@ export function initEnabledFeatures(enabledFeatures: MlFeatures, config: ConfigS
     enabledFeatures.nlp = config.nlp.enabled;
   }
 }
+
+export function initExperimentalFeatures(
+  experimentalFeatures: ExperimentalFeatures,
+  config: ConfigSchema
+) {
+  if (config.experimental?.ruleFormV2?.enabled !== undefined) {
+    experimentalFeatures.ruleFormV2 = config.experimental.ruleFormV2.enabled;
+  }
+}

x-pack/plugins/ml/public/application/app.tsx

@@ -20,7 +20,7 @@ import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-pl
 import { StorageContextProvider } from '@kbn/ml-local-storage';
 import useLifecycles from 'react-use/lib/useLifecycles';
 import useObservable from 'react-use/lib/useObservable';
-import type { MlFeatures } from '../../common/constants/app';
+import type { ExperimentalFeatures, MlFeatures } from '../../common/constants/app';
 import { MlLicense } from '../../common/license';
 import { MlCapabilitiesService } from './capabilities/check_capabilities';
 import { ML_STORAGE_KEYS } from '../../common/types/storage';
@@ -49,6 +49,7 @@ interface AppProps {
   appMountParams: AppMountParameters;
   isServerless: boolean;
   mlFeatures: MlFeatures;
+  experimentalFeatures: ExperimentalFeatures;
 }
 
 const localStorage = new Storage(window.localStorage);
@@ -91,7 +92,14 @@ export interface MlServicesContext {
 
 export type MlGlobalServices = ReturnType<typeof getMlGlobalServices>;
 
-const App: FC<AppProps> = ({ coreStart, deps, appMountParams, isServerless, mlFeatures }) => {
+const App: FC<AppProps> = ({
+  coreStart,
+  deps,
+  appMountParams,
+  isServerless,
+  mlFeatures,
+  experimentalFeatures,
+}) => {
   const pageDeps: PageDependencies = {
     history: appMountParams.history,
     setHeaderActionMenu: appMountParams.setHeaderActionMenu,
@@ -171,6 +179,7 @@ const App: FC<AppProps> = ({ coreStart, deps, appMountParams, isServerless, mlFe
                   isServerless={isServerless}
                   mlFeatures={mlFeatures}
                   showMLNavMenu={chromeStyle === 'classic'}
+                  experimentalFeatures={experimentalFeatures}
                 >
                   <MlRouter pageDeps={pageDeps} />
                 </EnabledFeaturesContextProvider>
@@ -188,7 +197,8 @@ export const renderApp = (
   deps: MlDependencies,
   appMountParams: AppMountParameters,
   isServerless: boolean,
-  mlFeatures: MlFeatures
+  mlFeatures: MlFeatures,
+  experimentalFeatures: ExperimentalFeatures
 ) => {
   setDependencyCache({
     timefilter: deps.data.query.timefilter,
@@ -211,6 +221,7 @@ export const renderApp = (
       appMountParams={appMountParams}
       isServerless={isServerless}
       mlFeatures={mlFeatures}
+      experimentalFeatures={experimentalFeatures}
     />,
     appMountParams.element
   );

x-pack/plugins/ml/public/application/contexts/ml/serverless_context.tsx

@@ -7,7 +7,7 @@
 
 import type { FC } from 'react';
 import React, { createContext, useContext, useMemo } from 'react';
-import type { MlFeatures } from '../../../../common/constants/app';
+import type { ExperimentalFeatures, MlFeatures } from '../../../../common/constants/app';
 
 export interface EnabledFeatures {
   showNodeInfo: boolean;
@@ -16,6 +16,7 @@ export interface EnabledFeatures {
   isADEnabled: boolean;
   isDFAEnabled: boolean;
   isNLPEnabled: boolean;
+  showRuleFormV2: boolean;
 }
 export const EnabledFeaturesContext = createContext({
   showNodeInfo: true,
@@ -30,13 +31,15 @@ interface Props {
   isServerless: boolean;
   mlFeatures: MlFeatures;
   showMLNavMenu?: boolean;
+  experimentalFeatures: ExperimentalFeatures;
 }
 
 export const EnabledFeaturesContextProvider: FC<Props> = ({
   children,
   isServerless,
   showMLNavMenu = true,
   mlFeatures,
+  experimentalFeatures,
 }) => {
   const features: EnabledFeatures = {
     showNodeInfo: !isServerless,
@@ -45,6 +48,7 @@ export const EnabledFeaturesContextProvider: FC<Props> = ({
     isADEnabled: mlFeatures.ad,
     isDFAEnabled: mlFeatures.dfa,
     isNLPEnabled: mlFeatures.nlp,
+    showRuleFormV2: experimentalFeatures.ruleFormV2,
   };
 
   return (

x-pack/plugins/ml/public/plugin.ts

@@ -65,6 +65,8 @@ import {
   PLUGIN_ICON_SOLUTION,
   PLUGIN_ID,
   type ConfigSchema,
+  type ExperimentalFeatures,
+  initExperimentalFeatures,
 } from '../common/constants/app';
 import type { MlCapabilities } from './shared';
 import type { ElasticModels } from './application/services/elastic_models_service';
@@ -127,10 +129,14 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
     dfa: true,
     nlp: true,
   };
+  private experimentalFeatures: ExperimentalFeatures = {
+    ruleFormV2: false,
+  };
 
   constructor(private initializerContext: PluginInitializerContext<ConfigSchema>) {
     this.isServerless = initializerContext.env.packageInfo.buildFlavor === 'serverless';
     initEnabledFeatures(this.enabledFeatures, initializerContext.config.get());
+    initExperimentalFeatures(this.experimentalFeatures, initializerContext.config.get());
   }
 
   setup(
@@ -183,7 +189,8 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
           },
           params,
           this.isServerless,
-          this.enabledFeatures
+          this.enabledFeatures,
+          this.experimentalFeatures
         );
       },
     });

x-pack/plugins/ml/server/config_schema.ts

@@ -25,4 +25,9 @@ export const configSchema = schema.object({
   dfa: enabledSchema,
   nlp: enabledSchema,
   compatibleModuleType: compatibleModuleTypeSchema,
+  experimental: schema.maybe(
+    schema.object({
+      ruleFormV2: enabledSchema,
+    })
+  ),
 });

x-pack/plugins/ml/server/index.ts

@@ -34,6 +34,7 @@ export const config: PluginConfigDescriptor<ConfigSchema> = {
     ad: true,
     dfa: true,
     nlp: true,
+    experimental: true,
   },
 };
 

x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts

@@ -35,6 +35,7 @@ export interface InfraConfig {
     logThresholdAlertRuleEnabled: boolean;
     alertsAndRulesDropdownEnabled: boolean;
     profilingEnabled: boolean;
+    ruleFormV2Enabled: boolean;
   };
 }
 

x-pack/plugins/observability_solution/infra/server/plugin.ts

@@ -122,6 +122,7 @@ export const config: PluginConfigDescriptor<InfraConfig> = {
        * enabling this feature flag.
        */
       profilingEnabled: schema.boolean({ defaultValue: false }),
+      ruleFormV2Enabled: schema.boolean({ defaultValue: false }),
     }),
   }),
   exposeToBrowser: publicConfigKeys,

x-pack/plugins/observability_solution/uptime/common/config.ts

@@ -11,10 +11,19 @@ import { schema, TypeOf } from '@kbn/config-schema';
 const uptimeConfig = schema.object({
   index: schema.maybe(schema.string()),
   enabled: schema.boolean({ defaultValue: true }),
+  experimental: schema.maybe(
+    schema.object({
+      ruleFormV2Enabled: schema.maybe(schema.boolean({ defaultValue: false })),
+    })
+  ),
 });
 
 export const config: PluginConfigDescriptor = {
   schema: uptimeConfig,
+  exposeToBrowser: {
+    experimental: true,
+  },
 };
 
 export type UptimeConfig = TypeOf<typeof uptimeConfig>;
+export type ExperimentalFeatures = UptimeConfig['experimental'];

x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/render_app.tsx

@@ -11,6 +11,7 @@ import { i18n as i18nFormatter } from '@kbn/i18n';
 import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { getIntegratedAppAvailability } from '../lib/adapters/framework/capabilities_adapter';
 import { DEFAULT_TIMEPICKER_QUICK_RANGES, INTEGRATED_SOLUTIONS } from '../../../common/constants';
+import type { ExperimentalFeatures } from '../../../common/config';
 import { UptimeApp, UptimeAppProps } from './uptime_app';
 import { ClientPluginsSetup, ClientPluginsStart } from '../../plugin';
 
@@ -19,7 +20,8 @@ export function renderApp(
   plugins: ClientPluginsSetup,
   startPlugins: ClientPluginsStart,
   appMountParameters: AppMountParameters,
-  isDev: boolean
+  isDev: boolean,
+  experimentalFeatures: ExperimentalFeatures
 ) {
   const {
     application: { capabilities },

x-pack/plugins/observability_solution/uptime/public/plugin.ts

@@ -56,6 +56,7 @@ import {
   ObservabilityAIAssistantPublicSetup,
 } from '@kbn/observability-ai-assistant-plugin/public';
 import { PLUGIN } from '../common/constants/plugin';
+import { UptimeConfig } from '../common/config';
 import {
   LazySyntheticsPolicyCreateExtension,
   LazySyntheticsPolicyEditExtension,
@@ -119,9 +120,15 @@ export type ClientStart = void;
 export class UptimePlugin
   implements Plugin<ClientSetup, ClientStart, ClientPluginsSetup, ClientPluginsStart>
 {
-  constructor(private readonly initContext: PluginInitializerContext) {}
+  constructor(private readonly initContext: PluginInitializerContext<UptimeConfig>) {
+    this.experimentalFeatures =
+      this.initContext.config.get().experimental || this.experimentalFeatures;
+  }
 
   private uptimeAppUpdater = new BehaviorSubject<AppUpdater>(() => ({}));
+  private experimentalFeatures: UptimeConfig['experimental'] = {
+    ruleFormV2Enabled: false,
+  };
 
   public setup(core: CoreSetup<ClientPluginsStart, unknown>, plugins: ClientPluginsSetup): void {
     if (plugins.home) {
@@ -202,7 +209,14 @@ export class UptimePlugin
       mount: async (params: AppMountParameters) => {
         const [coreStart, corePlugins] = await core.getStartServices();
         const { renderApp } = await import('./legacy_uptime/app/render_app');
-        return renderApp(coreStart, plugins, corePlugins, params, this.initContext.env.mode.dev);
+        return renderApp(
+          coreStart,
+          plugins,
+          corePlugins,
+          params,
+          this.initContext.env.mode.dev,
+          this.experimentalFeatures
+        );
       },
       updater$: this.uptimeAppUpdater,
     });

x-pack/plugins/transform/common/config.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TypeOf } from '@kbn/config-schema';
+import { schema } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  experimental: schema.maybe(
+    schema.object({
+      ruleFormV2Enabled: schema.maybe(schema.boolean()),
+    })
+  ),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
+export type ExperimentalFeatures = ConfigSchema['experimental'];