Merge branch 'master' into fix/data-circular-deps

.github/CODEOWNERS

@@ -136,7 +136,7 @@
 
 # Observability UIs
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/ingest_manager/ @elastic/ingest-management
+/x-pack/plugins/fleet/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
@@ -254,9 +254,6 @@
 /x-pack/test/ui_capabilities/ @elastic/kibana-security
 /x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
 /x-pack/test/functional/apps/security/ @elastic/kibana-security
-/x-pack/test/kerberos_api_integration/ @elastic/kibana-security
-/x-pack/test/oidc_api_integration/ @elastic/kibana-security
-/x-pack/test/pki_api_integration/ @elastic/kibana-security
 /x-pack/test/security_api_integration/ @elastic/kibana-security
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security
@@ -380,7 +377,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Observability design
 /x-pack/plugins/apm/**/*.scss @elastic/observability-design
 /x-pack/plugins/infra/**/*.scss @elastic/observability-design
-/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
+/x-pack/plugins/fleet/**/*.scss @elastic/observability-design
 /x-pack/plugins/observability/**/*.scss @elastic/observability-design
 /x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
 

.github/paths-labeller.yml

@@ -11,7 +11,7 @@
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
   - "Team:Ingest Management":
-    - "x-pack/plugins/ingest_manager/**/*.*"
+    - "x-pack/plugins/fleet/**/*.*"
     - "x-pack/test/api_integration/apis/fleet/**/*.*"
     - "x-pack/test/epm_api_integration/**/*.*"
   - "Team:uptime":

config/kibana.yml

@@ -80,7 +80,7 @@
 #elasticsearch.logQueries: false
 
 # Specifies the path where Kibana creates the process ID file.
-#pid.file: /var/run/kibana.pid
+#pid.file: /run/kibana/kibana.pid
 
 # Enables you to specify a file where Kibana stores log output.
 #logging.dest: stdout

docs/developer/plugin-list.asciidoc

@@ -413,7 +413,7 @@ Index Management by running this series of requests in Console:
 the infrastructure monitoring use-case within Kibana.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/ingest_manager/README.md[ingestManager]
+|{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[ingestManager]
 |Fleet needs to have Elasticsearch API keys enabled, and also to have TLS enabled on kibana, (if you want to run Kibana without TLS you can provide the following config flag --xpack.fleet.agents.tlsCheckDisabled=false)
 
 

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

@@ -345,8 +345,8 @@
     "@babel/register": "^7.10.5",
     "@babel/traverse": "^7.11.5",
     "@babel/types": "^7.11.0",
-    "@cypress/snapshot": "^2.1.3",
-    "@cypress/webpack-preprocessor": "^5.4.1",
+    "@cypress/snapshot": "^2.1.7",
+    "@cypress/webpack-preprocessor": "^5.4.10",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/charts": "24.0.0",
@@ -609,9 +609,9 @@
     "cpy": "^8.1.1",
     "cronstrue": "^1.51.0",
     "css-loader": "^3.4.2",
-    "cypress": "^5.4.0",
+    "cypress": "^5.5.0",
     "cypress-cucumber-preprocessor": "^2.5.2",
-    "cypress-multi-reporters": "^1.2.3",
+    "cypress-multi-reporters": "^1.4.0",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
     "d3-scale": "1.0.7",
@@ -633,7 +633,7 @@
     "eslint-module-utils": "2.5.0",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-ban": "^1.4.0",
-    "eslint-plugin-cypress": "^2.8.1",
+    "eslint-plugin-cypress": "^2.11.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.19.1",
     "eslint-plugin-jest": "^24.0.2",
@@ -663,10 +663,9 @@
     "graphql-codegen-typescript-common": "^0.18.2",
     "graphql-codegen-typescript-resolvers": "^0.18.2",
     "graphql-codegen-typescript-server": "^0.18.2",
-    "grunt": "1.0.4",
+    "grunt": "1.3.0",
     "grunt-available-tasks": "^0.6.3",
     "grunt-babel": "^8.0.0",
-    "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-watch": "^1.1.0",
@@ -844,8 +843,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",