Skip to content

Commit c6ee44e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into task/endpoint-host-data-generator-create-policy
2 parents 047925b + d3fc2ff commit c6ee44e

File tree

94 files changed

+1968
-3626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1968
-3626
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
88
/x-pack/plugins/lens/ @elastic/kibana-app
99
/x-pack/plugins/graph/ @elastic/kibana-app
10+
/src/plugins/advanced_settings/ @elastic/kibana-app
1011
/src/plugins/charts/ @elastic/kibana-app
1112
/src/plugins/dashboard/ @elastic/kibana-app
1213
/src/plugins/discover/ @elastic/kibana-app
1314
/src/plugins/input_control_vis/ @elastic/kibana-app
15+
/src/plugins/management/ @elastic/kibana-app
1416
/src/plugins/kibana_legacy/ @elastic/kibana-app
1517
/src/plugins/vis_default_editor/ @elastic/kibana-app
1618
/src/plugins/vis_type_markdown/ @elastic/kibana-app
@@ -38,7 +40,6 @@
3840
/examples/url_generators_explorer/ @elastic/kibana-app-arch
3941
/packages/elastic-datemath/ @elastic/kibana-app-arch
4042
/packages/kbn-interpreter/ @elastic/kibana-app-arch
41-
/src/plugins/advanced_settings/ @elastic/kibana-app-arch
4243
/src/plugins/bfetch/ @elastic/kibana-app-arch
4344
/src/plugins/data/ @elastic/kibana-app-arch
4445
/src/plugins/embeddable/ @elastic/kibana-app-arch
@@ -47,7 +48,6 @@
4748
/src/plugins/kibana_react/ @elastic/kibana-app-arch
4849
/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
4950
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
50-
/src/plugins/management/ @elastic/kibana-app-arch
5151
/src/plugins/navigation/ @elastic/kibana-app-arch
5252
/src/plugins/share/ @elastic/kibana-app-arch
5353
/src/plugins/ui_actions/ @elastic/kibana-app-arch

docs/settings/monitoring-settings.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For more information, see
3333
|===
3434
| `monitoring.enabled`
3535
| Set to `true` (default) to enable the {monitor-features} in {kib}. Unlike the
36-
`monitoring.ui.enabled` setting, when this setting is `false`, the
36+
<<monitoring-ui-enabled, `monitoring.ui.enabled`>> setting, when this setting is `false`, the
3737
monitoring back-end does not run and {kib} stats are not sent to the monitoring
3838
cluster.
3939

@@ -44,7 +44,7 @@ a|`monitoring.cluster_alerts.`
4444

4545
| `monitoring.ui.elasticsearch.hosts`
4646
| Specifies the location of the {es} cluster where your monitoring data is stored.
47-
By default, this is the same as `elasticsearch.hosts`. This setting enables
47+
By default, this is the same as <<elasticsearch-hosts, `elasticsearch.hosts`>>. This setting enables
4848
you to use a single {kib} instance to search and visualize data in your
4949
production cluster as well as monitor data sent to a dedicated monitoring
5050
cluster.
@@ -58,7 +58,7 @@ a|`monitoring.cluster_alerts.`
5858
cluster uses the authenticated user's credentials, which must be the same on
5959
both the {es} monitoring cluster and the {es} production cluster. +
6060
+
61-
If not set, {kib} uses the value of the `elasticsearch.username` setting.
61+
If not set, {kib} uses the value of the <<elasticsearch-user-passwd, `elasticsearch.username`>> setting.
6262

6363
| `monitoring.ui.elasticsearch.password`
6464
| Specifies the password used by {kib} monitoring to establish a persistent connection
@@ -69,11 +69,11 @@ a|`monitoring.cluster_alerts.`
6969
cluster uses the authenticated user's credentials, which must be the same on
7070
both the {es} monitoring cluster and the {es} production cluster. +
7171
+
72-
If not set, {kib} uses the value of the `elasticsearch.password` setting.
72+
If not set, {kib} uses the value of the <<elasticsearch-user-passwd, `elasticsearch.password`>> setting.
7373

7474
| `monitoring.ui.elasticsearch.pingTimeout`
7575
| Specifies the time in milliseconds to wait for {es} to respond to internal
76-
health checks. By default, it matches the `elasticsearch.pingTimeout` setting,
76+
health checks. By default, it matches the <<elasticsearch-pingTimeout, `elasticsearch.pingTimeout`>> setting,
7777
which has a default value of `30000`.
7878

7979
|===
@@ -112,7 +112,7 @@ about configuring {kib}, see
112112
| Specifies the number of log entries to display in *{stack-monitor-app}*.
113113
Defaults to `10`. The maximum value is `50`.
114114

