Merge branch 'main' into elastic#3379

.buildkite/pipelines/artifacts.yml

@@ -95,7 +95,10 @@ steps:
   - command: KIBANA_DOCKER_CONTEXT=chainguard .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
-      queue: n2-2
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-qa
+      provider: gcp
+      machineType: n2-standard-2
     timeout_in_minutes: 30
     retry:
       automatic:

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -35,8 +35,7 @@ node scripts/build \
   --skip-docker-chainguard \
   --skip-docker-ubi \
   --skip-docker-fips \
-  --skip-docker-cloud \
-  --skip-docker-contexts
+  --skip-docker-cloud
 
 echo "--- Tag images"
 docker rmi "$KIBANA_IMAGE"
@@ -102,8 +101,9 @@ ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/val
 echo "--- Upload archives"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
-buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
-buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
+buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-build-context.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
 buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
 

.github/CODEOWNERS

@@ -1565,6 +1565,7 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout  @elastic/
 ## Security Solution sub teams - security-defend-workflows
 /x-pack/plugins/security_solution/public/management/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/public/common/lib/endpoint*/ @elastic/security-defend-workflows
+/x-pack/plugins/security_solution/public/common/components/agents/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/public/common/components/endpoint/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/common/endpoint/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/server/endpoint/ @elastic/security-defend-workflows

fleet_packages.json

@@ -56,6 +56,6 @@
   },
   {
     "name": "security_detection_engine",
-    "version": "8.13.6"
+    "version": "8.14.1"
   }
 ]

packages/kbn-reporting/public/reporting_api_client.ts

@@ -21,6 +21,7 @@ import { BaseParams, JobId, ManagementLinkFn, ReportApiJSON } from '@kbn/reporti
 import rison from '@kbn/rison';
 import moment from 'moment';
 import { stringify } from 'query-string';
+import { ReactElement } from 'react';
 import { Job } from '.';
 import { jobCompletionNotifications } from './job_completion_notifications';
 
@@ -41,7 +42,10 @@ interface IReportingAPI {
   // Helpers
   getReportURL(jobId: string): string;
   getReportingPublicJobPath<T>(exportType: string, jobParams: BaseParams & T): string; // Return a URL to queue a job, with the job params encoded in the query string of the URL. Used for copying POST URL
-  createReportingJob<T>(exportType: string, jobParams: BaseParams & T): Promise<Job | undefined>; // Sends a request to queue a job, with the job params in the POST body
+  createReportingJob<T>(
+    exportType: string,
+    jobParams: BaseParams & T
+  ): Promise<Job | undefined | ReactElement>; // Sends a request to queue a job, with the job params in the POST body
   getServerBasePath(): string; // Provides the raw server basePath to allow it to be stripped out from relativeUrls in job params
 
   // CRUD
@@ -172,6 +176,20 @@ export class ReportingAPIClient implements IReportingAPI {
     return `${this.http.basePath.prepend(PUBLIC_ROUTES.GENERATE_PREFIX)}/${exportType}?${params}`;
   }
 
+  public async createReportingShareJob(exportType: string, jobParams: BaseParams) {
+    const jobParamsRison = rison.encode(jobParams);
+    const resp: { job?: ReportApiJSON } | undefined = await this.http.post(
+      `${INTERNAL_ROUTES.GENERATE_PREFIX}/${exportType}`,
+      {
+        method: 'POST',
+        body: JSON.stringify({ jobParams: jobParamsRison }),
+      }
+    );
+    if (resp?.job) {
+      this.addPendingJobId(resp.job.id);
+      return new Job(resp.job);
+    }
+  }
   /**
    * Calls the internal API to generate a report job on-demand
    */
@@ -192,7 +210,7 @@ export class ReportingAPIClient implements IReportingAPI {
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error(err);
-      throw new Error('invalid response!');
+      throw new Error(`${err.body?.message}`);
     }
   }
 

packages/kbn-reporting/public/share/index.ts

@@ -6,10 +6,8 @@
  * Side Public License, v 1.
  */
 
-export { getSharedComponents } from './shared';
 export { reportingExportModalProvider } from './share_context_menu/register_pdf_png_modal_reporting';
-export { reportingScreenshotShareProvider } from './share_context_menu/register_pdf_png_reporting';
-export { reportingCsvShareProvider } from './share_context_menu/register_csv_reporting';
 export { reportingCsvShareProvider as reportingCsvShareModalProvider } from './share_context_menu/register_csv_modal_reporting';
-export type { ReportingPublicComponents } from './shared/get_shared_components';
 export type { JobParamsProviderOptions, StartServices } from './share_context_menu';
+export { getSharedComponents } from './shared';
+export type { ReportingPublicComponents } from './shared';

packages/kbn-reporting/public/share/share_context_menu/index.ts

