Merge branch 'master' into retry-rebalance-and-split-ci-groups

.github/CODEOWNERS

@@ -98,18 +98,6 @@
 #CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
 #CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
 
-# Core UI
-# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
-/src/plugins/home/public @elastic/kibana-core-ui
-/src/plugins/home/server/*.ts @elastic/kibana-core-ui
-/src/plugins/home/server/services/ @elastic/kibana-core-ui
-/src/plugins/kibana_overview/ @elastic/kibana-core-ui
-/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
-#CC# /src/plugins/newsfeed @elastic/kibana-core-ui
-#CC# /src/plugins/home/public @elastic/kibana-core-ui
-#CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
-#CC# /src/plugins/home/ @elastic/kibana-core-ui
-#CC# /x-pack/plugins/global_search_providers/ @elastic/kibana-core-ui
 
 # Observability UIs
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
@@ -138,10 +126,6 @@
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
-/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
-/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
-/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold @elastic/kibana-gis
-/x-pack/plugins/stack_alerts/public/alert_types/geo_threshold @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
 #CC# /src/plugins/maps_oss/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
@@ -200,6 +184,11 @@
 /src/plugins/status_page/ @elastic/kibana-core
 /src/plugins/saved_objects_management/ @elastic/kibana-core
 /src/dev/run_check_published_api_changes.ts @elastic/kibana-core
+/src/plugins/home/public @elastic/kibana-core
+/src/plugins/home/server/*.ts @elastic/kibana-core
+/src/plugins/home/server/services/ @elastic/kibana-core
+/src/plugins/kibana_overview/ @elastic/kibana-core
+/x-pack/plugins/global_search_bar/ @elastic/kibana-core
 #CC# /src/core/server/csp/ @elastic/kibana-core
 #CC# /src/legacy/server/config/ @elastic/kibana-core
 #CC# /src/legacy/server/http/ @elastic/kibana-core
@@ -210,6 +199,11 @@
 #CC# /x-pack/plugins/cloud/ @elastic/kibana-core
 #CC# /x-pack/plugins/features/ @elastic/kibana-core
 #CC# /x-pack/plugins/global_search/ @elastic/kibana-core
+#CC# /src/plugins/newsfeed @elastic/kibana-core
+#CC# /src/plugins/home/public @elastic/kibana-core
+#CC# /src/plugins/home/server/services/ @elastic/kibana-core
+#CC# /src/plugins/home/ @elastic/kibana-core
+#CC# /x-pack/plugins/global_search_providers/ @elastic/kibana-core
 
 # Kibana Telemetry
 /packages/kbn-analytics/ @elastic/kibana-core
@@ -236,7 +230,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Security
 /src/core/server/csp/  @elastic/kibana-security @elastic/kibana-core
 /src/plugins/security_oss/ @elastic/kibana-security
-/src/plugins/spaces_oss/ @elastic/kibana-security
 /test/security_functional/ @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
@@ -263,7 +256,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 /docs/user/alerting/ @elastic/kibana-alerting-services
 /docs/management/alerting/ @elastic/kibana-alerting-services
-#CC# /x-pack/plugins/stack_alerts/ @elastic/kibana-alerting-services
+#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services
 
 # Enterprise Search
 # Shared

x-pack/plugins/data_enhanced/server/search/session/session_service.ts

@@ -138,7 +138,7 @@ export class SearchSessionService implements ISessionService {
       filter,
       namespaces: ['*'],
     });
-    this.logger.warn(`getAllMappedSavedObjects | Got ${res.saved_objects.length} items`);
+    this.logger.debug(`getAllMappedSavedObjects | Got ${res.saved_objects.length} items`);
     return res.saved_objects;
   }
 

x-pack/plugins/event_log/server/es/context.test.ts

@@ -25,6 +25,7 @@ describe('createEsContext', () => {
       logger,
       clusterClientPromise: Promise.resolve(clusterClient),
       indexNameRoot: 'test0',
+      kibanaVersion: '1.2.3',
     });
 
     expect(context.initialized).toBeFalsy();
@@ -38,6 +39,7 @@ describe('createEsContext', () => {
       logger,
       clusterClientPromise: Promise.resolve(clusterClient),
       indexNameRoot: 'test-index',
+      kibanaVersion: '1.2.3',
     });
 
     const esNames = context.esNames;
@@ -57,6 +59,7 @@ describe('createEsContext', () => {
       logger,
       clusterClientPromise: Promise.resolve(clusterClient),
       indexNameRoot: 'test1',
+      kibanaVersion: '1.2.3',
     });
     clusterClient.callAsInternalUser.mockResolvedValue(false);
 
@@ -74,6 +77,7 @@ describe('createEsContext', () => {
       logger,
       clusterClientPromise: Promise.resolve(clusterClient),
       indexNameRoot: 'test2',
+      kibanaVersion: '1.2.3',
     });
     clusterClient.callAsInternalUser.mockResolvedValue(true);
     context.initialize();
@@ -98,6 +102,7 @@ describe('createEsContext', () => {
       logger,
       clusterClientPromise: Promise.resolve(clusterClient),
       indexNameRoot: 'test2',
+      kibanaVersion: '1.2.3',
     });
     context.initialize();
     const success = await context.waitTillReady();

x-pack/plugins/event_log/server/es/context.ts

@@ -36,6 +36,7 @@ export interface EsContextCtorParams {
   logger: Logger;
   clusterClientPromise: Promise<EsClusterClient>;
   indexNameRoot: string;
+  kibanaVersion: string;
 }
 
 class EsContextImpl implements EsContext {
@@ -47,7 +48,7 @@ class EsContextImpl implements EsContext {
 
   constructor(params: EsContextCtorParams) {
     this.logger = params.logger;
-    this.esNames = getEsNames(params.indexNameRoot);
+    this.esNames = getEsNames(params.indexNameRoot, params.kibanaVersion);
     this.readySignal = createReadySignal();
     this.initialized = false;
     this.esAdapter = new ClusterClientAdapter({

x-pack/plugins/event_log/server/es/documents.test.ts

@@ -18,7 +18,8 @@ describe('getIlmPolicy()', () => {
 });
 
 describe('getIndexTemplate()', () => {
-  const esNames = getEsNames('XYZ');
+  const kibanaVersion = '1.2.3';
+  const esNames = getEsNames('XYZ', kibanaVersion);
 
   test('returns the correct details of the index template', () => {
     const indexTemplate = getIndexTemplate(esNames);

x-pack/plugins/event_log/server/es/names.test.ts

@@ -13,20 +13,22 @@ jest.mock('../lib/../../../../package.json', () => ({
 describe('getEsNames()', () => {
   test('works as expected', () => {
     const base = 'XYZ';
-    const version = '1.2.3';
-    const esNames = getEsNames(base);
+    const kibanaVersion = '1.2.3';
+    const esNames = getEsNames(base, kibanaVersion);
     expect(esNames.base).toEqual(base);
-    expect(esNames.alias).toEqual(`${base}-event-log-${version}`);
+    expect(esNames.alias).toEqual(`${base}-event-log-${kibanaVersion}`);
     expect(esNames.ilmPolicy).toEqual(`${base}-event-log-policy`);
     expect(esNames.indexPattern).toEqual(`${base}-event-log-*`);
-    expect(esNames.indexPatternWithVersion).toEqual(`${base}-event-log-${version}-*`);
-    expect(esNames.initialIndex).toEqual(`${base}-event-log-${version}-000001`);
-    expect(esNames.indexTemplate).toEqual(`${base}-event-log-${version}-template`);
+    expect(esNames.indexPatternWithVersion).toEqual(`${base}-event-log-${kibanaVersion}-*`);
+    expect(esNames.initialIndex).toEqual(`${base}-event-log-${kibanaVersion}-000001`);
+    expect(esNames.indexTemplate).toEqual(`${base}-event-log-${kibanaVersion}-template`);
   });
 
   test('ilm policy name does not contain dot prefix', () => {
     const base = '.XYZ';
-    const esNames = getEsNames(base);
+    const kibanaVersion = '1.2.3';
+
+    const esNames = getEsNames(base, kibanaVersion);
     expect(esNames.ilmPolicy).toEqual('XYZ-event-log-policy');
   });
 });

x-pack/plugins/event_log/server/es/names.ts

@@ -4,10 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import xPackage from '../../../../package.json';
-
 const EVENT_LOG_NAME_SUFFIX = `-event-log`;
-const EVENT_LOG_VERSION_SUFFIX = `-${xPackage.version}`;
 
 export interface EsNames {
   base: string;
@@ -19,7 +16,8 @@ export interface EsNames {
   indexTemplate: string;
 }
 
-export function getEsNames(baseName: string): EsNames {
+export function getEsNames(baseName: string, kibanaVersion: string): EsNames {
+  const EVENT_LOG_VERSION_SUFFIX = `-${kibanaVersion.toLocaleLowerCase()}`;
   const eventLogName = `${baseName}${EVENT_LOG_NAME_SUFFIX}`;
   const eventLogNameWithVersion = `${eventLogName}${EVENT_LOG_VERSION_SUFFIX}`;
   const eventLogPolicyName = `${

x-pack/plugins/event_log/server/plugin.ts

@@ -55,12 +55,14 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
   private globalConfig$: Observable<SharedGlobalConfig>;
   private eventLogClientService?: EventLogClientService;
   private savedObjectProviderRegistry: SavedObjectProviderRegistry;
+  private kibanaVersion: PluginInitializerContext['env']['packageInfo']['version'];
 
   constructor(private readonly context: PluginInitializerContext) {
     this.systemLogger = this.context.logger.get();
     this.config$ = this.context.config.create<IEventLogConfig>();
     this.globalConfig$ = this.context.config.legacy.globalConfig$;
     this.savedObjectProviderRegistry = new SavedObjectProviderRegistry();
+    this.kibanaVersion = this.context.env.packageInfo.version;
   }
 
   async setup(core: CoreSetup): Promise<IEventLogService> {
@@ -78,6 +80,7 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
       clusterClientPromise: core
         .getStartServices()
         .then(([{ elasticsearch }]) => elasticsearch.legacy.client),
+      kibanaVersion: this.kibanaVersion,
     });
 
     this.eventLogService = new EventLogService({

x-pack/plugins/event_log/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "server/**/*",
+    "scripts/**/*",
+    "generated/*",
+    // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
+    "generated/*.json",
+    "common/*"
+  ],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../spaces/tsconfig.json" }
+  ]
+}

