use esql settings config

x-pack/plugins/security_solution/common/experimental_features.ts

@@ -103,12 +103,6 @@ export const allowedExperimentalValues = Object.freeze({
    * Enables experimental Entity Analytics HTTP endpoints
    */
   riskScoringRoutesEnabled: true,
-  /*
-   *
-   * Enables Discover embedded within timeline
-   *
-   * */
-  discoverInTimeline: true,
 
   /**
    * disables ES|QL rules

x-pack/plugins/security_solution/public/timelines/components/timeline/esql_tab_content/customizations/use_search_bar_customizations.tsx

@@ -6,18 +6,16 @@
  */
 
 import type { CustomizationCallback } from '@kbn/discover-plugin/public';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { useGetStatefulQueryBar } from '../use_get_stateful_query_bar';
 
 export const useSearchBarCustomizations = () => {
   const { CustomStatefulTopNavKqlQueryBar } = useGetStatefulQueryBar();
-  const isDiscoverInTimelineEnabled = useIsExperimentalFeatureEnabled('discoverInTimeline');
 
   const setSearchBarCustomizations: CustomizationCallback = ({ customizations }) => {
     customizations.set({
       id: 'search_bar',
       CustomSearchBar: CustomStatefulTopNavKqlQueryBar,
-      hideDataViewPicker: isDiscoverInTimelineEnabled,
+      hideDataViewPicker: true,
     });
   };
 

x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx

@@ -15,6 +15,7 @@ import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '../../../../common/lib/kibana';
 import { useAssistantTelemetry } from '../../../../assistant/use_assistant_telemetry';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { useConversationStore } from '../../../../assistant/use_conversation_store';
@@ -133,7 +134,7 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
     setConversationId,
     showTimeline,
   }) => {
-    const isEsqlInTimelineEnabled = useIsExperimentalFeatureEnabled('discoverInTimeline');
+    const isEsqlSettingEnabled = useKibana().services.configSettings.ESQLEnabled;
     const { hasAssistantPrivilege } = useAssistantAvailability();
     const getTab = useCallback(
       (tab: TimelineTabs) => {
@@ -181,7 +182,7 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
             timelineId={timelineId}
           />
         </HideShowContainer>
-        {isEsqlInTimelineEnabled && (
+        {isEsqlSettingEnabled && (
           <HideShowContainer
             $isVisible={TimelineTabs.esql === activeTimelineTab}
             data-test-subj={`timeline-tab-content-${TimelineTabs.esql}`}
@@ -285,7 +286,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
   sessionViewConfig,
   timelineDescription,
 }) => {
-  const isEsqlInTimelineEnabled = useIsExperimentalFeatureEnabled('discoverInTimeline');
+  const isEsqlSettingEnabled = useKibana().services.configSettings.ESQLEnabled;
   const { hasAssistantPrivilege } = useAssistantAvailability();
   const dispatch = useDispatch();
   const getActiveTab = useMemo(() => getActiveTabSelector(), []);
@@ -399,7 +400,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
             <span>{i18n.QUERY_TAB}</span>
             {showTimeline && <TimelineEventsCountBadge />}
           </StyledEuiTab>
-          {isEsqlInTimelineEnabled && (
+          {isEsqlSettingEnabled && (
             <StyledEuiTab
               data-test-subj={`timelineTabs-${TimelineTabs.esql}`}
               onClick={setEsqlAsActiveTab}

x-pack/test/security_solution_cypress/config.ts

@@ -47,7 +47,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--xpack.securitySolution.enableExperimental=${JSON.stringify([
           'alertDetailsPageEnabled',
           'chartEmbeddablesEnabled',
-          'discoverInTimeline',
         ])}`,
         // mock cloud to enable the guided onboarding tour in e2e tests
         '--xpack.cloud.id=test',

x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/discover/cell_actions.cy.ts

@@ -26,7 +26,6 @@ const TIMESTAMP_COLUMN_NAME = '@timestamp';
 describe.skip(
   `Discover Datagrid Cell Actions`,
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess'],
   },
   () => {

x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/discover/discover_state.cy.ts

@@ -32,7 +32,6 @@ const DEFAULT_ESQL_QUERY =
 describe(
   'Discover State',
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess'],
   },
   () => {

x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/discover/discover_timeline_state_integration.cy.ts

@@ -63,7 +63,6 @@ const esqlQuery = 'from auditbeat-* | where ecs.version == "8.0.0"';
 describe(
   'Discover Timeline State Integration',
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess', '@brokenInServerless'],
     // ESQL and test involving STACK_MANAGEMENT_PAGE are broken in serverless
   },

x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/discover/search_filter.cy.ts

@@ -36,7 +36,6 @@ const esqlQuery = 'from auditbeat-* | where ecs.version == "8.0.0"';
 describe(
   'Basic discover search and filter operations',
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess'],
   },
   () => {

x-pack/test/security_solution_cypress/cypress/screens/timeline.ts

@@ -341,7 +341,7 @@ export const GET_TIMELINE_HEADER = (fieldName: string) => {
   return `[data-test-subj="timeline"] [data-test-subj="header-text-${fieldName}"]`;
 };
 
-export const ESQL_TAB = getDataTestSubjectSelector('timelineTabs-discover');
+export const ESQL_TAB = getDataTestSubjectSelector('timelineTabs-esql');
 
 export const TIMELINE_DATE_PICKER_CONTAINER = getDataTestSubjectSelector(
   'timeline-date-picker-container'