Merge branch 'master' into fullscreen-filters

.github/CODEOWNERS

@@ -132,6 +132,9 @@
 /x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
 /x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
 /x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
+/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
+/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
+/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 
 # Design
 **/*.scss  @elastic/kibana-design

docs/development/core/server/kibana-plugin-server.uisettingsparams.deprecation.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) &gt; [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md)
+
+## UiSettingsParams.deprecation property
+
+optional deprecation information. Used to generate a deprecation warning.
+
+<b>Signature:</b>
+
+```typescript
+deprecation?: DeprecationSettings;
+```

docs/development/core/server/kibana-plugin-server.uisettingsparams.md

@@ -17,6 +17,7 @@ export interface UiSettingsParams
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [category](./kibana-plugin-server.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
+|  [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
 |  [description](./kibana-plugin-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
 |  [name](./kibana-plugin-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
 |  [optionLabels](./kibana-plugin-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |

docs/user/security/reporting.asciidoc

@@ -125,23 +125,33 @@ the {reporting} endpoints to authorized users. This requires that you:
 
 . Enable {security} on your {es} cluster. For more information,
 see {ref}/security-getting-started.html[Getting Started with Security].
-. Configure an SSL certificate for Kibana. For more information, see
-<<using-kibana-with-security>>.
-. Configure {watcher} to trust the Kibana server's certificate by adding it to
-the {watcher} truststore on each node:
-.. Import the {kib} server certificate into the {watcher} truststore using
-Java Keytool:
+. Configure TLS/SSL encryption for the {kib} server. For more information, see
+<<configuring-tls>>.
+. Specify the {kib} server's CA certificate chain in `elasticsearch.yml`:
 +
-[source,shell]
----------------------------------------------------------
-keytool -importcert -keystore watcher-truststore.jks -file server.crt
----------------------------------------------------------
-+
-NOTE: If the truststore doesn't already exist, it is created.
+--
+If you are using your own CA to sign the {kib} server certificate, then you need
+to specify the CA certificate chain in {es} to properly establish trust in TLS
+connections between {watcher} and {kib}. If your CA certificate chain is
+contained in a PKCS #12 trust store, specify it like so:
+
+[source,yaml]
+--------------------------------------------------------------------------------
+xpack.http.ssl.truststore.path: "/path/to/your/truststore.p12"
+xpack.http.ssl.truststore.type: "PKCS12"
+xpack.http.ssl.truststore.password: "optional decryption password"
+--------------------------------------------------------------------------------
+
+Otherwise, if your CA certificate chain is in PEM format, specify it like so:
+
+[source,yaml]
+--------------------------------------------------------------------------------
+xpack.http.ssl.certificate_authorities: ["/path/to/your/cacert1.pem", "/path/to/your/cacert2.pem"]
+--------------------------------------------------------------------------------
+
+For more information, see {ref}/notification-settings.html#ssl-notification-settings[the {watcher} HTTP TLS/SSL Settings].
+--
 
-.. Make sure the `xpack.http.ssl.truststore.path` setting in
-`elasticsearch.yml` specifies the location of the {watcher}
-truststore.
 . Add one or more users who have the permissions
 necessary to use {kib} and {reporting}. For more information, see
 <<secure-reporting>>.

package.json

@@ -118,7 +118,7 @@
     "@elastic/charts": "^16.1.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "17.3.1",
+    "@elastic/eui": "18.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -163,7 +163,6 @@
     "compare-versions": "3.5.1",
     "core-js": "^3.2.1",
     "css-loader": "2.1.1",
-    "custom-event-polyfill": "^0.3.0",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
     "deep-freeze-strict": "^1.1.1",
@@ -254,6 +253,7 @@
     "rison-node": "1.0.2",
     "rxjs": "^6.5.3",
     "script-loader": "0.7.2",
+    "seedrandom": "^3.0.5",
     "semver": "^5.5.0",
     "style-it": "^2.1.3",
     "style-loader": "0.23.1",
@@ -365,7 +365,7 @@
     "@types/semver": "^5.5.0",
     "@types/sinon": "^7.0.13",
     "@types/strip-ansi": "^3.0.0",
-    "@types/styled-components": "^4.4.1",
+    "@types/styled-components": "^4.4.2",
     "@types/supertest": "^2.0.5",
     "@types/supertest-as-promised": "^2.0.38",
     "@types/testing-library__react": "^9.1.2",

packages/kbn-spec-to-console/lib/convert.js

@@ -24,10 +24,16 @@ const convertParts = require('./convert/parts');
 
 module.exports = spec => {
   const result = {};
-  // TODO:
-  // Since https://github.com/elastic/elasticsearch/pull/42346 has been merged into ES master
-  // the JSON doc specification has been updated. We need to update this script to take advantage
-  // of the added information but it will also require updating console's editor autocomplete.
+  /**
+   * TODO:
+   * Since https://github.com/elastic/elasticsearch/pull/42346 has been merged into ES master
+   * the JSON doc specification has been updated. We need to update this script to take advantage
+   * of the added information but it will also require updating console editor autocomplete.
+   *
+   * Note: for now we exclude all deprecated patterns from the generated spec to prevent them
+   * from being used in autocompletion. It would be really nice if we could use this information
+   * instead of just not including it.
+   */
   Object.keys(spec).forEach(api => {
     const source = spec[api];
     if (!source.url) {
@@ -46,8 +52,10 @@ module.exports = spec => {
     const urlComponents = {};
 
     if (source.url.paths) {
-      patterns = convertPaths(source.url.paths);
-      source.url.paths.forEach(pathsObject => {
+      // We filter out all deprecated url patterns here.
+      const paths = source.url.paths.filter(path => !path.deprecated);
+      patterns = convertPaths(paths);
+      paths.forEach(pathsObject => {
         pathsObject.methods.forEach(method => methodSet.add(method));
         if (pathsObject.parts) {
           for (const partName of Object.keys(pathsObject.parts)) {

packages/kbn-ui-shared-deps/entry.js

@@ -17,6 +17,9 @@
  * under the License.
  */
 
+// import global polyfills before everything else
+require('./polyfills');
+
 // must load before angular
 export const Jquery = require('jquery');
 window.$ = window.jQuery = Jquery;

packages/kbn-ui-shared-deps/package.json

@@ -9,12 +9,15 @@
     "kbn:watch": "node scripts/build --watch"
   },
   "devDependencies": {
-    "@elastic/eui": "17.3.1",
+    "@elastic/eui": "18.0.0",
     "@elastic/charts": "^16.1.0",
     "@kbn/dev-utils": "1.0.0",
     "@yarnpkg/lockfile": "^1.1.0",
+    "abortcontroller-polyfill": "^1.3.0",
     "angular": "^1.7.9",
+    "core-js": "^3.2.1",
     "css-loader": "^2.1.1",
+    "custom-event-polyfill": "^0.3.0",
     "del": "^5.1.0",
     "jquery": "^3.4.1",
     "mini-css-extract-plugin": "0.8.0",
@@ -24,6 +27,9 @@
     "react-intl": "^2.8.0",
     "react": "^16.12.0",
     "read-pkg": "^5.2.0",
-    "webpack": "4.41.0"
+    "regenerator-runtime": "^0.13.3",
+    "symbol-observable": "^1.2.0",
+    "webpack": "4.41.0",
+    "whatwg-fetch": "^3.0.0"
   }
 }

packages/kbn-ui-shared-deps/polyfills.js

@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('core-js/stable');
+require('regenerator-runtime/runtime');
+require('custom-event-polyfill');
+require('whatwg-fetch');
+require('abortcontroller-polyfill/dist/polyfill-patch-fetch');
+require('./vendor/childnode_remove_polyfill');
+require('symbol-observable');

webpackShims/childnode-remove-polyfill.js → packages/kbn-ui-shared-deps/vendor/childnode_remove_polyfill.js

@@ -1,21 +1,4 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+/* eslint-disable @kbn/eslint/require-license-header */
 
 /* @notice
  * This product bundles childnode-remove which is available under a

src/core/public/chrome/chrome_service.tsx

@@ -127,7 +127,7 @@ export class ChromeService {
         )
       )
     );
-    this.isVisible$ = combineLatest(this.appHidden$, this.toggleHidden$).pipe(
+    this.isVisible$ = combineLatest([this.appHidden$, this.toggleHidden$]).pipe(
       map(([appHidden, toggleHidden]) => !(appHidden || toggleHidden)),
       takeUntil(this.stop$)
     );

src/core/public/chrome/ui/header/header.tsx

@@ -57,7 +57,7 @@ import {
 } from '../..';
 import { HttpStart } from '../../../http';
 import { ChromeHelpExtension } from '../../chrome_service';
-import { ApplicationStart, InternalApplicationStart } from '../../../application/types';
+import { InternalApplicationStart } from '../../../application/types';
 
 // Providing a buffer between the limit and the cut off index
 // protects from truncating just the last couple (6) characters
@@ -108,7 +108,7 @@ function extendRecentlyAccessedHistoryItem(
   };
 }
 
-function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['getUrlForApp']) {
+function extendNavLink(navLink: ChromeNavLink) {
   if (navLink.legacy) {
     return {
       ...navLink,
@@ -118,7 +118,7 @@ function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['getU
 
   return {
     ...navLink,
-    href: urlForApp(navLink.id),
+    href: navLink.baseUrl,
   };
 }
 
@@ -229,9 +229,7 @@ class HeaderUI extends Component<Props, State> {
           appTitle,
           isVisible,
           forceNavigation,
-          navLinks: navLinks.map(navLink =>
-            extendNavLink(navLink, this.props.application.getUrlForApp)
-          ),
+          navLinks: navLinks.map(extendNavLink),
           recentlyAccessed: recentlyAccessed.map(ra =>
             extendRecentlyAccessedHistoryItem(navLinks, ra, this.props.basePath)
           ),

src/core/public/doc_links/doc_links_service.ts

@@ -115,6 +115,9 @@ export class DocLinksService {
         date: {
           dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
         },
+        management: {
+          kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
+        },
       },
     });
   }