Merge branch 'master' into apm-update-header-layout

docs/development/core/public/kibana-plugin-core-public.overlaymodalopenoptions.maxwidth.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [OverlayModalOpenOptions](./kibana-plugin-core-public.overlaymodalopenoptions.md) &gt; [maxWidth](./kibana-plugin-core-public.overlaymodalopenoptions.maxwidth.md)
+
+## OverlayModalOpenOptions.maxWidth property
+
+<b>Signature:</b>
+
+```typescript
+maxWidth?: boolean | number | string;
+```

docs/development/core/public/kibana-plugin-core-public.overlaymodalopenoptions.md

@@ -18,4 +18,5 @@ export interface OverlayModalOpenOptions
 |  ["data-test-subj"](./kibana-plugin-core-public.overlaymodalopenoptions._data-test-subj_.md) | <code>string</code> |  |
 |  [className](./kibana-plugin-core-public.overlaymodalopenoptions.classname.md) | <code>string</code> |  |
 |  [closeButtonAriaLabel](./kibana-plugin-core-public.overlaymodalopenoptions.closebuttonarialabel.md) | <code>string</code> |  |
+|  [maxWidth](./kibana-plugin-core-public.overlaymodalopenoptions.maxwidth.md) | <code>boolean &#124; number &#124; string</code> |  |
 

docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.cleareditorstate.md

@@ -9,7 +9,7 @@ Clears the [editor state](./kibana-plugin-plugins-embeddable-public.embeddableed
 <b>Signature:</b>
 
 ```typescript
-clearEditorState(appId: string): void;
+clearEditorState(appId?: string): void;
 ```
 
 ## Parameters

src/core/public/overlays/modal/modal_service.tsx

@@ -101,6 +101,7 @@ export interface OverlayModalOpenOptions {
   className?: string;
   closeButtonAriaLabel?: string;
   'data-test-subj'?: string;
+  maxWidth?: boolean | number | string;
 }
 
 interface StartDeps {

src/core/public/public.api.md

@@ -979,6 +979,8 @@ export interface OverlayModalOpenOptions {
     className?: string;
     // (undocumented)
     closeButtonAriaLabel?: string;
+    // (undocumented)
+    maxWidth?: boolean | number | string;
 }
 
 // @public

src/dev/build/tasks/os_packages/create_os_package_tasks.ts

@@ -54,15 +54,13 @@ export const CreateDockerCentOS: Task = {
 
   async run(config, log, build) {
     await runDockerGenerator(config, log, build, {
-      ubi: false,
-      context: false,
       architecture: 'x64',
+      context: false,
       image: true,
     });
     await runDockerGenerator(config, log, build, {
-      ubi: false,
-      context: false,
       architecture: 'aarch64',
+      context: false,
       image: true,
     });
   },
@@ -74,9 +72,9 @@ export const CreateDockerUBI: Task = {
   async run(config, log, build) {
     if (!build.isOss()) {
       await runDockerGenerator(config, log, build, {
-        ubi: true,
-        context: false,
         architecture: 'x64',
+        context: false,
+        ubi: true,
         image: true,
       });
     }
@@ -88,7 +86,6 @@ export const CreateDockerContexts: Task = {
 
   async run(config, log, build) {
     await runDockerGenerator(config, log, build, {
-      ubi: false,
       context: true,
       image: false,
     });
@@ -99,6 +96,11 @@ export const CreateDockerContexts: Task = {
         context: true,
         image: false,
       });
+      await runDockerGenerator(config, log, build, {
+        ironbank: true,
+        context: true,
+        image: false,
+      });
     }
   },
 };

src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts

@@ -7,18 +7,18 @@
  */
 
 import { resolve } from 'path';
+import { readFileSync } from 'fs';
 
 import { ToolingLog } from '@kbn/dev-utils';
+import Mustache from 'mustache';
 
 import { compressTar, copyAll, mkdirp, write, Config } from '../../../lib';
 import { dockerfileTemplate } from './templates';
 import { TemplateContext } from './template_context';
 
 export async function bundleDockerFiles(config: Config, log: ToolingLog, scope: TemplateContext) {
-  log.info(
-    `Generating kibana${scope.imageFlavor}${scope.ubiImageFlavor} docker build context bundle`
-  );
-  const dockerFilesDirName = `kibana${scope.imageFlavor}${scope.ubiImageFlavor}-${scope.version}-docker-build-context`;
+  log.info(`Generating kibana${scope.imageFlavor} docker build context bundle`);
+  const dockerFilesDirName = `kibana${scope.imageFlavor}-${scope.version}-docker-build-context`;
   const dockerFilesBuildDir = resolve(scope.dockerBuildDir, dockerFilesDirName);
   const dockerFilesOutputDir = config.resolveFromTarget(`${dockerFilesDirName}.tar.gz`);
 
@@ -38,6 +38,17 @@ export async function bundleDockerFiles(config: Config, log: ToolingLog, scope:
   // dockerfiles folder
   await copyAll(resolve(scope.dockerBuildDir, 'bin'), resolve(dockerFilesBuildDir, 'bin'));
   await copyAll(resolve(scope.dockerBuildDir, 'config'), resolve(dockerFilesBuildDir, 'config'));
+  if (scope.ironbank) {
+    await copyAll(resolve(scope.dockerBuildDir), resolve(dockerFilesBuildDir), {
+      select: ['LICENSE'],
+    });
+    const templates = ['hardening_manifest.yml', 'README.md'];
+    for (const template of templates) {
+      const file = readFileSync(resolve(__dirname, 'templates/ironbank', template));
+      const output = Mustache.render(file.toString(), scope);
+      await write(resolve(dockerFilesBuildDir, template), output);
+    }
+  }
 
   // Compress dockerfiles dir created inside
   // docker build dir as output it as a target