Merge remote-tracking branch 'elastic/master' into alerting/action_ex…

…ecution_starts

docs/management/rollups/create_and_manage_rollups.asciidoc

@@ -2,6 +2,7 @@
 [[data-rollups]]
 == Rollup Jobs
 
+experimental::[]
 
 A rollup job is a periodic task that aggregates data from indices specified
 by an index pattern, and then rolls it into a new index. Rollup indices are a good way to

packages/kbn-es-archiver/src/actions/empty_kibana_index.ts

@@ -22,9 +22,8 @@ export async function emptyKibanaIndexAction({
   kbnClient: KbnClient;
 }) {
   const stats = createStats('emptyKibanaIndex', log);
-  const kibanaPluginIds = await kbnClient.plugins.getEnabledIds();
 
-  await cleanKibanaIndices({ client, stats, log, kibanaPluginIds });
+  await cleanKibanaIndices({ client, stats, log });
   await migrateKibanaIndex(kbnClient);
   stats.createdIndex('.kibana');
   return stats.toJSON();

packages/kbn-es-archiver/src/actions/unload.ts

@@ -37,7 +37,6 @@ export async function unloadAction({
 }) {
   const name = relative(REPO_ROOT, inputDir);
   const stats = createStats(name, log);
-  const kibanaPluginIds = await kbnClient.plugins.getEnabledIds();
 
   const files = prioritizeMappings(await readDirectory(inputDir));
   for (const filename of files) {
@@ -47,7 +46,7 @@ export async function unloadAction({
       createReadStream(resolve(inputDir, filename)) as Readable,
       ...createParseArchiveStreams({ gzip: isGzip(filename) }),
       createFilterRecordsStream('index'),
-      createDeleteIndexStream(client, stats, log, kibanaPluginIds),
+      createDeleteIndexStream(client, stats, log),
     ] as [Readable, ...Writable[]]);
   }
 

packages/kbn-es-archiver/src/lib/indices/delete_index_stream.test.ts

@@ -28,7 +28,7 @@ describe('esArchiver: createDeleteIndexStream()', () => {
 
     await createPromiseFromStreams([
       createListStream([createStubIndexRecord('index1')]),
-      createDeleteIndexStream(client, stats, log, []),
+      createDeleteIndexStream(client, stats, log),
     ]);
 
     sinon.assert.notCalled(stats.deletedIndex as sinon.SinonSpy);
@@ -43,7 +43,7 @@ describe('esArchiver: createDeleteIndexStream()', () => {
 
     await createPromiseFromStreams([
       createListStream([createStubIndexRecord('index1')]),
-      createDeleteIndexStream(client, stats, log, []),
+      createDeleteIndexStream(client, stats, log),
     ]);
 
     sinon.assert.calledOnce(stats.deletedIndex as sinon.SinonSpy);

packages/kbn-es-archiver/src/lib/indices/delete_index_stream.ts

@@ -14,12 +14,7 @@ import { Stats } from '../stats';
 import { deleteIndex } from './delete_index';
 import { cleanKibanaIndices } from './kibana_index';
 
-export function createDeleteIndexStream(
-  client: KibanaClient,
-  stats: Stats,
-  log: ToolingLog,
-  kibanaPluginIds: string[]
-) {
+export function createDeleteIndexStream(client: KibanaClient, stats: Stats, log: ToolingLog) {
   return new Transform({
     readableObjectMode: true,
     writableObjectMode: true,
@@ -29,7 +24,7 @@ export function createDeleteIndexStream(
           const { index } = record.value;
 
           if (index.startsWith('.kibana')) {
-            await cleanKibanaIndices({ client, stats, log, kibanaPluginIds });
+            await cleanKibanaIndices({ client, stats, log });
           } else {
             await deleteIndex({ client, stats, log, index });
           }

packages/kbn-es-archiver/src/lib/indices/kibana_index.ts

@@ -96,21 +96,11 @@ export async function cleanKibanaIndices({
   client,
   stats,
   log,
-  kibanaPluginIds,
 }: {
   client: KibanaClient;
   stats: Stats;
   log: ToolingLog;
-  kibanaPluginIds: string[];
 }) {
-  if (!kibanaPluginIds.includes('spaces')) {
-    return await deleteKibanaIndices({
-      client,
-      stats,
-      log,
-    });
-  }
-
   while (true) {
     const resp = await client.deleteByQuery(
       {

packages/kbn-storybook/package.json

@@ -11,6 +11,6 @@
   "scripts": {
     "build": "../../node_modules/.bin/tsc",
     "kbn:bootstrap": "yarn build",
-    "watch": "yarn build --watch"
+    "kbn:watch": "yarn build --watch"
   }
 }

packages/kbn-storybook/webpack.config.ts

@@ -71,11 +71,12 @@ export default function ({ config: storybookConfig }: { config: Configuration })
       ],
     },
     resolve: {
-      // Tell Webpack about the scss extension
-      extensions: ['.scss'],
+      extensions: ['.js', '.ts', '.tsx', '.json'],
+      mainFields: ['browser', 'main'],
       alias: {
         core_app_image_assets: resolve(REPO_ROOT, 'src/core/public/core_app/images'),
       },
+      symlinks: false,
     },
     stats,
   };

src/core/server/core_app/assets/fonts/inter/LICENSE.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2016-2020 The Inter Project Authors.
+"Inter" is trademark of Rasmus Andersson.
+https://github.com/rsms/inter
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

src/core/server/core_app/assets/fonts/readme.md

@@ -1,7 +1,8 @@
 ## Font usage
 
-Kibana packages two fonts:
+Kibana packages three fonts:
 
+* [Inter](https://rsms.me/inter/) fonts were pulled from their site and are at v3.18
 * [Inter UI](https://rsms.me/inter/) fonts were pulled from their site and are at v3.2
 * [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono) was pulled from the Google Fonts website on January 22, 2019.
 

src/core/server/rendering/rendering_service.tsx

@@ -78,6 +78,7 @@ export class RenderingService {
           locale: i18n.getLocale(),
           darkMode,
           stylesheetPaths,
+          themeVersion,
           injectedMetadata: {
             version: env.packageInfo.version,
             buildNumber: env.packageInfo.buildNum,

src/core/server/rendering/types.ts

@@ -24,6 +24,7 @@ export interface RenderingMetadata {
   i18n: typeof i18n.translate;
   locale: string;
   darkMode: boolean;
+  themeVersion?: string;
   stylesheetPaths: string[];
   injectedMetadata: {
     version: string;