Merge branch 'master' into d/2021-10-18-scss-in-packages

.buildkite/pipelines/performance/nightly.yml

@@ -24,8 +24,6 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
-    concurrency: 50
-    concurrency_group: 'performance-test-group'
 
   - wait: ~
     continue_on_failure: true

.buildkite/scripts/steps/functional/performance.sh

@@ -14,6 +14,8 @@ cat << EOF | buildkite-agent pipeline upload
 steps:
   - command: .buildkite/scripts/steps/functional/performance_sub.sh
     parallelism: "$ITERATION_COUNT"
+    concurrency: 20
+    concurrency_group: 'performance-test-group'
 EOF
 
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -230,6 +230,7 @@ readonly links: {
         readonly ingest: Record<string, string>;
         readonly fleet: Readonly<{
             datastreamsILM: string;
+            beatsAgentComparison: string;
             guide: string;
             fleetServer: string;
             fleetServerAddFleetServer: string;

package.json

@@ -668,6 +668,7 @@
     "cypress": "^8.5.0",
     "cypress-axe": "^0.13.0",
     "cypress-cucumber-preprocessor": "^2.5.2",
+    "cypress-file-upload": "^5.0.8",
     "cypress-multi-reporters": "^1.5.0",
     "cypress-pipe": "^2.0.0",
     "cypress-real-events": "^1.5.1",

src/core/public/doc_links/doc_links_service.ts

@@ -479,6 +479,7 @@ export class DocLinksService {
           settingsFleetServerHostSettings: `${FLEET_DOCS}fleet-settings.html#fleet-server-hosts-setting`,
           troubleshooting: `${FLEET_DOCS}fleet-troubleshooting.html`,
           elasticAgent: `${FLEET_DOCS}elastic-agent-installation.html`,
+          beatsAgentComparison: `${FLEET_DOCS}beats-agent-comparison.html`,
           datastreams: `${FLEET_DOCS}data-streams.html`,
           datastreamsILM: `${FLEET_DOCS}data-streams.html#data-streams-ilm`,
           datastreamsNamingScheme: `${FLEET_DOCS}data-streams.html#data-streams-naming-scheme`,
@@ -736,6 +737,7 @@ export interface DocLinksStart {
     readonly ingest: Record<string, string>;
     readonly fleet: Readonly<{
       datastreamsILM: string;
+      beatsAgentComparison: string;
       guide: string;
       fleetServer: string;
       fleetServerAddFleetServer: string;

src/core/public/public.api.md

@@ -697,6 +697,7 @@ export interface DocLinksStart {
         readonly ingest: Record<string, string>;
         readonly fleet: Readonly<{
             datastreamsILM: string;
+            beatsAgentComparison: string;
             guide: string;
             fleetServer: string;
             fleetServerAddFleetServer: string;

src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx

@@ -118,11 +118,11 @@ function RevealImageComponent({
     return imgStyles;
   }
 
-  const additionaAlignerStyles: AlignerStyles = {};
+  const additionalAlignerStyles: AlignerStyles = {};
 
   if (isValidUrl(emptyImage ?? '')) {
     // only use empty image if one is provided
-    additionaAlignerStyles.backgroundImage = `url(${emptyImage})`;
+    additionalAlignerStyles.backgroundImage = `url(${emptyImage})`;
   }
 
   let additionalImgStyles: ImageStyles = {};
@@ -136,10 +136,10 @@ function RevealImageComponent({
   return (
     <div
       className="revealImageAligner"
-      css={css({
+      css={{
         ...revealImageAlignerStyle,
-        ...additionaAlignerStyles,
-      })}
+        ...additionalAlignerStyles,
+      }}
     >
       <img
         ref={imgRef}

x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLExplorerLink.test.tsx

@@ -10,8 +10,7 @@ import React from 'react';
 import { getRenderedHref } from '../../../../utils/testHelpers';
 import { MLExplorerLink } from './MLExplorerLink';
 
-// FLAKY: https://github.com/elastic/kibana/issues/113695
-describe.skip('MLExplorerLink', () => {
+describe('MLExplorerLink', () => {
   it('should produce the correct URL with jobId', async () => {
     const href = await getRenderedHref(
       () => (

x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.test.ts

@@ -0,0 +1,43 @@
+/*
+ * 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 { preprocessLegacyFields } from './get_apm_package_policy_definition';
+
+const apmServerSchema = {
+  'apm-server.host': '0.0.0.0:8200',
+  'apm-server.secret_token': 'asdfkjhasdf',
+  'apm-server.read_timeout': 3600,
+  'apm-server.rum.event_rate.limit': 100,
+  'apm-server.rum.event_rate.lru_size': 100,
+  'apm-server.rum.allow_service_names': 'opbeans-test',
+  'logging.level': 'error',
+  'queue.mem.events': 2000,
+  'queue.mem.flush.timeout': '1s',
+  'setup.template.settings.index.number_of_jshards': 1,
+};
+
+describe('get_apm_package_policy_definition', () => {
+  describe('preprocessLegacyFields', () => {
+    it('should replace legacy fields with supported fields', () => {
+      const result = preprocessLegacyFields({ apmServerSchema });
+      expect(result).toMatchInlineSnapshot(`
+        Object {
+          "apm-server.auth.anonymous.allow_service": "opbeans-test",
+          "apm-server.auth.anonymous.rate_limit.event_limit": 100,
+          "apm-server.auth.anonymous.rate_limit.ip_limit": 100,
+          "apm-server.auth.secret_token": "asdfkjhasdf",
+          "apm-server.host": "0.0.0.0:8200",
+          "apm-server.read_timeout": 3600,
+          "logging.level": "error",
+          "queue.mem.events": 2000,
+          "queue.mem.flush.timeout": "1s",
+          "setup.template.settings.index.number_of_jshards": 1,
+        }
+      `);
+    });
+  });
+});

x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts

@@ -45,7 +45,7 @@ export function getApmPackagePolicyDefinition(
   };
 }
 
-function preprocessLegacyFields({
+export function preprocessLegacyFields({
   apmServerSchema,
 }: {
   apmServerSchema: Record<string, any>;
@@ -64,6 +64,10 @@ function preprocessLegacyFields({
       key: 'apm-server.auth.anonymous.allow_service',
       legacyKey: 'apm-server.rum.allow_service_names',
     },
+    {
+      key: 'apm-server.auth.secret_token',
+      legacyKey: 'apm-server.secret_token',
+    },
   ].forEach(({ key, legacyKey }) => {
     if (!copyOfApmServerSchema[key]) {
       copyOfApmServerSchema[key] = copyOfApmServerSchema[legacyKey];

x-pack/plugins/apm/server/lib/fleet/get_unsupported_apm_server_schema.test.ts

@@ -0,0 +1,58 @@
+/*
+ * 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 { SavedObjectsClientContract } from 'kibana/server';
+import { getUnsupportedApmServerSchema } from './get_unsupported_apm_server_schema';
+
+const apmServerSchema = {
+  'apm-server.host': '0.0.0.0:8200',
+  'apm-server.secret_token': 'asdfkjhasdf',
+  'apm-server.read_timeout': 3600,
+  'apm-server.rum.event_rate.limit': 100,
+  'apm-server.rum.event_rate.lru_size': 100,
+  'apm-server.rum.allow_service_names': 'opbeans-test',
+  'logging.level': 'error',
+  'queue.mem.events': 2000,
+  'queue.mem.flush.timeout': '1s',
+  'setup.template.settings.index.number_of_jshards': 1,
+};
+
+const mockSavaedObectsClient = {
+  get: () => ({
+    attributes: { schemaJson: JSON.stringify(apmServerSchema) },
+  }),
+} as unknown as SavedObjectsClientContract;
+
+describe('get_unsupported_apm_server_schema', () => {
+  describe('getUnsupportedApmServerSchema', () => {
+    it('should return key-value pairs of unsupported configs', async () => {
+      const result = await getUnsupportedApmServerSchema({
+        savedObjectsClient: mockSavaedObectsClient,
+      });
+      expect(result).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "key": "logging.level",
+            "value": "error",
+          },
+          Object {
+            "key": "queue.mem.events",
+            "value": 2000,
+          },
+          Object {
+            "key": "queue.mem.flush.timeout",
+            "value": "1s",
+          },
+          Object {
+            "key": "setup.template.settings.index.number_of_jshards",
+            "value": 1,
+          },
+        ]
+      `);
+    });
+  });
+});

x-pack/plugins/apm/server/lib/fleet/get_unsupported_apm_server_schema.ts

@@ -10,7 +10,10 @@ import {
   APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
   APM_SERVER_SCHEMA_SAVED_OBJECT_ID,
 } from '../../../common/apm_saved_object_constants';
-import { apmConfigMapping } from './get_apm_package_policy_definition';
+import {
+  apmConfigMapping,
+  preprocessLegacyFields,
+} from './get_apm_package_policy_definition';
 
 export async function getUnsupportedApmServerSchema({
   savedObjectsClient,
@@ -24,7 +27,10 @@ export async function getUnsupportedApmServerSchema({
   const apmServerSchema: Record<string, any> = JSON.parse(
     (attributes as { schemaJson: string }).schemaJson
   );
-  return Object.entries(apmServerSchema)
+  const preprocessedApmServerSchema = preprocessLegacyFields({
+    apmServerSchema,
+  });
+  return Object.entries(preprocessedApmServerSchema)
     .filter(([name]) => !(name in apmConfigMapping))
     .map(([key, value]) => ({ key, value }));
 }