Merge branch 'main' into markdown

Author: rshen91

docs/settings/fleet-settings.asciidoc

@@ -38,6 +38,10 @@ Refer to {fleet-guide}/air-gapped.html[Air-gapped environments] for details.
 
 `xpack.fleet.agents.fleet_server.hosts`::
 Hostnames used by {agent} for accessing {fleet-server}.
++
+If configured in your `kibana.yml`, this setting is grayed out and unavailable
+in the {fleet} UI. To make this setting editable in the UI, do not configure it
+in the configuration file. 
 
 `xpack.fleet.agents.elasticsearch.hosts`::
 Hostnames used by {agent} for accessing {es}.
@@ -52,6 +56,9 @@ Hash pin used for certificate verification. The pin is a base64-encoded string o
 Use these settings to pre-define integrations and agent policies that you
 want {fleet} to load up by default.
 
+NOTE: These settings are not supported to pre-configure the Endpoint and Cloud
+Security integration.
+
 `xpack.fleet.packages`::
 List of integrations that are installed when the {fleet} app starts up for the first time.
 +
@@ -126,7 +133,11 @@ List of agent policies that are configured when the {fleet} app starts.
 =====
 
 `xpack.fleet.outputs`::
-List of outputs that are configured when the {fleet} app starts. 
+List of outputs that are configured when the {fleet} app starts.
++
+If configured in your `kibana.yml`, output settings are grayed out and
+unavailable in the {fleet} UI. To make these settings editable in the UI, do not
+configure them in the configuration file. 
 +
 .Required properties of `xpack.fleet.outputs`
 [%collapsible%open]

docs/user/production-considerations/production.asciidoc

@@ -27,16 +27,11 @@ you can configure {kib} to use a list of {es} hosts.
 To serve multiple {kib} installations behind a load balancer, you must change the configuration.
 See {kibana-ref}/settings.html[Configuring {kib}] for details on each setting.
 
-Settings unique across each {kib} instance:
+These settings must be unique across each {kib} instance:
 [source,js]
 --------
-server.uuid
+server.uuid // if not provided, this is autogenerated
 server.name
---------
-
-Settings unique across each host (for example, running multiple installations on the same virtual machine):
-[source,js]
---------
 path.data
 pid.file
 server.port
@@ -106,7 +101,7 @@ These can be used to automatically update the list of hosts as a cluster is resi
 [[memory]]
 === Memory
 
-Kibana has a default memory limit that scales based on total memory available.  In some scenarios, such as large reporting jobs, 
+Kibana has a default memory limit that scales based on total memory available.  In some scenarios, such as large reporting jobs,
 it may make sense to tweak limits to meet more specific requirements.
 
 A limit can be defined by setting `--max-old-space-size` in the `node.options` config file found inside the `kibana/config` folder or any other folder configured with the environment variable `KBN_PATH_CONF`. For example, in the Debian-based system, the folder is `/etc/kibana`.

x-pack/plugins/ml/public/application/jobs/jobs_list/components/datafeed_chart_flyout/datafeed_chart_flyout.tsx

@@ -510,7 +510,7 @@ export const DatafeedChartFlyout: FC<DatafeedChartFlyoutProps> = ({
                           key={'source-results'}
                           color={euiTheme.euiColorPrimary}
                           id={i18n.translate('xpack.ml.jobsList.datafeedChart.sourceSeriesId', {
-                            defaultMessage: 'Source indices',
+                            defaultMessage: 'Source indices document count',
                           })}
                           xScaleType={ScaleType.Time}
                           yScaleType={ScaleType.Linear}
@@ -523,7 +523,7 @@ export const DatafeedChartFlyout: FC<DatafeedChartFlyoutProps> = ({
                           key={'job-results'}
                           color={euiTheme.euiColorAccentText}
                           id={i18n.translate('xpack.ml.jobsList.datafeedChart.bucketSeriesId', {
-                            defaultMessage: 'Job results',
+                            defaultMessage: 'Datafeed document count',
                           })}
                           xScaleType={ScaleType.Time}
                           yScaleType={ScaleType.Linear}