Merge branch 'master' into add-default-for-threat-match

elastic · Nov 9, 2020 · 7bbc2a1 · 7bbc2a1
2 parents 6ac90aa + 97e2dc8
commit 7bbc2a1
Show file tree

Hide file tree

Showing 361 changed files with 7,838 additions and 6,589 deletions.
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -43,6 +43,9 @@ Changing these settings may disable features of the APM App.
 | `xpack.apm.enabled`
   | Set to `false` to disable the APM app. Defaults to `true`.
 
+| `xpack.apm.maxServiceEnvironments`
+  | Maximum number of unique service environments recognized by the UI. Defaults to `100`.
+
 | `xpack.apm.serviceMapFingerprintBucketSize`
   | Maximum number of unique transaction combinations sampled for generating service map focused on a specific service. Defaults to `100`.
 

diff --git a/package.json b/package.json
@@ -844,8 +844,8 @@
     "vinyl-fs": "^3.0.3",
     "wait-on": "^5.0.1",
     "watchpack": "^1.6.0",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.8.2",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^4.2.2",
     "write-pkg": "^4.0.0",
     "xml-crypto": "^2.0.0",