Merge branch 'master' into issue-78260-new-session-pki-kerberos

Author: azasypkin

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`.
 

package.json

@@ -237,6 +237,7 @@
     "markdown-it": "^10.0.0",
     "md5": "^2.1.0",
     "mime": "^2.4.4",
+    "mime-types": "^2.1.27",
     "mini-css-extract-plugin": "0.8.0",
     "minimatch": "^3.0.4",
     "moment": "^2.24.0",
@@ -843,15 +844,13 @@
     "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",
     "xmlbuilder": "13.0.2",
     "yargs": "^15.4.1",
-    "yeoman-generator": "1.1.1",
-    "yo": "2.0.6",
     "zlib": "^1.0.5"
   }
-}
+}