Merge branch 'main' into renovate/main-@elasticcharts

Author: markov00

examples/guided_onboarding_example/public/components/main.tsx

@@ -25,6 +25,7 @@ import {
   EuiText,
   EuiTitle,
   EuiSelectOption,
+  EuiFlexGrid,
 } from '@elastic/eui';
 import type { GuideState, GuideStepIds, GuideId, GuideStep } from '@kbn/guided-onboarding';
 import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
@@ -34,7 +35,14 @@ interface MainProps {
   notifications: CoreStart['notifications'];
 }
 
-const exampleGuideIds: GuideId[] = ['search', 'siem', 'kubernetes', 'testGuide'];
+const exampleGuideIds: GuideId[] = [
+  'appSearch',
+  'websiteSearch',
+  'databaseSearch',
+  'siem',
+  'kubernetes',
+  'testGuide',
+];
 const selectOptions: EuiSelectOption[] = exampleGuideIds.map((guideId) => ({
   value: guideId,
   text: guideId,
@@ -211,7 +219,7 @@ export const Main = (props: MainProps) => {
           </h3>
         </EuiText>
         <EuiSpacer />
-        <EuiFlexGroup>
+        <EuiFlexGrid columns={3}>
           {exampleGuideIds.map((guideId) => {
             const guideState = guidesState?.find((guide) => guide.guideId === guideId);
             return (
@@ -255,7 +263,7 @@ export const Main = (props: MainProps) => {
               </EuiFlexItem>
             );
           })}
-        </EuiFlexGroup>
+        </EuiFlexGrid>
         <EuiSpacer />
         <EuiHorizontalRule />
         <EuiText>

packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.test.ts

@@ -345,3 +345,38 @@ describe('ui_settings 8.5.0 migrations', () => {
     });
   });
 });
+
+describe('ui_settings 8.7.0 migrations', () => {
+  const migration = migrations['8.7.0'];
+
+  test('returns doc on empty object', () => {
+    expect(migration({} as SavedObjectUnsanitizedDoc)).toEqual({
+      references: [],
+    });
+  });
+
+  test('removes "observability:enableNewSyntheticsView" setting', () => {
+    const doc = {
+      type: 'config',
+      id: '8.7.0',
+      attributes: {
+        buildNum: 9007199254740991,
+        'observability:enableNewSyntheticsView': true,
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    };
+
+    expect(migration(doc)).toEqual({
+      type: 'config',
+      id: '8.7.0',
+      attributes: {
+        buildNum: 9007199254740991,
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    });
+  });
+});

packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.ts

@@ -162,4 +162,25 @@ export const migrations = {
     }),
     references: doc.references || [],
   }),
+  '8.7.0': (doc: SavedObjectUnsanitizedDoc<any>): SavedObjectSanitizedDoc<any> => ({
+    ...doc,
+    ...(doc.attributes && {
+      attributes: Object.keys(doc.attributes).reduce(
+        (acc, key) =>
+          [
+            // owner: Team:Uptime
+            'observability:enableNewSyntheticsView',
+          ].includes(key)
+            ? {
+                ...acc,
+              }
+            : {
+                ...acc,
+                [key]: doc.attributes[key],
+              },
+        {}
+      ),
+    }),
+    references: doc.references || [],
+  }),
 };

packages/kbn-es-query/src/kuery/node_types/wildcard.ts

