Merge branch 'master' into reporting/feature-controls-support

docs/apm/agent-configuration.asciidoc

@@ -46,7 +46,7 @@ Go Agent:: {apm-go-ref}/configuration.html[Configuration reference]
 Java Agent:: {apm-java-ref}/configuration.html[Configuration reference]
 .NET Agent:: {apm-dotnet-ref}/configuration.html[Configuration reference]
 Node.js Agent:: {apm-node-ref}/configuration.html[Configuration reference]
-PHP Agent:: _Not yet supported_
+PHP Agent:: {apm-php-ref}/configuration.html[Configuration reference]
 Python Agent:: {apm-py-ref}/configuration.html[Configuration reference]
 Ruby Agent:: {apm-ruby-ref}/configuration.html[Configuration reference]
 Real User Monitoring (RUM) Agent:: {apm-rum-ref}/configuration.html[Configuration reference]

docs/developer/getting-started/index.asciidoc

@@ -12,8 +12,11 @@ In order to support Windows development we currently require you to use one of t
 - https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them)
 - https://docs.microsoft.com/en-us/windows/wsl/about[WSL]
 
-Before running the steps listed below, please make sure you have installed Git bash or WSL and that 
-you are running the mentioned commands through one of them.
+As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].
+
+Before running the steps listed below, please make sure you have installed everything 
+that we require and listed above and that you are running the mentioned commands 
+through Git bash or WSL.
 
 [discrete]
 [[get-kibana-code]]

docs/developer/plugin-list.asciidoc

@@ -392,6 +392,10 @@ actitivies.
 |The features plugin enhance Kibana with a per-feature privilege system.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer]
+|WARNING: Missing README.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
 |WARNING: Missing README.
 

docs/settings/fleet-settings.asciidoc

@@ -37,12 +37,10 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
 
 [cols="2*<"]
 |===
-| `xpack.fleet.agents.kibana.host`
-  | The hostname used by {agent} for accessing {kib}.
+| `xpack.fleet.agents.fleet_server.hosts`
+  | Hostnames used by {agent} for accessing {fleet-server}.
 | `xpack.fleet.agents.elasticsearch.host`
   | The hostname used by {agent} for accessing {es}.
-| `xpack.fleet.agents.tlsCheckDisabled`
-  | Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
 |===
 
 [NOTE]

docs/setup/settings.asciidoc

@@ -8,9 +8,10 @@ default it is in `$KIBANA_HOME/config`. By default, with package distributions
 (Debian or RPM), it is in `/etc/kibana`.  The config directory can be changed via the
 `KBN_PATH_CONF` environment variable:
 
-```
+[source,text]
+--
 KBN_PATH_CONF=/home/kibana/config ./bin/kibana
-```
+--
 
 The default host and port settings configure {kib} to run on `localhost:5601`. To change this behavior and allow remote users to connect, you'll need to update your `kibana.yml` file. You can also enable SSL and set a
 variety of other options. Finally, environment variables can be injected into
@@ -281,7 +282,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}.
 |===
 
 |[[logging-root]] `logging.root:`
-| The {kibana-ref}/logging-service.html#logging-service[`root` logger] has a dedicated configuration node since this context name is special and is pre-configured for logging by default. 
+| The {kibana-ref}/logging-service.html#logging-service[`root` logger] has a dedicated configuration node since this context name is special and is pre-configured for logging by default.
 // TODO: add link to the advanced logging documentation.
 
 |[[logging-root-appenders]] `logging.root.appenders:`
@@ -313,7 +314,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}.
 | Allows you to specify a fileName to send log records to on disk. To send <<log-to-file-example,all log records to file>>, add the file appender to `root.appenders`.
 
 | `logging.appenders.rolling-file:`
-| Similar to Log4j's `RollingFileAppender`, this appender will log into a file and rotate if following a rolling strategy when the configured policy triggers. There are currently two policies supported: `size-limit` and `time-interval`. 
+| Similar to Log4j's `RollingFileAppender`, this appender will log into a file and rotate if following a rolling strategy when the configured policy triggers. There are currently two policies supported: `size-limit` and `time-interval`.
 
 The size limit policy will perform a rollover when the log file reaches a maximum `size`. *Default 100mb*
 
@@ -504,49 +505,39 @@ deprecation warning at startup. This setting cannot end in a slash (`/`).
 proxy sitting in front of it. This determines whether HTTP compression may be used for responses, based on the request `Referer` header.
 This setting may not be used when <<server-compression, `server.compression.enabled`>> is set to `false`. *Default: `none`*
 
-
-a| [[server-securityResponseHeaders-strictTransportSecurity]]
-----
-server.securityResponseHeaders:
-  strictTransportSecurity:
-----
+[[server-securityResponseHeaders-strictTransportSecurity]]
+a|
+`server.securityResponseHeaders:`
+`strictTransportSecurity:`
 | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security[`Strict-Transport-Security`]
 header is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or
 `null`. To disable, set to `null`. *Default:* `null`
 
