Merge remote-tracking branch 'upstream/master' into ftr/set-browser-d…

…ownload-folder

.backportrc.json

@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.8",
     "7.7",
     "7.6",
     "7.5",

renovate.json5

@@ -771,6 +771,14 @@
           '@types/podium',
         ],
       },
+      {
+        groupSlug: 'pretty-ms',
+        groupName: 'pretty-ms related packages',
+        packageNames: [
+          'pretty-ms',
+          '@types/pretty-ms',
+        ],
+      },
       {
         groupSlug: 'proper-lockfile',
         groupName: 'proper-lockfile related packages',
@@ -864,6 +872,14 @@
           '@types/sinon',
         ],
       },
+      {
+        groupSlug: 'stats-lite',
+        groupName: 'stats-lite related packages',
+        packageNames: [
+          'stats-lite',
+          '@types/stats-lite',
+        ],
+      },
       {
         groupSlug: 'storybook',
         groupName: 'storybook related packages',

src/core/MIGRATION.md

@@ -990,6 +990,9 @@ ls -lh plugins/my_plugin/target/public/
 you might see at least one js bundle - `my_plugin.plugin.js`. This is the only artifact loaded by the platform during bootstrap in the browser. The rule of thumb is to keep its size as small as possible.
 Other lazily loaded parts of your plugin present in the same folder as separate chunks under `{number}.plugin.js` names.
 If you want to investigate what your plugin bundle consists of you need to run `@kbn/optimizer` with `--profile` flag to get generated [webpack stats file](https://webpack.js.org/api/stats/).
+```bash
+node scripts/build_kibana_platform_plugins.js --dist --no-examples --profile
+```
 Many OSS tools are allowing you to analyze generated stats file
 - [an official tool](http://webpack.github.io/analyse/#modules) from webpack authors
 - [webpack-visualizer](https://chrisbateman.github.io/webpack-visualizer/)

src/core/server/metrics/integration_tests/server_collector.test.ts

@@ -185,18 +185,22 @@ describe('ServerMetricsCollector', () => {
     let metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(0);
 
-    sendGet('/').end(() => null);
+    // supertest requests are executed when calling `.then` (or awaiting them).
+    // however in this test we need to send the request now and await for it later in the code.
+    // also using `.end` is not possible as it would execute the request twice.
+    // so the only option is this noop `.then`.
+    const res1 = sendGet('/').then(res => res);
     await waitForHits(1);
     metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(1);
 
-    sendGet('/').end(() => null);
+    const res2 = sendGet('/').then(res => res);
     await waitForHits(2);
     metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(2);
 
     waitSubject.next('go');
-    await delay(requestWaitDelay);
+    await Promise.all([res1, res2]);
     metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(0);
   });

src/plugins/discover/public/application/angular/_index.scss

@@ -1,3 +1,2 @@
 @import 'directives/index';
-@import 'doc_table/index';
 @import 'context/index';

src/plugins/discover/public/application/angular/doc_table/_doc_table.scss

@@ -2,6 +2,7 @@
  * 1. Stack content vertically so the table can scroll when its constrained by a fixed container height.
  */
 doc-table {
+  @include euiScrollBar;
   overflow: auto;
   flex: 1 1 100%;
   flex-direction: column; /* 1 */

src/plugins/discover/public/application/angular/doc_table/doc_table.ts

@@ -22,6 +22,7 @@ import { dispatchRenderComplete } from '../../../../../kibana_utils/public';
 // @ts-ignore
 import { getLimitedSearchResultsMessage } from './doc_table_strings';
 import { getServices } from '../../../kibana_services';
+import './index.scss';
 
 export interface LazyScope extends ng.IScope {
   [key: string]: any;

src/plugins/discover/public/application/angular/doc_table/_index.scss → src/plugins/discover/public/application/angular/doc_table/index.scss

@@ -1,2 +1,4 @@
+@import '../../mixins';
+
 @import 'doc_table';
 @import 'components/index';

src/plugins/discover/public/application/components/doc_viewer/doc_viewer.tsx

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './doc_viewer.scss';
 import React from 'react';
 import { EuiTabbedContent } from '@elastic/eui';
 import { getDocViewsRegistry } from '../../../kibana_services';

src/plugins/discover/public/application/components/fetch_error/fetch_error.tsx

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './fetch_error.scss';
 import React, { Fragment } from 'react';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiCodeBlock, EuiSpacer } from '@elastic/eui';

src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './discover_sidebar.scss';
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonIcon, EuiTitle } from '@elastic/eui';

src/plugins/discover/public/application/embeddable/search_embeddable.ts

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './search_embeddable.scss';
 import angular from 'angular';
 import _ from 'lodash';
 import * as Rx from 'rxjs';

src/plugins/discover/public/application/index.scss

@@ -10,6 +10,4 @@
 //   monChart__legend--small
 //   monChart__legend-isLoading
 
-@import 'components/index';
 @import 'angular/index';
-@import 'embeddable/index';

src/plugins/visualizations/public/embeddable/visualize_embeddable.ts

@@ -340,13 +340,14 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       this.abortController.abort();
     }
     this.abortController = new AbortController();
+    const abortController = this.abortController;
     this.expression = await buildPipeline(this.vis, {
       timefilter: this.timefilter,
       timeRange: this.timeRange,
       abortSignal: this.abortController!.signal,
     });
 
-    if (this.handler) {
+    if (this.handler && !abortController.signal.aborted) {
       this.handler.update(this.expression, expressionParams);
     }
   }

test/functional/apps/visualize/_tsvb_chart.ts

@@ -29,6 +29,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker', 'visChart']);
 
   describe('visual builder', function describeIndexTests() {
+    this.tags('includeFirefox');
     beforeEach(async () => {
       await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
       await PageObjects.visualize.navigateToNewVisualization();

test/scripts/jenkins_xpack_build_kibana.sh

@@ -7,7 +7,9 @@ echo " -> building kibana platform plugins"
 node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
+  --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
+  --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
   --verbose;
 
 # doesn't persist, also set in kibanaPipeline.groovy

x-pack/index.js

@@ -12,7 +12,6 @@ import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { maps } from './legacy/plugins/maps';
 import { spaces } from './legacy/plugins/spaces';
-import { taskManager } from './legacy/plugins/task_manager';
 import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
 import { ingestManager } from './legacy/plugins/ingest_manager';
 
@@ -26,7 +25,6 @@ module.exports = function(kibana) {
     dashboardMode(kibana),
     beats(kibana),
     maps(kibana),
-    taskManager(kibana),
     encryptedSavedObjects(kibana),
     ingestManager(kibana),
   ];

x-pack/package.json

@@ -115,6 +115,8 @@
     "@types/uuid": "^3.4.4",
     "@types/xml-crypto": "^1.4.0",
     "@types/xml2js": "^0.4.5",
+    "@types/stats-lite": "^2.2.0",
+    "@types/pretty-ms": "^5.0.0",
     "@welldone-software/why-did-you-render": "^4.0.0",
     "abab": "^1.0.4",
     "axios": "^0.19.0",

x-pack/plugins/actions/server/action_type_registry.test.ts

@@ -71,6 +71,19 @@ describe('register()', () => {
     `);
   });
 
+  test('shallow clones the given action type', () => {
+    const myType: ActionType = {
+      id: 'my-action-type',
+      name: 'My action type',
+      minimumLicenseRequired: 'basic',
+      executor,
+    };
+    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+    actionTypeRegistry.register(myType);
+    myType.name = 'Changed';
+    expect(actionTypeRegistry.get('my-action-type').name).toEqual('My action type');
+  });
+
   test('throws error if action type already registered', () => {
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({

x-pack/plugins/actions/server/action_type_registry.ts

@@ -91,7 +91,7 @@ export class ActionTypeRegistry {
         )
       );
     }
-    this.actionTypes.set(actionType.id, actionType);
+    this.actionTypes.set(actionType.id, { ...actionType });
     this.taskManager.registerTaskDefinitions({
       [`actions:${actionType.id}`]: {
         title: actionType.name,

x-pack/plugins/actions/server/plugin.ts

@@ -177,15 +177,15 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
 
     const usageCollection = plugins.usageCollection;
     if (usageCollection) {
+      initializeActionsTelemetry(
+        this.telemetryLogger,
+        plugins.taskManager,
+        core,
+        await this.kibanaIndex
+      );
+
       core.getStartServices().then(async ([, startPlugins]) => {
         registerActionsUsageCollector(usageCollection, startPlugins.taskManager);
-
-        initializeActionsTelemetry(
-          this.telemetryLogger,
-          plugins.taskManager,
-          core,
-          await this.kibanaIndex
-        );
       });
     }