x-pack/plugins/maps/public/connected_components/mb_map/mb.utils.test.js

@@ -185,4 +185,16 @@ describe('removeOrphanedSourcesAndLayers', () => {
     removeOrphanedSourcesAndLayers(mockMbMap, [], spatialFilterLayer);
     expect(mockMbMap.getStyle()).toEqual(styleWithSpatialFilters);
   });
+
+  test('should not remove mapbox gl draw layers and sources', async () => {
+    const fooLayer = makeMultiSourceMockLayer('foo');
+    const layerList = [fooLayer];
+
+    const currentStyle = getMockStyle(layerList);
+    currentStyle.layers.push({ id: 'gl-draw-points' });
+    const mockMbMap = new MockMbMap(currentStyle);
+
+    removeOrphanedSourcesAndLayers(mockMbMap, layerList, spatialFilterLayer);
+    expect(mockMbMap.getStyle()).toEqual(currentStyle);
+  });
 });

x-pack/plugins/maps/public/connected_components/mb_map/utils.js

@@ -16,6 +16,11 @@ export function removeOrphanedSourcesAndLayers(mbMap, layerList, spatialFilterLa
       return;
     }
 
+    // ignore gl-draw layers
+    if (mbLayer.id.startsWith('gl-draw')) {
+      return;
+    }
+
     const layer = layerList.find((layer) => {
       return layer.ownsMbLayerId(mbLayer.id);
     });