-a| [[server-securityResponseHeaders-xContentTypeOptions]]
-----
-server.securityResponseHeaders:
-  xContentTypeOptions:
-----
+[[server-securityResponseHeaders-xContentTypeOptions]]
+a| `server.securityResponseHeaders:`
+`xContentTypeOptions:`
 | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options[`X-Content-Type-Options`] header is
 used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are `nosniff` or `null`. To
 disable, set to `null`. *Default:* `"nosniff"`
 
-a| [[server-securityResponseHeaders-referrerPolicy]]
-----
-server.securityResponseHeaders:
-  referrerPolicy:
-----
+[[server-securityResponseHeaders-referrerPolicy]]
+a|`server.securityResponseHeaders:`
+`referrerPolicy:`
 | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy[`Referrer-Policy`] header is used in all
 responses to the client from the {kib} server, and specifies what value is used. Allowed values are `no-referrer`,
 `no-referrer-when-downgrade`, `origin`, `origin-when-cross-origin`, `same-origin`, `strict-origin`, `strict-origin-when-cross-origin`,
 `unsafe-url`, or `null`. To disable, set to `null`. *Default:* `"no-referrer-when-downgrade"`
 
-a| [[server-securityResponseHeaders-permissionsPolicy]]
-----
-server.securityResponseHeaders:
-  permissionsPolicy:
-----
+[[server-securityResponseHeaders-permissionsPolicy]]
+a|`server.securityResponseHeaders:`
+`permissionsPolicy:`
 | experimental[] Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Feature-Policy[`Permissions-Policy`] header
 is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`.
 To disable, set to `null`. *Default:* `null`
 
-a| [[server-securityResponseHeaders-disableEmbedding]]
-----
-server.securityResponseHeaders:
-  disableEmbedding:
-----
+[[server-securityResponseHeaders-disableEmbedding]]
+a|`server.securityResponseHeaders:`
+`disableEmbedding:`
 | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy[`Content-Security-Policy`] and
 https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options[`X-Frame-Options`] headers are configured to disable embedding
 {kib} in other webpages using iframes. When set to `true`, secure headers are used to disable embedding, which adds the `frame-ancestors:
@@ -557,6 +548,9 @@ SAMEORIGIN` response header. *Default:* `false`
  | Header names and values to
 send on all responses to the client from the {kib} server. *Default: `{}`*
 
+|[[server-shutdownTimeout]] `server.shutdownTimeout:`
+| Sets the grace period for {kib} to attempt to resolve any ongoing HTTP requests after receiving a `SIGTERM`/`SIGINT` signal, and before shutting down. Any new HTTP requests received during this period are rejected with a `503` response. *Default: `30s`*
+
 |[[server-host]] `server.host:`
  | This setting specifies the host of the
 back end server. To allow remote users to connect, set the value to the IP address or DNS name of the {kib} server. *Default: `"localhost"`*

package.json

@@ -427,7 +427,7 @@
     "@babel/runtime": "^7.12.5",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@bazel/ibazel": "^0.14.0",
+    "@bazel/ibazel": "^0.15.10",
     "@bazel/typescript": "^3.2.3",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",

packages/kbn-optimizer/limits.yml

@@ -9,7 +9,7 @@ pageLoadAssetSize:
   charts: 195358
   cloud: 21076
   console: 46091
-  core: 397521
+  core: 413500
   crossClusterReplication: 65408
   dashboard: 374194
   dashboardEnhanced: 65646
@@ -106,6 +106,7 @@ pageLoadAssetSize:
   indexPatternFieldEditor: 90489
   osquery: 107090
   fileUpload: 25664
+  fileDataVisualizer: 27530
   banners: 17946
   mapsEms: 26072
   timelines: 28613

packages/kbn-pm/dist/index.js

@@ -48512,7 +48512,13 @@ async function runBazel(bazelArgs, offline = false, runOpts = {}) {
   await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
 }
 async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
+  const extendedEnv = _objectSpread({
+    IBAZEL_USE_LEGACY_WATCHER: '0'
+  }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);
+
+  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
+    env: extendedEnv
+  }));
 }
 
 /***/ }),
@@ -59743,7 +59749,7 @@ const WatchBazelCommand = {
     // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
     // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build'], runOffline);
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
   }
 
 };

packages/kbn-pm/src/commands/watch_bazel.ts

@@ -20,6 +20,9 @@ export const WatchBazelCommand: ICommand = {
     //
     // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
     // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
-    await runIBazel(['--run_output=false', 'build', '//packages:build'], runOffline);
+    await runIBazel(
+      ['--run_output=false', 'build', '//packages:build', '--show_result=1'],
+      runOffline
+    );
   },
 };

packages/kbn-pm/src/utils/bazel/run.ts

@@ -71,5 +71,6 @@ export async function runIBazel(
   offline: boolean = false,
   runOpts: execa.Options = {}
 ) {
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
+  const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env };
+  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv });
 }