Merge branch 'main' into fix_exception_flyout_scroll

fleet_packages.json

@@ -31,6 +31,6 @@
   },
   {
     "name": "synthetics",
-    "version": "0.9.4"
+    "version": "0.10.1"
   }
 ]

src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts

@@ -399,7 +399,8 @@ export function filebeatEnableInstructions(moduleName: string) {
       }),
       commands: ['./filebeat modules enable ' + moduleName],
       textPost: i18n.translate('home.tutorials.common.filebeatEnableInstructions.osxTextPost', {
-        defaultMessage: 'Modify the settings in the `modules.d/{moduleName}.yml` file.',
+        defaultMessage:
+          'Modify the settings in the `modules.d/{moduleName}.yml` file. You must enable at least one fileset.',
         values: { moduleName },
       }),
     },
@@ -411,7 +412,7 @@ export function filebeatEnableInstructions(moduleName: string) {
       commands: ['sudo filebeat modules enable ' + moduleName],
       textPost: i18n.translate('home.tutorials.common.filebeatEnableInstructions.debTextPost', {
         defaultMessage:
-          'Modify the settings in the `/etc/filebeat/modules.d/{moduleName}.yml` file.',
+          'Modify the settings in the `/etc/filebeat/modules.d/{moduleName}.yml` file. You must enable at least one fileset.',
         values: { moduleName },
       }),
     },
@@ -423,7 +424,7 @@ export function filebeatEnableInstructions(moduleName: string) {
       commands: ['sudo filebeat modules enable ' + moduleName],
       textPost: i18n.translate('home.tutorials.common.filebeatEnableInstructions.rpmTextPost', {
         defaultMessage:
-          'Modify the settings in the `/etc/filebeat/modules.d/{moduleName}.yml` file.',
+          'Modify the settings in the `/etc/filebeat/modules.d/{moduleName}.yml` file. You must enable at least one fileset.',
         values: { moduleName },
       }),
     },
@@ -438,7 +439,8 @@ export function filebeatEnableInstructions(moduleName: string) {
       }),
       commands: ['filebeat.exe modules enable ' + moduleName],
       textPost: i18n.translate('home.tutorials.common.filebeatEnableInstructions.windowsTextPost', {
-        defaultMessage: 'Modify the settings in the `modules.d/{moduleName}.yml` file.',
+        defaultMessage:
+          'Modify the settings in the `modules.d/{moduleName}.yml` file. You must enable at least one fileset.',
         values: { moduleName },
       }),
     },

src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx

@@ -48,6 +48,7 @@ describe('SavedObjectsFinder', () => {
       name: 'Search',
       getIconForSavedObject: () => 'search' as IconType,
       showSavedObject: () => true,
+      defaultSearchField: 'name',
     },
   ];
 
@@ -73,7 +74,7 @@ describe('SavedObjectsFinder', () => {
       search: undefined,
       page: 1,
       perPage: 10,
-      searchFields: ['title^3', 'description'],
+      searchFields: ['title^3', 'description', 'name'],
       defaultSearchOperator: 'AND',
     });
   });
@@ -228,7 +229,7 @@ describe('SavedObjectsFinder', () => {
         search: 'abc*',
         page: 1,
         perPage: 10,
-        searchFields: ['title^3', 'description'],
+        searchFields: ['title^3', 'description', 'name'],
         defaultSearchOperator: 'AND',
       });
     });

src/plugins/saved_objects/public/finder/saved_object_finder.tsx

@@ -48,6 +48,7 @@ export interface SavedObjectMetaData<T = unknown> {
   showSavedObject?(savedObject: SimpleSavedObject<T>): boolean;
   getSavedObjectSubType?(savedObject: SimpleSavedObject<T>): string;
   includeFields?: string[];
+  defaultSearchField?: string;
 }
 
 interface FinderAttributes {
@@ -125,14 +126,21 @@ class SavedObjectFinderUi extends React.Component<
       .map((metaData) => metaData.includeFields || [])
       .reduce((allFields, currentFields) => allFields.concat(currentFields), ['title', 'name']);
 
+    const additionalSearchFields = Object.values(metaDataMap).reduce<string[]>((col, item) => {
+      if (item.defaultSearchField) {
+        col.push(item.defaultSearchField);
+      }
+      return col;
+    }, []);
+
     const perPage = this.props.uiSettings.get(LISTING_LIMIT_SETTING);
     const resp = await this.props.savedObjects.client.find<FinderAttributes>({
       type: Object.keys(metaDataMap),
       fields: [...new Set(fields)],
       search: query ? `${query}*` : undefined,
       page: 1,
       perPage,
-      searchFields: ['title^3', 'description'],
+      searchFields: ['title^3', 'description', ...additionalSearchFields],
       defaultSearchOperator: 'AND',
     });
 

src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx

@@ -86,6 +86,7 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
                     defaultMessage: 'Data view',
                   }
                 ),
