Merge branch 'main' into fix-comment-flakiness

elastic · Jul 31, 2023 · 05ac68d · 05ac68d
2 parents 06620e9 + 3efb838
commit 05ac68d
Show file tree

Hide file tree

Showing 302 changed files with 7,747 additions and 4,012 deletions.
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -413,5 +413,6 @@ enabled:
   - x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts
   - x-pack/performance/journeys/dashboard_listing_page.ts
   - x-pack/performance/journeys/cloud_security_dashboard.ts
+  - x-pack/performance/journeys/apm_service_inventory.ts
   - x-pack/test/custom_branding/config.ts
   - x-pack/test/profiling_api_integration/cloud/config.ts
diff --git a/.buildkite/pipelines/pull_request/defend_workflows.yml b/.buildkite/pipelines/pull_request/defend_workflows.yml
@@ -8,8 +8,6 @@ steps:
     parallelism: 2
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:
@@ -24,8 +22,6 @@ steps:
     parallelism: 6
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:

diff --git a/.buildkite/pipelines/pull_request/osquery_cypress.yml b/.buildkite/pipelines/pull_request/osquery_cypress.yml
@@ -8,8 +8,6 @@ steps:
     parallelism: 6
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:

diff --git a/.buildkite/pipelines/pull_request/response_ops.yml b/.buildkite/pipelines/pull_request/response_ops.yml
@@ -8,7 +8,7 @@ steps:
     parallelism: 4
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
diff --git a/.buildkite/pipelines/pull_request/response_ops_cases.yml b/.buildkite/pipelines/pull_request/response_ops_cases.yml
@@ -7,7 +7,7 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
diff --git a/.buildkite/pipelines/pull_request/security_solution.yml b/.buildkite/pipelines/pull_request/security_solution.yml
@@ -1,14 +1,14 @@
 steps:
   - command: .buildkite/scripts/steps/functional/security_solution.sh
-    label: 'Security Solution Tests'
+    label: 'Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 60
-    parallelism: 7
+    parallelism: 10
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
diff --git a/.buildkite/pipelines/pull_request/security_solution_explore.yml b/.buildkite/pipelines/pull_request/security_solution_explore.yml
@@ -1,14 +1,14 @@
 steps:
   - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
-    label: 'Explore - Security Solution Tests'
+    label: 'Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 60
     parallelism: 2
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
diff --git a/.buildkite/pipelines/pull_request/security_solution_investigations.yml b/.buildkite/pipelines/pull_request/security_solution_investigations.yml
@@ -1,14 +1,14 @@
 steps:
   - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
-    label: 'Investigations - Security Solution Tests'
+    label: 'Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     parallelism: 4
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
diff --git a/.buildkite/pipelines/pull_request/threat_intelligence.yml b/.buildkite/pipelines/pull_request/threat_intelligence.yml
@@ -1,15 +1,13 @@
 steps:
   - command: .buildkite/scripts/steps/functional/threat_intelligence.sh
-    label: 'Threat Intelligence Tests'
+    label: 'Threat Intelligence Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     parallelism: 2
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:

diff --git a/.buildkite/scripts/steps/functional/security_solution.sh b/.buildkite/scripts/steps/functional/security_solution.sh
@@ -8,6 +8,6 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-security-solution-chrome
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
-echo "--- Security Solution tests (Chrome)"
+echo "--- Security Solution Cypress tests (Chrome)"
 
 yarn --cwd x-pack/plugins/security_solution cypress:run
diff --git a/.buildkite/scripts/steps/functional/threat_intelligence.sh b/.buildkite/scripts/steps/functional/threat_intelligence.sh
@@ -8,6 +8,6 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-threat-intelligence-chrome
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
-echo "--- Threat Intelligence tests (Chrome)"
+echo "--- Threat Intelligence Cypress tests (Chrome)"
 
 yarn --cwd x-pack/plugins/threat_intelligence cypress:run
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -492,6 +492,7 @@ x-pack/packages/ml/data_grid @elastic/ml-ui
 x-pack/packages/ml/date_picker @elastic/ml-ui
 x-pack/packages/ml/date_utils @elastic/ml-ui
 x-pack/packages/ml/error_utils @elastic/ml-ui
+x-pack/packages/ml/in_memory_table @elastic/ml-ui
 x-pack/packages/ml/is_defined @elastic/ml-ui
 x-pack/packages/ml/is_populated_object @elastic/ml-ui
 x-pack/packages/ml/kibana_theme @elastic/ml-ui
@@ -1071,6 +1072,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
 /x-pack/plugins/security_solution/public/detections/components/alerts_kpis @elastic/security-threat-hunting-investigations
 /x-pack/plugins/security_solution/public/detections/components/alerts_table @elastic/security-threat-hunting-investigations
 /x-pack/plugins/security_solution/public/detections/components/alerts_info @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/flyout @elastic/security-threat-hunting-investigations
 /x-pack/plugins/security_solution/public/resolver @elastic/security-threat-hunting-investigations
 /x-pack/plugins/security_solution/public/timelines @elastic/security-threat-hunting-investigations
 