x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_query.tsx

@@ -9,7 +9,7 @@ import React, { SetStateAction, useEffect, useState } from 'react';
 import { fetchQueryAlerts } from './api';
 import { AlertSearchResponse } from './types';
 
-type Func = () => void;
+type Func = () => Promise<void>;
 
 export interface ReturnQueryAlerts<Hit, Aggs> {
   loading: boolean;

x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_signal_index.tsx

@@ -11,7 +11,7 @@ import { createSignalIndex, getSignalIndex } from './api';
 import * as i18n from './translations';
 import { isSecurityAppError } from '../../../../common/utils/api';
 
-type Func = () => void;
+type Func = () => Promise<void>;
 
 export interface ReturnSignalIndex {
   loading: boolean;

x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts

@@ -120,9 +120,9 @@ export const fetchRules = async ({
     ...showElasticRuleFilter,
   ].join(' AND ');
 
-  const tags = [
-    ...(filterOptions.tags?.map((t) => `alert.attributes.tags: "${t.replace(/"/g, '\\"')}"`) ?? []),
-  ].join(' AND ');
+  const tags = filterOptions.tags
+    .map((t) => `alert.attributes.tags: "${t.replace(/"/g, '\\"')}"`)
+    .join(' AND ');
 
   const filterString =
     filtersWithoutTags !== '' && tags !== ''

x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts

@@ -177,9 +177,9 @@ export interface FilterOptions {
   filter: string;
   sortField: RulesSortingFields;
   sortOrder: SortOrder;
-  showCustomRules?: boolean;
-  showElasticRules?: boolean;
-  tags?: string[];
+  showCustomRules: boolean;
+  showElasticRules: boolean;
+  tags: string[];
 }
 
 export interface FetchRulesResponse {

x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_pre_packaged_rules.tsx

@@ -20,7 +20,7 @@ import {
   getPrePackagedTimelineStatus,
 } from '../../../pages/detection_engine/rules/helpers';
 
-type Func = () => void;
+type Func = () => Promise<void>;
 export type CreatePreBuiltRules = () => Promise<boolean>;
 
 interface ReturnPrePackagedTimelines {

x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_status.tsx

@@ -113,9 +113,11 @@ export const useRulesStatuses = (rules: Rules): ReturnRulesStatuses => {
         setLoading(false);
       }
     };
-    if (rules != null && rules.length > 0) {
+
+    if (rules.length > 0) {
       fetchData(rules.map((r) => r.id));
     }
+
     return () => {
       isSubscribed = false;
       abortCtrl.abort();

x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rules.test.tsx

@@ -27,6 +27,9 @@ describe('useRules', () => {
             filter: '',
             sortField: 'created_at',
             sortOrder: 'desc',
+            tags: [],
+            showCustomRules: false,
+            showElasticRules: false,
           },
         })
       );
@@ -48,6 +51,9 @@ describe('useRules', () => {
             filter: '',
             sortField: 'created_at',
             sortOrder: 'desc',
+            tags: [],
+            showCustomRules: false,
+            showElasticRules: false,
           },
         })
       );
@@ -153,6 +159,9 @@ describe('useRules', () => {
             filter: '',
             sortField: 'created_at',
             sortOrder: 'desc',
+            tags: [],
+            showCustomRules: false,
+            showElasticRules: false,
           },
         })
       );
@@ -182,6 +191,9 @@ describe('useRules', () => {
               filter: '',
               sortField: 'created_at',
               sortOrder: 'desc',
+              tags: [],
+              showCustomRules: false,
+              showElasticRules: false,
             },
           },
         }
@@ -198,6 +210,9 @@ describe('useRules', () => {
           filter: 'hello world',
           sortField: 'created_at',
           sortOrder: 'desc',
+          tags: [],
+          showCustomRules: false,
+          showElasticRules: false,
         },
       });
       await waitForNextUpdate();