Skip to content

Commit 2c7f348

Browse files
Merge branch 'main' into more-link-replacement
2 parents 96b52c7 + 41e187f commit 2c7f348

File tree

145 files changed

+596
-451
lines changed

Some content is hidden

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

145 files changed

+596
-451
lines changed

deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Starting in {{stack}} version 8.0, how you change APM settings and the settings
2121
Standalone APM Server (legacy)
2222
: Deployments created prior to {{stack}} version 8.0 are in legacy mode. Upgrading to or past {{stack}} 8.0 does not remove you from legacy mode.
2323

24-
Check [Edit standalone APM settings (legacy)](#ece-edit-apm-standalone-settings-ece)for information on how to configure Elastic APM in this mode.
24+
Check [Edit standalone APM settings (legacy)](#ece-edit-apm-standalone-settings-ece) for information on how to configure Elastic APM in this mode.
2525

2626

2727
To learn more about the differences between these modes, or to switch from Standalone APM Server (legacy) mode to {{fleet}}-managed, check [Switch to the Elastic APM integration](/solutions/observability/apm/switch-to-elastic-apm-integration.md).
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{{es}} settings that are typically defined in the `elasticsearch.yml` configuration file can be specified for a set of nodes in the `spec.nodeSets[?].config` section of the {{es}} resource manifest.
2+
3+
Some settings are managed by ECK. It is not recommended to change these managed settings. For a complete list, refer to [Settings managed by ECK](/deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md).
4+
5+
```yaml
6+
spec:
7+
nodeSets:
8+
- name: masters
9+
count: 3
10+
config:
11+
# On Elasticsearch versions before 7.9.0, replace the node.roles configuration with the following:
12+
# node.master: true
13+
node.roles: ["master"]
14+
xpack.ml.enabled: true
15+
- name: data
16+
count: 10
17+
config:
18+
# On Elasticsearch versions before 7.9.0, replace the node.roles configuration with the following:
19+
# node.master: false
20+
# node.data: true
21+
# node.ingest: true
22+
# node.ml: true
23+
# node.transform: true
24+
node.roles: ["data", "ingest", "ml", "transform"]
25+
```
26+
27+
:::{warning}
28+
ECK parses {{es}} configuration and normalizes it to YAML. Consequently, some {{es}} configuration schema are impossible to express with ECK and, therefore, must be set using [dynamic cluster settings](/deploy-manage/deploy/self-managed/configure-elasticsearch.md#cluster-setting-types). For example:
29+
```yaml
30+
spec:
31+
nodeSets:
32+
- name: data
33+
# ...
34+
config:
35+
cluster.max_shards_per_node: 1000
36+
cluster.max_shards_per_node.frozen: 1000 # This won't work because cluster.max_shards_per_node is defined as a scalar value on the previous line
37+
# ...
38+
```
39+
:::
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
You can add your own {{kib}} settings to the `spec.config` section.
2+
3+
The following example demonstrates how to set the [`elasticsearch.requestHeadersWhitelist`](kibana://reference/configuration-reference/general-settings.md#elasticsearch-requestheaderswhitelist) configuration option.
4+
5+
```yaml
6+
apiVersion: kibana.k8s.elastic.co/v1
7+
kind: Kibana
8+
metadata:
9+
name: kibana-sample
10+
spec:
11+
version: 8.16.1
12+
count: 1
13+
elasticsearchRef:
14+
name: "elasticsearch-sample"
15+
config:
16+
elasticsearch.requestHeadersWhitelist:
17+
- authorization
18+
```

deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Starting from ECK `2.6.1` and {{es}} `8.6.1`, {{stack}} configuration policies a
2828
* [Index templates](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-index-template)
2929
* [Components templates](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template)
3030
* [Role mappings](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-role-mapping)
31-
* [{{es}} Configuration](/deploy-manage/deploy/self-managed/configure-elasticsearch.md) (configuration settings for {{es}} that will go into `elasticsearch.yml`) [ECK 2.11.0]
31+
* [{{es}} Configuration](/deploy-manage/deploy/self-managed/configure-elasticsearch.md) (configuration settings for {{es}} that will go into [`elasticsearch.yml`](/deploy-manage/stack-settings.md)) [ECK 2.11.0]
3232
* [{{es}} Secure Settings](../../security/secure-settings.md) [ECK 2.11.0]
3333
* [Secret Mounts](#k8s-stack-config-policy-specifics-secret-mounts) [ECK 2.11.0]
3434

@@ -58,13 +58,13 @@ At least one of `spec.elasticsearch` or `spec.kibana` needs to be defined with a
5858
* `indexLifecyclePolicies` are index lifecycle policies, to automatically manage the index lifecycle.
5959
* `indexTemplates.componentTemplates` are component templates that are building blocks for constructing index templates that specify index mappings, settings, and aliases.
6060
* `indexTemplates.composableIndexTemplates` are index templates to define settings, mappings, and aliases that can be applied automatically to new indices.
61-
* `config` are the settings that go into the `elasticsearch.yml` file.
61+
* `config` are the settings that go into the [`elasticsearch.yml`](/deploy-manage/stack-settings.md) file.
6262
* `secretMounts` are the additional user created secrets that need to be mounted to the {{es}} Pods.
6363
* `secureSettings` is a list of Secrets containing Secure Settings to inject into the keystore(s) of the {{es}} cluster(s) to which this policy applies, similar to the [{{es}} Secure Settings](../../security/secure-settings.md).
6464

6565
* `spec.kibana` describes the settings to configure for {{kib}}.
6666

67-
* `config` are the settings that go into the `kibana.yml` file.
67+
* `config` are the settings that go into the [`kibana.yml`](/deploy-manage/stack-settings.md) file.
6868
* `secureSettings` is a list of Secrets containing Secure Settings to inject into the keystore(s) of the {{kib}} instance(s) to which this policy applies, similar to the [{{kib}} Secure Settings](../../security/k8s-secure-settings.md).
6969

7070

deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,8 @@ Check [Set compute resources for {{kib}}, Elastic Maps Server, APM Server and Lo
5757

5858
## {{kib}} configuration [k8s-kibana-configuration]
5959

60-
You can add your own {{kib}} settings to the `spec.config` section.
61-
62-
The following example demonstrates how to set the [`elasticsearch.requestHeadersWhitelist`](kibana://reference/configuration-reference/general-settings.md#elasticsearch-requestheaderswhitelist) configuration option.
63-
64-
```yaml
65-
apiVersion: kibana.k8s.elastic.co/v1
66-
kind: Kibana
67-
metadata:
68-
name: kibana-sample
69-
spec:
70-
version: 8.16.1
71-
count: 1
72-
elasticsearchRef:
73-
name: "elasticsearch-sample"
74-
config:
75-
elasticsearch.requestHeadersWhitelist:
76-
- authorization
77-
```
60+
:::{include} _snippets/kib-config.md
61+
:::
7862

7963

8064
## Scale out a {{kib}} deployment [k8s-kibana-scaling]

deploy-manage/deploy/cloud-on-k8s/node-configuration.md

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,7 @@ mapped_pages:
88

99
# Node configuration [k8s-node-configuration]
1010

11-
Any setting defined in the `elasticsearch.yml` configuration file can also be defined for a set of {{es}} nodes in the `spec.nodeSets[?].config` section.
12-
13-
Some settings are managed by ECK, it is not recommended to change them, refer to [Settings managed by ECK](settings-managed-by-eck.md) for more details.
14-
15-
```yaml
16-
spec:
17-
nodeSets:
18-
- name: masters
19-
count: 3
20-
config:
21-
# On Elasticsearch versions before 7.9.0, replace the node.roles configuration with the following:
22-
# node.master: true
23-
node.roles: ["master"]
24-
xpack.ml.enabled: true
25-
- name: data
26-
count: 10
27-
config:
28-
# On Elasticsearch versions before 7.9.0, replace the node.roles configuration with the following:
29-
# node.master: false
30-
# node.data: true
31-
# node.ingest: true
32-
# node.ml: true
33-
# node.transform: true
34-
node.roles: ["data", "ingest", "ml", "transform"]
35-
```
36-
37-
::::{warning}
38-
ECK parses {{es}} configuration and normalizes it to YAML. Consequently, some {{es}} configuration schema are impossible to express with ECK and, therefore, must be set using [dynamic cluster settings](/deploy-manage/deploy/self-managed/configure-elasticsearch.md#cluster-setting-types). For example:
39-
```yaml
40-
spec:
41-
nodeSets:
42-
- name: data
43-
# ...
44-
config:
45-
cluster.max_shards_per_node: 1000
46-
cluster.max_shards_per_node.frozen: 1000 # This won't work because cluster.max_shards_per_node is defined as a scalar value on the previous line
47-
# ...
48-
```
49-
::::
50-
51-
For more information on {{es}} settings, check [Configuring Elasticsearch](/deploy-manage/deploy/self-managed/configure-elasticsearch.md).
11+
:::{include} _snippets/es-config.md
12+
:::
5213

14+
For more information on {{es}} settings, check [Configuring Elasticsearch](/deploy-manage/deploy/self-managed/configure-elasticsearch.md).

deploy-manage/deploy/elastic-cloud/edit-stack-settings.md

Lines changed: 20 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -17,102 +17,50 @@ mapped_pages:
1717

1818
# Edit {{stack}} settings
1919

20-
% What needs to be done: Refine
20+
From the {{ecloud}} Console you can customize {{es}}, {{kib}}, and related products to suit your needs. These editors append your changes to the appropriate YAML configuration file and they affect all users of that cluster.
2121

22-
% Use migrated content from existing pages that map to this page:
22+
## Available settings
2323

24-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-add-user-settings.md
25-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-editing-user-settings.md
26-
% - [ ] ./raw-migrated-files/cloud/cloud-heroku/ech-add-user-settings.md
27-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-manage-kibana-settings.md
28-
% - [ ] ./raw-migrated-files/cloud/cloud-heroku/ech-manage-kibana-settings.md
29-
% - [ ] ./raw-migrated-files/cloud/cloud-heroku/ech-editing-user-settings.md
30-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-manage-apm-settings.md
31-
% - [ ] ./raw-migrated-files/cloud/cloud-heroku/ech-manage-apm-settings.md
32-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-manage-appsearch-settings.md
33-
% Notes: specify cluster 8.x or lower
34-
% - [ ] ./raw-migrated-files/cloud/cloud/ec-manage-enterprise-search-settings.md
35-
% Notes: specify cluster 8.x or lower
36-
37-
$$$ec-add-user-settings$$$
38-
39-
$$$ech-es-elasticsearch-settings$$$
40-
41-
$$$xpack-monitoring-history-duration$$$
42-
43-
$$$ech-edit-apm-standalone-settings$$$
44-
45-
$$$ech-apm-settings$$$
46-
47-
$$$csp-strict$$$
48-
49-
$$$ec-appsearch-settings$$$
50-
51-
$$$ec-es-elasticsearch-settings$$$
52-
53-
From the {{ecloud}} Console you can customize {{es}}, {{kib}}, and related products to suit your needs. These editors append your changes to the appropriate YAML configuration file and they affect all users of that cluster. In each editor you can:
54-
55-
56-
## Edit {{es}} user settings [ec-add-user-settings]
57-
58-
Change how {{es}} runs by providing your own user settings. {{ech}} appends these settings to each node’s `elasticsearch.yml` configuration file.
24+
### Elasticsearch settings
5925

6026
:::{important}
6127
If a feature requires both standard `elasticsearch.yml` settings and [secure settings](/deploy-manage/security/secure-settings.md), configure the secure settings first. Updating standard user settings can trigger a cluster rolling restart, and if the required secure settings are not yet in place, the nodes may fail to start. In contrast, adding secure settings does not trigger a restart.
6228
:::
6329

6430
{{ech}} automatically rejects `elasticsearch.yml` settings that could break your cluster.
6531

66-
For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/index.md).
67-
68-
::::{warning}
69-
You can also update [dynamic cluster settings](../../../deploy-manage/deploy/self-managed/configure-elasticsearch.md#dynamic-cluster-setting) using {{es}}'s [update cluster settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings). However, {{ech}} doesn’t reject unsafe setting changes made using this API. Use it with caution.
70-
::::
71-
72-
73-
To add or edit user settings:
32+
For a list of supported settings, refer to the [{{es}} configuration reference](elasticsearch://reference/elasticsearch/configuration-reference/index.md). Settings supported on {{ech}} are indicated by an {{ecloud}} icon (![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on {{ecloud}}")).
7433

75-
1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
76-
2. Find your deployment on the home page or on the **Hosted deployments** page, then select **Manage** to access its settings menus.
77-
78-
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
34+
### Kibana settings
7935

80-
3. From your deployment menu, go to the **Edit** page.
81-
4. In the **Elasticsearch** section, select **Manage user settings and extensions**.
82-
5. Update the user settings.
83-
6. Select **Save changes**.
36+
{{ech}} supports most of the standard {{kib}} settings.
8437

85-
::::{note}
86-
In some cases, you may get a warning saying "User settings are different across {{es}} instances". To fix this issue, ensure that your user settings (including the comments sections and whitespaces) are identical across all {{es}} nodes (not only the data tiers, but also the Master, Machine Learning, and Coordinating nodes).
87-
::::
38+
Be aware that some settings that could break your cluster if set incorrectly and that the syntax might change between major versions.
8839

89-
## Edit {{kib}} user settings [ec-manage-kibana-settings]
40+
For a list of supported settings, check [{{kib}} settings](kibana://reference/cloud/elastic-cloud-kibana-settings.md).
9041

91-
{{ech}} supports most of the standard {{kib}} and X-Pack settings. Through a YAML editor in the console, you can append {{kib}} properties to the `kibana.yml` file. Your changes to the configuration file are read on startup.
42+
### APM settings
9243

93-
Be aware that some settings that could break your cluster if set incorrectly and that the syntax might change between major versions.
44+
Refer to [APM configuration reference](/solutions/observability/apm/configure-apm-server.md) for information on how to configure the {{fleet}}-managed APM integration.
9445

95-
For a list of supported settings, check [{{kib}} settings](kibana://reference/cloud/elastic-cloud-kibana-settings.md).
46+
## Edit settings [ec-add-user-settings]
9647

97-
To change {{kib}} settings:
48+
To add or edit user settings:
9849

9950
1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
10051
2. Find your deployment on the home page or on the **Hosted deployments** page, then select **Manage** to access its settings menus.
10152

10253
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
10354

104-
3. From your deployment menu, go to the **Edit** page.
105-
4. In the **Kibana** section, select **Edit user settings**. For deployments with existing user settings, you may have to expand the **Edit kibana.yml** caret instead.
106-
5. Update the user settings.
107-
6. Select **Save changes**.
108-
109-
Saving your changes initiates a configuration plan change that restarts {{kib}} automatically for you.
55+
1. Under the deployment's name in the navigation menu, select **Edit**.
56+
2. Look for the **Manage user settings and extensions** and **Edit user settings** links for each deployment, and select the one corresponding to the component you want to update, such as {{es}} or {{kib}}.
57+
3. Apply the necessary settings in the **Users Settings** tab of the editor and select **Back** when finished.
58+
4. Select **Save** to apply the changes to the deployment. Saving your changes initiates a configuration plan change that restarts the affected components for you.
11059

11160
::::{note}
112-
If a setting is not supported by {{ech}}, you will get an error message when you try to save.
61+
In some cases, you may get a warning saying "User settings are different across {{es}} instances". To fix this issue, ensure that your user settings (including the comments sections and whitespaces) are identical across all {{es}} nodes (not only the data tiers, but also the Master, Machine Learning, and Coordinating nodes).
11362
::::
11463

115-
## Edit APM user settings [ec-manage-apm-settings]
116-
117-
Change how Elastic APM runs by providing your own user settings.
118-
Check [APM configuration reference](/solutions/observability/apm/configure-apm-server.md) for information on how to configure the {{fleet}}-managed APM integration.
64+
::::{warning}
65+
You can also update [dynamic cluster settings](../../../deploy-manage/deploy/self-managed/configure-elasticsearch.md#dynamic-cluster-setting) using {{es}}'s [update cluster settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings). However, {{ech}} doesn’t reject unsafe setting changes made using this API. Use it with caution.
66+
::::

deploy-manage/deploy/self-managed/_snippets/auto-security-config-rpm-deb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
When you start {{es}} for the first time, it automatically performs the following security setup:
22

33
* Generates [TLS certificates](#stack-security-certificates) for the [transport and HTTP layers](/deploy-manage/security/secure-cluster-communications.md#communication-channels)
4-
* Applies TLS configuration settings to `elasticsearch.yml`
4+
* Applies TLS configuration settings to [`elasticsearch.yml`](/deploy-manage/stack-settings.md)
55
* Creates an enrollment token to securely connect {{kib}} to {{es}}
66

7-
You can then start {{kib}} and enter the enrollment token, which is valid for 30 minutes. This token automatically applies the security settings from your {{es}} cluster, authenticates to {{es}} with the built-in `kibana` service account, and writes the security configuration to `kibana.yml`.
7+
You can then start {{kib}} and enter the enrollment token, which is valid for 30 minutes. This token automatically applies the security settings from your {{es}} cluster, authenticates to {{es}} with the built-in `kibana` service account, and writes the security configuration to [`kibana.yml`](/deploy-manage/stack-settings.md).
88

99
::::{note}
1010
There are [some cases](/deploy-manage/security/self-auto-setup.md#stack-skip-auto-configuration) where security can’t be configured automatically because the node startup process detects that the node is already part of a cluster, or that security is already configured or explicitly disabled.

deploy-manage/deploy/self-managed/_snippets/auto-security-config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
When you start your first {{es}} node for the first time, it automatically performs the following security setup:
22

33
* Generates [TLS certificates](#stack-security-certificates) for the [transport and HTTP layers](/deploy-manage/security/secure-cluster-communications.md#communication-channels)
4-
* Applies TLS configuration settings to `elasticsearch.yml`
4+
* Applies TLS configuration settings to [`elasticsearch.yml`](/deploy-manage/stack-settings.md)
55
* Sets a password for the `elastic` superuser
66
* Creates an enrollment token to securely connect {{kib}} to {{es}}
77

8-
You can then start {{kib}} and enter the enrollment token, which is valid for 30 minutes. This token automatically applies the security settings from your {{es}} cluster, authenticates to {{es}} with the built-in `kibana` service account, and writes the security configuration to `kibana.yml`.
8+
You can then start {{kib}} and enter the enrollment token, which is valid for 30 minutes. This token automatically applies the security settings from your {{es}} cluster, authenticates to {{es}} with the built-in `kibana` service account, and writes the security configuration to [`kibana.yml`](/deploy-manage/stack-settings.md).
99

1010
::::{note}
1111
There are [some cases](/deploy-manage/security/self-auto-setup.md#stack-skip-auto-configuration) where security can’t be configured automatically because the node startup process detects that the node is already part of a cluster, or that security is already configured or explicitly disabled.

deploy-manage/deploy/self-managed/_snippets/clean-up-multinode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Perform the following steps on each node in the cluster:
22

3-
1. Open `elasticsearch.yml` in a text editor.
3+
1. Open [`elasticsearch.yml`](/deploy-manage/deploy/self-managed/configure-elasticsearch.md) in a text editor.
44
2. Comment out or remove the `cluster.initial_master_nodes` setting, if present.
55
3. Update the `discovery.seed_hosts` value so it contains the IP address and port of each of the master-eligible {{es}} nodes in the cluster. In the first node in the cluster, you need to add the `discovery.seed_hosts` setting manually.
66
4. Optionally, [restart the {{es}} service](/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md) to validate your configuration changes.

0 commit comments

Comments
 (0)