115-
| `monitoring.ui.enabled`
115+
|[[monitoring-ui-enabled]] `monitoring.ui.enabled`
116116
| Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
117117
continues to run as an agent for sending {kib} stats to the monitoring
118118
cluster. Defaults to `true`.

docs/settings/reporting-settings.asciidoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can configure `xpack.reporting` settings in your `kibana.yml` to:
2020
| [[xpack-enable-reporting]]`xpack.reporting.enabled` {ess-icon}
2121
| Set to `false` to disable the {report-features}.
2222

23-
| `xpack.reporting.encryptionKey` {ess-icon}
23+
|[[xpack-reporting-encryptionKey]] `xpack.reporting.encryptionKey` {ess-icon}
2424
| Set to an alphanumeric, at least 32 characters long text string. By default, {kib} will generate a random key when it
2525
starts, which will cause pending reports to fail after restart. Configure this
2626
setting to preserve the same key across multiple restarts and multiple instances of {kib}.
@@ -53,20 +53,20 @@ proxy host requires that the {kib} server has network access to the proxy.
5353
[cols="2*<"]
5454
|===
5555
| `xpack.reporting.kibanaServer.port`
56-
| The port for accessing {kib}, if different from the `server.port` value.
56+
| The port for accessing {kib}, if different from the <<server-port, `server.port`>> value.
5757

5858
| `xpack.reporting.kibanaServer.protocol`
5959
| The protocol for accessing {kib}, typically `http` or `https`.
6060

61-
| `xpack.reporting.kibanaServer.hostname`
62-
| The hostname for accessing {kib}, if different from the `server.host` value.
61+
|[[xpack-kibanaServer-hostname]] `xpack.reporting.kibanaServer.hostname`
62+
| The hostname for accessing {kib}, if different from the <<server-host, `server.host`>> value.
6363

6464
|===
6565

6666
[NOTE]
6767
============
6868
Reporting authenticates requests on the Kibana page only when the hostname matches the
69-
`xpack.reporting.kibanaServer.hostname` setting. Therefore Reporting would fail if the
69+
<<xpack-kibanaServer-hostname, `xpack.reporting.kibanaServer.hostname`>> setting. Therefore Reporting would fail if the
7070
set value redirects to another server. For that reason, `"0"` is an invalid setting
7171
because, in the Reporting browser, it becomes an automatic redirect to `"0.0.0.0"`.
7272
============
@@ -97,8 +97,8 @@ reports, you might need to change the following settings.
9797
[NOTE]
9898
============
9999
Running multiple instances of {kib} in a cluster for load balancing of
100-
reporting requires identical values for `xpack.reporting.encryptionKey` and, if
101-
security is enabled, `xpack.security.encryptionKey`.
100+
reporting requires identical values for <<xpack-reporting-encryptionKey, `xpack.reporting.encryptionKey`>> and, if
101+
security is enabled, <<xpack-security-encryptionKey, `xpack.security.encryptionKey`>>.
102102
============
103103

104104
[cols="2*<"]
@@ -177,7 +177,7 @@ available, but there will likely be errors in the visualizations in the report.
177177
[[reporting-chromium-settings]]
178178
==== Chromium settings
179179

180-
When `xpack.reporting.capture.browser.type` is set to `chromium` (default) you can also specify the following settings.
180+
When <<xpack-reporting-browser, `xpack.reporting.capture.browser.type`>> is set to `chromium` (default) you can also specify the following settings.
181181

182182
[cols="2*<"]
183183
|===
@@ -246,7 +246,7 @@ a| `xpack.reporting.capture.browser`
246246
| Reporting uses a weekly index in {es} to store the reporting job and
247247
the report content. The index is automatically created if it does not already
248248
exist. Configure this to a unique value, beginning with `.reporting-`, for every
249-
{kib} instance that has a unique `kibana.index` setting. Defaults to `.reporting`.
249+
{kib} instance that has a unique <<kibana-index, `kibana.index`>> setting. Defaults to `.reporting`.
250250

251251
| `xpack.reporting.roles.allow`
252252
| Specifies the roles in addition to superusers that can use reporting.

docs/settings/security-settings.asciidoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,26 +190,26 @@ You can configure the following settings in the `kibana.yml` file.
190190
| `xpack.security.cookieName`
191191
| Sets the name of the cookie used for the session. The default value is `"sid"`.
192192

193-
| `xpack.security.encryptionKey`
193+
|[[xpack-security-encryptionKey]] `xpack.security.encryptionKey`
194194
| An arbitrary string of 32 characters or more that is used to encrypt session information. Do **not** expose this key to users of {kib}. By
195195
default, a value is automatically generated in memory. If you use that default
196196
behavior, all sessions are invalidated when {kib} restarts.
197197
In addition, high-availability deployments of {kib} will behave unexpectedly
198198
if this setting isn't the same for all instances of {kib}.
199199

