Merge branch 'main' into rename-setting-esql

src/plugins/discover/kibana.jsonc

@@ -37,7 +37,8 @@
       "savedObjectsTaggingOss",
       "lens",
       "noDataPage",
-      "globalSearch"
+      "globalSearch",
+      "observabilityAIAssistant"
     ],
     "requiredBundles": ["kibanaUtils", "kibanaReact", "unifiedSearch", "savedObjects"],
     "extraPublicDirs": ["common"]

src/plugins/discover/public/application/main/components/layout/discover_layout.tsx

@@ -71,6 +71,7 @@ export function DiscoverLayout({ stateContainer }: DiscoverLayoutProps) {
     filterManager,
     history,
     spaces,
+    observabilityAIAssistant,
   } = useDiscoverServices();
   const pageBackgroundColor = useEuiBackgroundColor('plain');
   const globalQueryState = data.query.getState();
@@ -132,6 +133,16 @@ export function DiscoverLayout({ stateContainer }: DiscoverLayoutProps) {
     sort,
   });
 
+  // The assistant is getting the state from the url correctly
+  // expect from the index pattern where we have only the dataview id
+  useEffect(() => {
+    return observabilityAIAssistant?.service.setScreenContext({
+      screenDescription: `The user is looking at the Discover view on the ${
+        isPlainRecord ? 'ES|QL' : 'dataView'
+      } mode. The index pattern is the ${dataView.getIndexPattern()}`,
+    });
+  }, [dataView, isPlainRecord, observabilityAIAssistant?.service]);
+
   const onAddFilter = useCallback(
     (field: DataViewField | string, values: unknown, operation: '+' | '-') => {
       const fieldName = typeof field === 'string' ? field : field.name;

src/plugins/discover/public/build_services.ts

@@ -54,6 +54,7 @@ import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import type { SettingsStart } from '@kbn/core-ui-settings-browser';
 import type { ContentClient } from '@kbn/content-management-plugin/public';
+import type { ObservabilityAIAssistantPublicStart } from '@kbn/observability-ai-assistant-plugin/public';
 import { memoize, noop } from 'lodash';
 import type { NoDataPagePluginStart } from '@kbn/no-data-page-plugin/public';
 import { DiscoverStartPlugins } from './plugin';
@@ -123,6 +124,7 @@ export interface DiscoverServices {
   uiActions: UiActionsStart;
   contentClient: ContentClient;
   noDataPage?: NoDataPagePluginStart;
+  observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
 }
 
 export const buildServices = memoize(
@@ -203,6 +205,7 @@ export const buildServices = memoize(
       uiActions: plugins.uiActions,
       contentClient: plugins.contentManagement.client,
       noDataPage: plugins.noDataPage,
+      observabilityAIAssistant: plugins.observabilityAIAssistant,
     };
   }
 );

src/plugins/discover/public/plugin.tsx

@@ -47,6 +47,10 @@ import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import { TRUNCATE_MAX_HEIGHT } from '@kbn/discover-utils';
 import type { NoDataPagePluginStart } from '@kbn/no-data-page-plugin/public';
+import type {
+  ObservabilityAIAssistantPublicSetup,
+  ObservabilityAIAssistantPublicStart,
+} from '@kbn/observability-ai-assistant-plugin/public';
 import { PLUGIN_ID } from '../common';
 import { registerFeature } from './register_feature';
 import { buildServices, UrlTracker } from './build_services';
@@ -167,6 +171,7 @@ export interface DiscoverSetupPlugins {
   data: DataPublicPluginSetup;
   expressions: ExpressionsSetup;
   globalSearch?: GlobalSearchPluginSetup;
+  observabilityAIAssistant?: ObservabilityAIAssistantPublicSetup;
 }
 
 /**
@@ -197,6 +202,7 @@ export interface DiscoverStartPlugins {
   lens: LensPublicStart;
   contentManagement: ContentManagementPublicStart;
   noDataPage?: NoDataPagePluginStart;
+  observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
 }
 
 export type StartRenderServices = Pick<CoreStart, 'analytics' | 'i18n' | 'theme'>;

src/plugins/discover/tsconfig.json

@@ -83,7 +83,8 @@
     "@kbn/deeplinks-analytics",
     "@kbn/shared-ux-markdown",
     "@kbn/data-view-utils",
-    "@kbn/presentation-publishing"
+    "@kbn/presentation-publishing",
+    "@kbn/observability-ai-assistant-plugin"
   ],
   "exclude": ["target/**/*"]
 }

x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts

@@ -49,6 +49,7 @@ describe('GET privileges', () => {
         isLegacyTemplatesEnabled: true,
         isIndexStatsEnabled: true,
         isDataStreamsStorageColumnEnabled: true,
+        enableTogglingDataRetention: true,
       },
       indexDataEnricher: mockedIndexDataEnricher,
       lib: {
@@ -118,6 +119,7 @@ describe('GET privileges', () => {
           isLegacyTemplatesEnabled: true,
           isIndexStatsEnabled: true,
           isDataStreamsStorageColumnEnabled: true,
+          enableTogglingDataRetention: true,
         },
         indexDataEnricher: mockedIndexDataEnricher,
         lib: {

x-pack/plugins/index_management/server/routes/api/enrich_policies/register_privileges_route.test.ts

@@ -49,6 +49,7 @@ describe('GET privileges', () => {
         isLegacyTemplatesEnabled: true,
         isIndexStatsEnabled: true,
         isDataStreamsStorageColumnEnabled: true,
+        enableTogglingDataRetention: true,
       },
       indexDataEnricher: mockedIndexDataEnricher,
       lib: {
@@ -118,6 +119,7 @@ describe('GET privileges', () => {
           isLegacyTemplatesEnabled: true,
           isIndexStatsEnabled: true,
           isDataStreamsStorageColumnEnabled: true,
+          enableTogglingDataRetention: true,
         },
         indexDataEnricher: mockedIndexDataEnricher,
         lib: {