diff --git a/api_docs/kbn_aiops_components.devdocs.json b/api_docs/kbn_aiops_components.devdocs.json
@@ -124,4 +124,4 @@
     "misc": [],
     "objects": []
   }
-}
+}
diff --git a/docs/settings/security-settings.asciidoc b/docs/settings/security-settings.asciidoc
@@ -210,7 +210,7 @@ Sets the interval at which {kib} tries to remove expired and invalid sessions fr
 +
 TIP: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
 
-xpack.security.session.сoncurrentSessions.maxSessions::
+xpack.security.session.concurrentSessions.maxSessions {ess-icon}::
 Set the maximum number of sessions each user is allowed to have active at any given time.
 By default, no limit is applied.
 If set, the value of this option should be an integer between `1` and `1000`.

diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "@elastic/apm-rum-react": "^1.4.3",
     "@elastic/charts": "59.1.0",
     "@elastic/datemath": "5.0.3",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.8.0-canary.2",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch@8.9.0",
     "@elastic/ems-client": "8.4.0",
     "@elastic/eui": "85.0.1",
     "@elastic/filesaver": "1.1.2",
@@ -508,6 +508,7 @@
     "@kbn/ml-date-picker": "link:x-pack/packages/ml/date_picker",
     "@kbn/ml-date-utils": "link:x-pack/packages/ml/date_utils",
     "@kbn/ml-error-utils": "link:x-pack/packages/ml/error_utils",
+    "@kbn/ml-in-memory-table": "link:x-pack/packages/ml/in_memory_table",
     "@kbn/ml-is-defined": "link:x-pack/packages/ml/is_defined",
     "@kbn/ml-is-populated-object": "link:x-pack/packages/ml/is_populated_object",
     "@kbn/ml-kibana-theme": "link:x-pack/packages/ml/kibana_theme",

diff --git a/packages/deeplinks/ml/deep_links.ts b/packages/deeplinks/ml/deep_links.ts
@@ -15,6 +15,7 @@ export type LinkId =
   | 'anomalyDetection'
   | 'anomalyExplorer'
   | 'singleMetricViewer'
+  | 'dataComparison'
   | 'dataFrameAnalytics'
   | 'resultExplorer'
   | 'analyticsMap'

diff --git a/packages/kbn-storybook/src/lib/decorators.tsx b/packages/kbn-storybook/src/lib/decorators.tsx
@@ -14,7 +14,7 @@ import 'core_styles';
 import { BehaviorSubject } from 'rxjs';
 import { CoreTheme } from '@kbn/core-theme-browser';
 import { I18nStart } from '@kbn/core-i18n-browser';
-import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
+import { KibanaRootContextProvider } from '@kbn/react-kibana-context-root';
 
 const theme$ = new BehaviorSubject<CoreTheme>({ darkMode: false });
 
@@ -34,9 +34,9 @@ const KibanaContextDecorator: DecoratorFn = (storyFn, { globals }) => {
   }, [colorMode]);
 
   return (
-    <KibanaRenderContextProvider {...{ theme: { theme$ }, i18n }}>
+    <KibanaRootContextProvider {...{ theme: { theme$ }, i18n }}>
       {storyFn()}
-    </KibanaRenderContextProvider>
+    </KibanaRootContextProvider>
   );
 };
 

diff --git a/packages/kbn-storybook/templates/index.ejs b/packages/kbn-storybook/templates/index.ejs
@@ -4,64 +4,74 @@
      We use this one instead because we want to add the @kbn/ui-shared-deps-* tags here.
   -->
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title><%= htmlWebpackPlugin.options.title || 'Storybook'%></title>
 