200-
| `xpack.security.secureCookies`
200+
|[[xpack-security-secureCookies]] `xpack.security.secureCookies`
201201
| Sets the `secure` flag of the session cookie. The default value is `false`. It
202-
is automatically set to `true` if `server.ssl.enabled` is set to `true`. Set
202+
is automatically set to `true` if <<server-ssl-enabled, `server.ssl.enabled`>> is set to `true`. Set
203203
this to `true` if SSL is configured outside of {kib} (for example, you are
204204
routing requests through a load balancer or proxy).
205205

206206
| `xpack.security.sameSiteCookies` {ess-icon}
207207
| Sets the `SameSite` attribute of the session cookie. This allows you to declare whether your cookie should be restricted to a first-party or same-site context.
208208
Valid values are `Strict`, `Lax`, `None`.
209-
This is *not set* by default, which modern browsers will treat as `Lax`. If you use Kibana embedded in an iframe in modern browsers, you might need to set it to `None`. Setting this value to `None` requires cookies to be sent over a secure connection by setting `xpack.security.secureCookies: true`.
209+
This is *not set* by default, which modern browsers will treat as `Lax`. If you use Kibana embedded in an iframe in modern browsers, you might need to set it to `None`. Setting this value to `None` requires cookies to be sent over a secure connection by setting <<xpack-security-secureCookies, `xpack.security.secureCookies`>>: `true`.
210210

211-
| `xpack.security.session.idleTimeout` {ess-icon}
212-
| Ensures that user sessions will expire after a period of inactivity. This and `xpack.security.session.lifespan` are both
211+
|[[xpack-session-idleTimeout]] `xpack.security.session.idleTimeout` {ess-icon}
212+
| Ensures that user sessions will expire after a period of inactivity. This and <<xpack-session-lifespan,`xpack.security.session.lifespan`>> are both
213213
highly recommended. By default, this setting is not set.
214214

215215
2+a|
@@ -218,9 +218,9 @@ highly recommended. By default, this setting is not set.
218218
The format is a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
219219
============
220220

221-
| `xpack.security.session.lifespan` {ess-icon}
221+
|[[xpack-session-lifespan]] `xpack.security.session.lifespan` {ess-icon}
222222
| Ensures that user sessions will expire after the defined time period. This behavior also known as an "absolute timeout". If
223-
this is _not_ set, user sessions could stay active indefinitely. This and `xpack.security.session.idleTimeout` are both highly
223+
this is _not_ set, user sessions could stay active indefinitely. This and <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>> are both highly
224224
recommended. By default, this setting is not set.
225225

226226
2+a|

docs/settings/telemetry-settings.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ See our https://www.elastic.co/legal/privacy-statement[Privacy Statement] to lea
1919

2020
[cols="2*<"]
2121
|===
22-
| `telemetry.enabled`
22+
|[[telemetry-enabled]] `telemetry.enabled`
2323
| Set to `true` to send cluster statistics to Elastic. Reporting your
2424
cluster statistics helps us improve your user experience. Your data is never
2525
shared with anyone. Set to `false` to disable statistics reporting from any
@@ -31,16 +31,16 @@ See our https://www.elastic.co/legal/privacy-statement[Privacy Statement] to lea
3131
it is behind a firewall and falls back to `'browser'` to send it from users' browsers
3232
when they are navigating through {kib}. Defaults to `'server'`.
3333

34-
| `telemetry.optIn`
34+
|[[telemetry-optIn]] `telemetry.optIn`
3535
| Set to `true` to automatically opt into reporting cluster statistics. You can also opt out through
3636
*Advanced Settings* in {kib}. Defaults to `true`.
3737

3838
| `telemetry.allowChangingOptInStatus`
39-
| Set to `true` to allow overwriting the `telemetry.optIn` setting via the {kib} UI. Defaults to `true`. +
39+
| Set to `true` to allow overwriting the <<telemetry-optIn, `telemetry.optIn`>> setting via the {kib} UI. Defaults to `true`. +
4040

4141
|===
4242

4343
[NOTE]
4444
============
45-
When `false`, `telemetry.optIn` must be `true`. To disable telemetry and not allow users to change that parameter, use `telemetry.enabled`.
45+
When `false`, <<telemetry-optIn, `telemetry.optIn`>> must be `true`. To disable telemetry and not allow users to change that parameter, use <<telemetry-enabled, `telemetry.enabled`>>.
4646
============

docs/setup/secure-settings.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bin/kibana-keystore create
1919
----------------------------------------------------------------
2020

2121
The file `kibana.keystore` will be created in the directory defined by the
22-
`path.data` configuration setting.
22+
<<path-data, `path.data`>> configuration setting.
2323

2424
[float]
2525
[[list-settings]]

0 commit comments

Comments
 (0)