@@ -53,6 +53,6 @@ export interface ReportingSharingData {
 
 export interface JobParamsProviderOptions {
   sharingData: ReportingSharingData;
-  shareableUrl: string;
+  shareableUrl?: string;
   objectType: string;
 }

packages/kbn-reporting/public/share/share_context_menu/register_csv_modal_reporting.tsx

@@ -85,7 +85,7 @@ export const reportingCsvShareProvider = ({
     const generateReportingJobCSV = ({ intl }: { intl: InjectedIntl }) => {
       const decoratedJobParams = apiClient.getDecoratedJobParams(getJobParams());
       return apiClient
-        .createReportingJob(reportType, decoratedJobParams)
+        .createReportingShareJob(reportType, decoratedJobParams)
         .then(() => firstValueFrom(startServices$))
         .then(([startServices]) => {
           toasts.addSuccess({
@@ -122,7 +122,10 @@ export const reportingCsvShareProvider = ({
               id: 'reporting.share.modalContent.notification.reportingErrorTitle',
               defaultMessage: 'Unable to create report',
             }),
-            toastMessage: error.body?.message,
+            toastMessage: (
+              // eslint-disable-next-line react/no-danger
+              <span dangerouslySetInnerHTML={{ __html: error.body?.message }} />
+            ) as unknown as string,
           });
         });
     };
@@ -154,7 +157,7 @@ export const reportingCsvShareProvider = ({
         helpText: (
           <FormattedMessage
             id="reporting.share.csv.reporting.helpTextCSV"
-            defaultMessage="Export a CSV of this {objectType}"
+            defaultMessage="Export a CSV of this {objectType}."
             values={{ objectType }}
           />
         ),
@@ -165,14 +168,14 @@ export const reportingCsvShareProvider = ({
           dataTestSubj: 'shareReportingCopyURL',
           label: 'Post URL',
         },
-        generateReportButton: (
+        generateExportButton: (
           <FormattedMessage
             id="reporting.share.generateButtonLabelCSV"
             data-test-subj="generateReportButton"
             defaultMessage="Generate CSV"
           />
         ),
-        generateReport: generateReportingJobCSV,
+        generateExport: generateReportingJobCSV,
         generateCopyUrl: reportingUrl,
         absoluteUrl,
         renderCopyURLButton: true,

packages/kbn-reporting/public/share/share_context_menu/register_pdf_png_modal_reporting.tsx

@@ -330,10 +330,13 @@ export const reportingExportModalProvider = ({
     };
 
     const generateReportPNG = ({ intl }: { intl: InjectedIntl }) => {
-      const el = document.querySelector('[data-shared-items-container]');
-      const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
-      const dimensions = { height, width };
-
+      const { layout: outerLayout } = getJobParams(jobProviderOptions, 'pngV2')();
+      let dimensions = outerLayout?.dimensions;
+      if (!dimensions) {
+        const el = document.querySelector('[data-shared-items-container]');
+        const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
+        dimensions = { height, width };
+      }
       const decoratedJobParams = apiClient.getDecoratedJobParams({
         ...getJobParams(jobProviderOptions, 'pngV2')(),
         layout: { id: 'preserve_layout', dimensions },
@@ -393,20 +396,19 @@ export const reportingExportModalProvider = ({
         ['data-test-subj']: 'imageExports',
       },
       label: 'PDF' as const,
-      generateReport: generateReportPDF,
+      generateExport: generateReportPDF,
       reportType: 'printablePdfV2',
       requiresSavedState,
       helpText: (
         <FormattedMessage
           id="reporting.printablePdfV2.helpText"
-          defaultMessage="Exports can take a few minutes to generate."
+          defaultMessage="Select the file type you would like to export for this visualization."
         />
       ),
-      generateReportButton: (
+      generateExportButton: (
         <FormattedMessage
           id="reporting.printablePdfV2.generateButtonLabel"
-          data-test-subj="generateReportButton"
-          defaultMessage="Generate export"
+          defaultMessage="Export file"
         />
       ),
       layoutOption: objectType === 'dashboard' ? ('print' as const) : undefined,
@@ -425,21 +427,17 @@ export const reportingExportModalProvider = ({
         ['data-test-subj']: 'imageExports',
       },
       label: 'PNG' as const,
-      generateReport: generateReportPNG,
+      generateExport: generateReportPNG,
       reportType: 'pngV2',
       requiresSavedState,
       helpText: (
         <FormattedMessage
           id="reporting.pngV2.helpText"
-          defaultMessage="Exports can take a few minutes to generate."
+          defaultMessage="Select the file type you would like to export for this visualization."
         />
       ),
-      generateReportButton: (
-        <FormattedMessage
-          id="reporting.pngV2.generateButtonLabel"
-          defaultMessage="Generate export"
-          data-test-subj="generateReportButton"
-        />
+      generateExportButton: (
+        <FormattedMessage id="reporting.pngV2.generateButtonLabel" defaultMessage="Export file" />
       ),
       layoutOption: objectType === 'dashboard' ? ('print' as const) : undefined,
       renderCopyURLButton: true,