@@ -23,7 +23,7 @@ function escapeRegExp(str: string) {
 
 // See https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
 function escapeQueryString(str: string) {
-  return str.replace(/[+-=&|><!(){}[\]^"~*?:\\/]/g, '\\$&'); // $& means the whole matched string
+  return str.replace(/[+\-=&|><!(){}[\]^"~*?:\\/]/g, '\\$&'); // $& means the whole matched string
 }
 
 export function isNode(node: KueryNode): node is KqlWildcardNode {

packages/kbn-guided-onboarding/src/components/landing_page/__snapshots__/guide_cards.test.tsx.snap

@@ -77,6 +77,8 @@ export const GuideCard = ({
   const progress = getProgressLabel(guideState);
   return (
     <EuiCard
+      // data-test-subj used for FS tracking
+      data-test-subj={card.telemetryId}
       isDisabled={isLoading}
       onClick={onClick}
       css={cardCss}

packages/kbn-guided-onboarding/src/components/landing_page/guide_card.tsx

@@ -33,26 +33,26 @@ export const guideCards: GuideCardConstants[] = [
     title: i18n.translate('guidedOnboardingPackage.gettingStarted.cards.appSearch.title', {
       defaultMessage: 'Build an application on top of Elasticsearch',
     }),
-    guideId: 'search',
-    telemetryId: 'guided-onboarding--search--application',
+    guideId: 'appSearch',
+    telemetryId: 'onboarding--search--application',
     order: 1,
   },
   {
     solution: 'search',
     title: i18n.translate('guidedOnboardingPackage.gettingStarted.cards.websiteSearch.title', {
       defaultMessage: 'Add search to my website',
     }),
-    guideId: 'search',
-    telemetryId: 'guided-onboarding--search--website',
+    guideId: 'websiteSearch',
+    telemetryId: 'onboarding--search--website',
     order: 4,
   },
   {
     solution: 'search',
     title: i18n.translate('guidedOnboardingPackage.gettingStarted.cards.databaseSearch.title', {
       defaultMessage: 'Search across databases and business systems',
     }),
-    guideId: 'search',
-    telemetryId: 'guided-onboarding--search--database',
+    guideId: 'databaseSearch',
+    telemetryId: 'onboarding--search--database',
     order: 7,
   },
   {
@@ -64,7 +64,7 @@ export const guideCards: GuideCardConstants[] = [
       appId: 'integrations',
       path: '/browse?q=log',
     },
-    telemetryId: 'guided-onboarding--observability--logs',
+    telemetryId: 'onboarding--observability--logs',
     order: 2,
   },
   {
@@ -76,7 +76,7 @@ export const guideCards: GuideCardConstants[] = [
       appId: 'home',
       path: '#/tutorial/apm',
     },
-    telemetryId: 'guided-onboarding--observability--apm',
+    telemetryId: 'onboarding--observability--apm',
     order: 5,
   },
   {
@@ -88,7 +88,7 @@ export const guideCards: GuideCardConstants[] = [
       appId: 'integrations',
       path: '/browse/os_system',
     },
-    telemetryId: 'guided-onboarding--observability--hosts',
+    telemetryId: 'onboarding--observability--hosts',
     order: 8,
   },
   {
@@ -100,7 +100,7 @@ export const guideCards: GuideCardConstants[] = [
       }
     ),
     guideId: 'kubernetes',
-    telemetryId: 'guided-onboarding--observability--kubernetes',
+    telemetryId: 'onboarding--observability--kubernetes',
     order: 11,
   },
   {
@@ -109,7 +109,7 @@ export const guideCards: GuideCardConstants[] = [
       defaultMessage: 'Detect threats in my data with SIEM',
     }),
     guideId: 'siem',
-    telemetryId: 'guided-onboarding--security--siem',
+    telemetryId: 'onboarding--security--siem',
     order: 3,
   },
   {
@@ -121,7 +121,7 @@ export const guideCards: GuideCardConstants[] = [
       appId: 'integrations',
       path: '/detail/endpoint/overview',
     },
-    telemetryId: 'guided-onboarding--security--hosts',
+    telemetryId: 'onboarding--security--hosts',
     order: 6,
   },
   {
@@ -133,7 +133,7 @@ export const guideCards: GuideCardConstants[] = [
       appId: 'integrations',
       path: '/detail/cloud_security_posture/overview',
     },
-    telemetryId: 'guided-onboarding--security--cloud',
+    telemetryId: 'onboarding--security--cloud',
     order: 9,
   },
 ].sort((cardA, cardB) => cardA.order - cardB.order) as GuideCardConstants[];

packages/kbn-guided-onboarding/src/components/landing_page/guide_cards.constants.ts

@@ -6,7 +6,13 @@
  * Side Public License, v 1.
  */
 
-export type GuideId = 'kubernetes' | 'siem' | 'search' | 'testGuide';
+export type GuideId =
+  | 'kubernetes'
+  | 'siem'
+  | 'appSearch'
+  | 'websiteSearch'
+  | 'databaseSearch'
+  | 'testGuide';
 
 type KubernetesStepIds = 'add_data' | 'view_dashboard' | 'tour_observability';
 type SiemStepIds = 'add_data' | 'rules' | 'alertsCases';

packages/kbn-guided-onboarding/src/types.ts

@@ -75,7 +75,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "cases-connector-mappings": "4b16d440af966e5d6e0fa33368bfa15d987a4b69",
         "cases-telemetry": "16e261e7378a72acd0806f18df92525dd1da4f37",
         "cases-user-actions": "f1b0dcfeb58a65e68b35c5e99ddee70e746a06c7",
-        "config": "e3f0408976dbdd453641f5699927b28b188f6b8c",
+        "config": "95d8ecc452186201a691e72ec154ba65dfc5cb98",
         "config-global": "b8f559884931609a349e129c717af73d23e7bc76",
         "connector_token": "fa5301aa5a2914795d3b1b82d0a49939444009da",
         "core-usage-stats": "f40a213da2c597b0de94e364a4326a5a1baa4ca9",

src/core/server/integration_tests/saved_objects/migrations/check_registered_types.test.ts

@@ -418,10 +418,6 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
-  'observability:enableNewSyntheticsView': {
-    type: 'boolean',
-    _meta: { description: 'Non-default value of setting.' },
-  },
   'observability:maxSuggestions': {
     type: 'integer',
     _meta: { description: 'Non-default value of setting.' },