Merge remote-tracking branch 'upstream/master' into task/endpoint-det…

…ails-to-ingest
elastic · Jun 15, 2020 · fe3b0ba · fe3b0ba
2 parents d9069b9 + 2a9fc23
commit fe3b0ba
Show file tree

Hide file tree

Showing 221 changed files with 49,047 additions and 71,914 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
-  ciStats.trackBuild {
-    githubPr.withDefaultPrComments {
+  githubPr.withDefaultPrComments {
+    ciStats.trackBuild {
       catchError {
         retryable.enable()
         parallel([
@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
         ])
       }
     }
+  }
 
-    if (params.NOTIFY_ON_FAILURE) {
-      slackNotifications.onFailure()
-      kibanaPipeline.sendMail()
-    }
+  if (params.NOTIFY_ON_FAILURE) {
+    slackNotifications.onFailure()
+    kibanaPipeline.sendMail()
   }
 }
diff --git a/...ins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/...ins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,19 +9,13 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache, fieldFormats: FieldFormatsStartCommon, onNotification: OnNotification, onError: OnError);
+constructor(id: string | undefined, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  id | <code>string &#124; undefined</code> |  |
-|  getConfig | <code>any</code> |  |
-|  savedObjectsClient | <code>SavedObjectsClientContract</code> |  |
-|  apiClient | <code>IIndexPatternsApiClient</code> |  |
-|  patternCache | <code>PatternCache</code> |  |
-|  fieldFormats | <code>FieldFormatsStartCommon</code> |  |
-|  onNotification | <code>OnNotification</code> |  |
-|  onError | <code>OnError</code> |  |
+|  { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(id, getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError)](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)(id, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 

diff --git a/docs/management/upgrade-assistant/index.asciidoc b/docs/management/upgrade-assistant/index.asciidoc
@@ -2,14 +2,16 @@
 [[upgrade-assistant]]
 == Upgrade Assistant
 
-The Upgrade Assistant helps you prepare for your upgrade to {es} 9.0. 
-To access the assistant, open the menu, then go to *Stack Management > {es} > 9.0 Upgrade Assistant*. 
+The Upgrade Assistant helps you prepare for your upgrade to the next major {es} version. 
+For example, if you are using 6.8, the Upgrade Assistant helps you to upgrade to 7.0. 
+To access the assistant, open the menu, then go to *Stack Management > {es} > Upgrade Assistant*.
 
 The assistant identifies the deprecated settings in your cluster and indices 
 and guides you through the process of resolving issues, including reindexing. 
 
-Before upgrading to Elasticsearch 9.0, make sure that you are using the final 
-8.x minor release to see the most up-to-date deprecation issues. 
+Before you upgrade, make sure that you are using the latest released minor 
+version of {es} to see the most up-to-date deprecation issues. 
+For example, if you want to upgrade to to 7.0, make sure that you are using 6.8.
 
 [float]
 === Reindexing

diff --git a/docs/user/index.asciidoc b/docs/user/index.asciidoc
@@ -12,22 +12,22 @@ include::security/securing-kibana.asciidoc[]
 
 include::discover.asciidoc[]
 
-include::visualize.asciidoc[]
-
 include::dashboard.asciidoc[]
 
 include::canvas.asciidoc[]
 
-include::graph/index.asciidoc[]
+include::{kib-repo-dir}/maps/index.asciidoc[]
 
 include::ml/index.asciidoc[]
 
-include::{kib-repo-dir}/maps/index.asciidoc[]
+include::graph/index.asciidoc[]
 
-include::{kib-repo-dir}/infrastructure/index.asciidoc[]
+include::visualize.asciidoc[]
 
 include::{kib-repo-dir}/logs/index.asciidoc[]
 
+include::{kib-repo-dir}/infrastructure/index.asciidoc[]
+
 include::{kib-repo-dir}/apm/index.asciidoc[]
 
 include::{kib-repo-dir}/uptime/index.asciidoc[]

diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[reporting-getting-started]]
-= Reporting from Kibana
+= Reporting
 
 [partintro]
 

diff --git a/package.json b/package.json
@@ -96,7 +96,6 @@
     "**/react": "^16.12.0",
     "**/react-test-renderer": "^16.12.0",
     "**/deepmerge": "^4.2.2",
-    "**/serialize-javascript": "^2.1.1",
     "**/fast-deep-equal": "^3.1.1"
   },
   "workspaces": {

diff --git a/packages/kbn-dev-utils/tooling_log/package.json b/packages/kbn-dev-utils/tooling_log/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "../target/tooling_log"
+}
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
@@ -23,7 +23,7 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "babel-loader": "^8.0.6",
-    "copy-webpack-plugin": "^5.0.4",
+    "copy-webpack-plugin": "^6.0.2",
     "css-loader": "^3.4.2",
     "del": "^5.1.0",
     "getopts": "^2.2.4",

diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
@@ -14,7 +14,7 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
-    "@types/compression-webpack-plugin": "^2.0.1",
+    "@types/compression-webpack-plugin": "^2.0.2",
     "@types/estree": "^0.0.44",
     "@types/loader-utils": "^1.1.3",
     "@types/watchpack": "^1.1.5",
@@ -24,7 +24,7 @@
     "autoprefixer": "^9.7.4",
     "babel-loader": "^8.0.6",
     "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^3.1.0",
+    "compression-webpack-plugin": "^4.0.0",
     "cpy": "^8.0.0",
     "css-loader": "^3.4.2",
     "del": "^5.1.0",

diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -342,11 +342,13 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
         algorithm: 'brotliCompress',
         filename: '[path].br',
         test: /\.(js|css)$/,
+        cache: false,
       }),
       new CompressionPlugin({
         algorithm: 'gzip',
         filename: '[path].gz',
         test: /\.(js|css)$/,
+        cache: false,
       }),
     ],