-    <% if (htmlWebpackPlugin.files.favicon) { %>
+<head>
+  <meta charset="utf-8" />
+  <title>
+    <%= htmlWebpackPlugin.options.title || 'Storybook' %>
+  </title>
+
+  <% if (htmlWebpackPlugin.files.favicon) { %>
     <link rel="shortcut icon" href="<%= htmlWebpackPlugin.files.favicon%>" />
     <% } %>
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-    <meta name="eui-global" />
-    <meta name="emotion" />
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <!-- Added for Kibana shared dependencies -->
-    <script>
-      window.__kbnPublicPath__ = { 'kbn-ui-shared-deps-npm': '', 'kbn-ui-shared-deps-src': '' };
-    </script>
-    <script src="kbn-ui-shared-deps-npm.dll.js"></script>
-    <script src="kbn-ui-shared-deps-src.js"></script>
-    <link href="kbn-ui-shared-deps-src.css" rel="stylesheet" />
-    <link id="eui-theme-css" href="kbn-ui-shared-deps-npm.v8.light.css" rel="stylesheet" />
-    <!--                                      -->
+      <meta name="eui-global" />
+      <meta name="eui-utilities" />
+      <meta name="emotion" />
 
-    <% if (typeof headHtmlSnippet !== 'undefined') { %> <%= headHtmlSnippet %> <% } %> <%
-    htmlWebpackPlugin.files.css.forEach(file => { %>
-    <link href="<%= file %>" rel="stylesheet" />
-    <% }); %>
+      <!-- Added for Kibana shared dependencies -->
+      <script>
+        window.__kbnPublicPath__ = { 'kbn-ui-shared-deps-npm': '', 'kbn-ui-shared-deps-src': '' };
+      </script>
+      <script src="kbn-ui-shared-deps-npm.dll.js"></script>
+      <script src="kbn-ui-shared-deps-src.js"></script>
+      <link href="kbn-ui-shared-deps-src.css" rel="stylesheet" />
+      <link id="eui-theme-css" href="kbn-ui-shared-deps-npm.v8.light.css" rel="stylesheet" />
+      <!--                                      -->
 
-    <style>
-      #root[hidden],
-      #docs-root[hidden] {
-        display: none !important;
-      }
-    </style>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Inter:slnt,wght@-10,300..700;0,300..700&family=Roboto+Mono:ital,wght@0,400..700;1,400..700&display=swap" rel="stylesheet">
-  </head>
-  <body>
-    <% if (typeof bodyHtmlSnippet !== 'undefined') { %>
-      <%= bodyHtmlSnippet %>
-    <% } %>
+      <% if (typeof headHtmlSnippet !=='undefined' ) { %>
+        <%= headHtmlSnippet %>
+          <% } %>
+            <% htmlWebpackPlugin.files.css.forEach(file=> { %>
+              <link href="<%= file %>" rel="stylesheet" />
+              <% }); %>
 
-    <div id="root"></div>
-    <div id="docs-root"></div>
+                <style>
+                  #root[hidden],
+                  #docs-root[hidden] {
+                    display: none !important;
+                  }
+                </style>
+                <link rel="preconnect" href="https://fonts.googleapis.com">
+                <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+                <link
+                  href="https://fonts.googleapis.com/css2?family=Inter:slnt,wght@-10,300..700;0,300..700&family=Roboto+Mono:ital,wght@0,400..700;1,400..700&display=swap"
+                  rel="stylesheet">
+</head>
 
-    <% if (typeof globals !== 'undefined' && Object.keys(globals).length) { %>
-      <script>
+<body>
+  <% if (typeof bodyHtmlSnippet !=='undefined' ) { %>
+    <%= bodyHtmlSnippet %>
+      <% } %>
+
+        <div id="root"></div>
+        <div id="docs-root"></div>
+
+        <% if (typeof globals !=='undefined' && Object.keys(globals).length) { %>
+          <script>
         <% for (var varName in globals) { %>
             <% if (globals[varName] != undefined) { %>
-              window['<%=varName%>'] = <%= JSON.stringify(globals[varName]) %>;
+                window['<%=varName%>'] = <%= JSON.stringify(globals[varName]) %>;
             <% } %>
         <% } %>
-      </script>
-    <% } %>
+          </script>
+          <% } %>
+
+            <% htmlWebpackPlugin.files.js.forEach(file=> { %>
+              <script src="<%= file %>"></script>
+              <% }); %>
+</body>
 
-    <% htmlWebpackPlugin.files.js.forEach(file => { %>
-      <script src="<%= file %>"></script>
-    <% }); %>
-  </body>
 </html>
diff --git a/packages/kbn-storybook/tsconfig.json b/packages/kbn-storybook/tsconfig.json
@@ -19,7 +19,7 @@
     "@kbn/core-theme-browser",
     "@kbn/i18n-react",
     "@kbn/core-i18n-browser",
-    "@kbn/react-kibana-context-render",
+    "@kbn/react-kibana-context-root",
   ],
   "exclude": [
     "target/**/*",

diff --git a/packages/react/kibana_context/styled/README.mdx b/packages/react/kibana_context/styled/README.mdx
@@ -13,3 +13,5 @@ Before `emotion` was introduced, some components used `styled-components` to eas
 
 It should _not_ be used in new code.
 
+**NOTE:** plugins cannot use `styled-components` and `emotion` at the same time, their Babel plugins conflict.  The EUI team has fielded many questions about this.  The best solution is to migrate to `emotion` and not use `styled-components`.
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,4 +124,4 @@ @@
         "misc": [],
         "objects": []
       }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ Before `emotion` was introduced, some components used `styled-components` to eas

		It should _not_ be used in new code.

		NOTE: plugins cannot use `styled-components` and `emotion` at the same time, their Babel plugins conflict. The EUI team has fielded many questions about this. The best solution is to migrate to `emotion` and not use `styled-components`.