+                defaultSearchField: 'name',
               },
             ]}
             fixedPageSize={this.fixedPageSize}

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts

@@ -8,16 +8,12 @@
 import { synthtrace } from '../../../../synthtrace';
 import { opbeans } from '../../../fixtures/synthtrace/opbeans';
 
-const settingsPath = '/app/management/kibana/settings';
 const serviceOverviewPath = '/app/apm/services/opbeans-python/overview';
 
 const start = '2021-10-10T00:00:00.000Z';
 const end = '2021-10-10T00:15:00.000Z';
 
-describe.skip('Infrastracture feature flag', () => {
-  const infraToggle =
-    '[data-test-subj="advancedSetting-editField-observability:enableInfrastructureView"]';
-
+describe('Infrastracture feature flag', () => {
   before(async () => {
     await synthtrace.index(
       opbeans({
@@ -31,17 +27,14 @@ describe.skip('Infrastracture feature flag', () => {
     await synthtrace.clean();
   });
 
-  beforeEach(() => {
-    cy.loginAsEditorUser();
-  });
-
   describe('when infrastracture feature is enabled', () => {
-    it('shows the flag as enabled in kibana advanced settings', () => {
-      cy.visit(settingsPath);
-
-      cy.get(infraToggle)
-        .should('have.attr', 'aria-checked')
-        .and('equal', 'true');
+    beforeEach(() => {
+      cy.loginAsEditorUser().then(() => {
+        // enables infrastructure view feature on advanced settings
+        cy.updateAdvancedSettings({
+          'observability:enableInfrastructureView': true,
+        });
+      });
     });
 
     it('shows infrastructure tab in service overview page', () => {
@@ -51,15 +44,13 @@ describe.skip('Infrastracture feature flag', () => {
   });
 
   describe('when infrastracture feature is disabled', () => {
-    it('shows the flag as disabled in kibana advanced settings', () => {
-      cy.visit(settingsPath);
-      cy.get(infraToggle).click();
-      cy.contains('Save changes').should('not.be.disabled');
-      cy.contains('Save changes').click();
-
-      cy.get(infraToggle)
-        .should('have.attr', 'aria-checked')
-        .and('equal', 'false');
+    beforeEach(() => {
+      cy.loginAsEditorUser().then(() => {
+        // enables infrastructure view feature on advanced settings
+        cy.updateAdvancedSettings({
+          'observability:enableInfrastructureView': false,
+        });
+      });
     });
 
     it('hides infrastructure tab in service overview page', () => {

x-pack/plugins/fleet/common/types/models/epm.ts

@@ -483,6 +483,7 @@ export type PackageAssetReference = Pick<SavedObjectReference, 'id'> & {
 
 export interface IndexTemplateMappings {
   properties: any;
+  dynamic_templates?: any;
 }
 
 // This is an index template v2, see https://github.com/elastic/elasticsearch/issues/53101

x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts

@@ -18,7 +18,7 @@ import pRetry from 'p-retry';
 const BEFORE_SETUP_TIMEOUT = 30 * 60 * 1000; // 30 minutes;
 
 const DOCKER_START_TIMEOUT = 5 * 60 * 1000; // 5 minutes
-const DOCKER_IMAGE = `docker.elastic.co/package-registry/distribution:93ffe45d8c4ae11365bc70b1038643121049b9fe`;
+const DOCKER_IMAGE = `docker.elastic.co/package-registry/distribution:433d99a96f3289c5013ae35826877adf408eb9c9`;
 
 function firstWithTimeout(source$: Rx.Observable<any>, errorMsg: string, ms = 30 * 1000) {
   return Rx.race(

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { merge } from 'lodash';
+import { merge, concat, uniqBy, omit } from 'lodash';
 import Boom from '@hapi/boom';
 import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
@@ -241,6 +241,15 @@ function buildComponentTemplates(params: {
 
   const templateSettings = merge(defaultSettings, indexTemplateSettings);
 
+  const indexTemplateMappings = registryElasticsearch?.['index_template.mappings'] ?? {};
+
+  const mappingsProperties = merge(mappings.properties, indexTemplateMappings.properties ?? {});
+
+  const mappingsDynamicTemplates = uniqBy(
+    concat(mappings.dynamic_templates ?? [], indexTemplateMappings.dynamic_templates ?? []),
+    (dynampingTemplate) => Object.keys(dynampingTemplate)[0]
+  );
+
   templatesMap[packageTemplateName] = {
     template: {
       settings: {
@@ -256,7 +265,11 @@ function buildComponentTemplates(params: {
           },
         },
       },
-      mappings: merge(mappings, registryElasticsearch?.['index_template.mappings'] ?? {}),
+      mappings: {
+        properties: mappingsProperties,
+        dynamic_templates: mappingsDynamicTemplates.length ? mappingsDynamicTemplates : undefined,
+        ...omit(indexTemplateMappings, 'properties', 'dynamic_templates'),
+      },
     },
     _meta,
   };