Skip to content

Commit e2d15ad

Browse files
committed
Merge remote-tracking branch 'origin/main' into kib_reporting_config
2 parents b2fcf37 + 99ceac7 commit e2d15ad

File tree

231 files changed

+1770
-1062
lines changed

Some content is hidden

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

231 files changed

+1770
-1062
lines changed

deploy-manage/deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This section focuses on deploying and managing {{es}} and {{kib}}, as well as su
2525
To learn how to deploy optional {{stack}} components, refer to the following sections:
2626
* [Fleet and Elastic Agent](asciidocalypse://docs/docs-content/docs/reference/ingestion-tools/fleet/index.md)
2727
* [APM](/solutions/observability/apps/application-performance-monitoring-apm.md)
28-
* [Beats](asciidocalypse://docs/beats/docs/reference/index.md)
28+
* [Beats](beats://reference/index.md)
2929
* [Logstash](asciidocalypse://docs/logstash/docs/reference/index.md)
3030
:::
3131

deploy-manage/deploy/_snippets/installation-order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ If you're deploying the {{stack}} in a self-managed cluster, then install the {{
33
* {{es}}
44
* {{kib}}
55
* [Logstash](logstash://reference/index.md)
6-
* [{{agent}}](/reference/ingestion-tools/fleet/index.md) or [Beats](asciidocalypse://docs/beats/docs/reference/index.md)
6+
* [{{agent}}](/reference/ingestion-tools/fleet/index.md) or [Beats](beats://reference/index.md)
77
* [APM](/solutions/observability/apps/application-performance-monitoring-apm.md)
88
* [Elasticsearch Hadoop](elasticsearch-hadoop://reference/index.md)
99

deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,24 +86,24 @@ To use the Cloud ID, you need:
8686
* A user ID and password that has permission to send data to your {{es}} cluster.
8787

8888
::::{important}
89-
In our examples, we use the `elastic` superuser that every {{es}} cluster comes with. The password for the `elastic` user is provided when you create a deployment (and can also be [reset](../../users-roles/cluster-or-deployment-auth/built-in-users.md) if you forget it). On a production system, you should adapt these examples by creating a user that can write to and access only the minimally required indices. For each Beat, review the specific feature and role table, similar to the one in [Metricbeat](asciidocalypse://docs/beats/docs/reference/metricbeat/feature-roles.md) documentation.
89+
In our examples, we use the `elastic` superuser that every {{es}} cluster comes with. The password for the `elastic` user is provided when you create a deployment (and can also be [reset](../../users-roles/cluster-or-deployment-auth/built-in-users.md) if you forget it). On a production system, you should adapt these examples by creating a user that can write to and access only the minimally required indices. For each Beat, review the specific feature and role table, similar to the one in [Metricbeat](beats://reference/metricbeat/feature-roles.md) documentation.
9090
::::
9191

9292
### Example: Configure Beats with your Cloud ID [ece-cloud-id-beats]
9393

9494
The following example shows how you can send operational data from Metricbeat to a new ECE deployment by using the Cloud ID. While this example uses Metricbeat, the same approach applies to other Beats.
9595

9696
::::{tip}
97-
For others, you can learn more about [getting started](asciidocalypse://docs/beats/docs/reference/index.md) with each Beat.
97+
For others, you can learn more about [getting started](beats://reference/index.md) with each Beat.
9898
::::
9999

100100
To get started with Metricbeat and {{ece}}:
101101

102102
1. [Log into the Cloud UI](log-into-cloud-ui.md).
103103
2. [Create a new deployment](create-deployment.md) and copy down the password for the `elastic` user.
104104
3. On the deployment overview page, copy down the Cloud ID.
105-
4. Set up the Beat of your choice, such as [Metricbeat](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-installation-configuration.md).
106-
5. [Configure the Beat output to send to Elastic Cloud](asciidocalypse://docs/beats/docs/reference/metricbeat/configure-cloud-id.md).
105+
4. Set up the Beat of your choice, such as [Metricbeat](beats://reference/metricbeat/metricbeat-installation-configuration.md).
106+
5. [Configure the Beat output to send to Elastic Cloud](beats://reference/metricbeat/configure-cloud-id.md).
107107

108108
::::{note}
109109
Make sure you replace the values for `cloud.id` and `cloud.auth` with your own information.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stringData:
7373
hosts: ["quickstart-es-http.default.svc:9200"]
7474
```
7575

76-
For more details, check the [Beats configuration](asciidocalypse://docs/beats/docs/reference/libbeat/config-file-format.md) section.
76+
For more details, check the [Beats configuration](beats://reference/libbeat/config-file-format.md) section.
7777

7878

7979
## Customize the connection to an Elasticsearch cluster [k8s-beat-connect-es]
@@ -154,7 +154,7 @@ stringData:
154154
AGENT_NAME_VAR: id_007
155155
```
156156

157-
Check [Beats documentation](asciidocalypse://docs/beats/docs/reference/filebeat/keystore.md) for more details.
157+
Check [Beats documentation](beats://reference/filebeat/keystore.md) for more details.
158158

159159

160160
## Set Beat output [k8s-beat-set-beat-output]
@@ -204,7 +204,7 @@ Consider picking the `Recreate` strategy if you are using a `hostPath` volume as
204204

205205
## Role Based Access Control for Beats [k8s-beat-role-based-access-control-for-beats]
206206

207-
Some Beats features (such as [autodiscover](asciidocalypse://docs/beats/docs/reference/filebeat/configuration-autodiscover.md) or Kubernetes module [metricsets](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-metricset-kubernetes-apiserver.md)) require that Beat Pods interact with Kubernetes APIs. Specific permissions are needed to allow this functionality. Standard Kubernetes [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) rules apply. For example, to allow for autodiscover:
207+
Some Beats features (such as [autodiscover](beats://reference/filebeat/configuration-autodiscover.md) or Kubernetes module [metricsets](beats://reference/metricbeat/metricbeat-metricset-kubernetes-apiserver.md)) require that Beat Pods interact with Kubernetes APIs. Specific permissions are needed to allow this functionality. Standard Kubernetes [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) rules apply. For example, to allow for autodiscover:
208208

209209
```yaml
210210
apiVersion: beat.k8s.elastic.co/v1beta1

deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ stringData:
448448

449449
### Elastic Agent input and Beats input plugins [k8s-logstash-plugin-considerations-agent-beats]
450450

451-
When you use the [Elastic Agent input](logstash://reference/plugins-inputs-elastic_agent.md) or the [Beats input](logstash://reference/plugins-inputs-beats.md), set the [`ttl`](asciidocalypse://docs/beats/docs/reference/filebeat/logstash-output.md#_ttl) value on the Agent or Beat to ensure that load is distributed appropriately.
451+
When you use the [Elastic Agent input](logstash://reference/plugins-inputs-elastic_agent.md) or the [Beats input](logstash://reference/plugins-inputs-beats.md), set the [`ttl`](beats://reference/filebeat/logstash-output.md#_ttl) value on the Agent or Beat to ensure that load is distributed appropriately.
452452

453453

454454

deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ When `kibanaRef` is specified, Beat tries to connect to the Kibana instance. If
1515

1616
## Configuration containing key: null is malformed [k8s-beat-configuration-containing-key-null-is-malformed]
1717

18-
When `kubectl` is used to modify a resource, it calculates the diff between the user applied and the existing configuration. This diff has special [semantics](https://tools.ietf.org/html/rfc7396#section-1) that forces the removal of keys if they have special values. For example, if the user-applied configuration contains `some_key: null` (or equivalent `some_key: ~`), this is interpreted as an instruction to remove `some_key`. In Beats configurations, this is often a problem when it comes to defining things like [processors](asciidocalypse://docs/beats/docs/reference/filebeat/add-cloud-metadata.md). To avoid this problem:
18+
When `kubectl` is used to modify a resource, it calculates the diff between the user applied and the existing configuration. This diff has special [semantics](https://tools.ietf.org/html/rfc7396#section-1) that forces the removal of keys if they have special values. For example, if the user-applied configuration contains `some_key: null` (or equivalent `some_key: ~`), this is interpreted as an instruction to remove `some_key`. In Beats configurations, this is often a problem when it comes to defining things like [processors](beats://reference/filebeat/add-cloud-metadata.md). To avoid this problem:
1919

2020
* Use `some_key: {}` (empty map) or `some_key: []` (empty array) instead of `some_key: null` if doing so does not affect the behaviour. This might not be possible in all cases as some applications distinguish between null values and empty values and behave differently.
2121
* Instead of using `config` to define configuration inline, use `configRef` and store the configuration in a Secret.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Change how {{es}} runs by providing your own user settings. {{ech}} appends thes
5959

6060
{{ech}} automatically rejects `elasticsearch.yml` settings that could break your cluster.
6161

62-
For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/elastic-cloud-hosted-elasticsearch-settings.md).
62+
For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/index.md).
6363

6464
::::{warning}
6565
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.

deploy-manage/deploy/elastic-cloud/find-cloud-id.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To use the Cloud ID, you need:
4242
* The unique Cloud ID for your deployment, available from the deployment overview page.
4343
* A user ID and password that has permission to send data to your cluster.
4444

45-
In our examples, we use the `elastic` superuser that every Elasticsearch cluster comes with. The password for the `elastic` user is provided when you create a deployment (and can also be [reset](../../users-roles/cluster-or-deployment-auth/built-in-users.md) if you forget it). On a production system, you should adapt these examples by creating a user that can write to and access only the minimally required indices. For each Beat, review the specific feature and role table, similar to the one in [Metricbeat](asciidocalypse://docs/beats/docs/reference/metricbeat/feature-roles.md) documentation.
45+
In our examples, we use the `elastic` superuser that every Elasticsearch cluster comes with. The password for the `elastic` user is provided when you create a deployment (and can also be [reset](../../users-roles/cluster-or-deployment-auth/built-in-users.md) if you forget it). On a production system, you should adapt these examples by creating a user that can write to and access only the minimally required indices. For each Beat, review the specific feature and role table, similar to the one in [Metricbeat](beats://reference/metricbeat/feature-roles.md) documentation.
4646

4747

4848

@@ -51,7 +51,7 @@ To use the Cloud ID, you need:
5151
The following example shows how you can send operational data from Metricbeat to {{ecloud}} by using the Cloud ID. Any of the available Beats will work, but we had to pick one for this example.
5252

5353
::::{tip}
54-
For others, you can learn more about [getting started](asciidocalypse://docs/beats/docs/reference/index.md) with each Beat.
54+
For others, you can learn more about [getting started](beats://reference/index.md) with each Beat.
5555
::::
5656

5757

@@ -60,8 +60,8 @@ To get started with Metricbeat and {{ecloud}}:
6060
1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
6161
2. [Create a new deployment](create-an-elastic-cloud-hosted-deployment.md) and copy down the password for the `elastic` user.
6262
3. On the deployment overview page, copy down the Cloud ID.
63-
4. Set up the Beat of your choice, such as [Metricbeat version 7.17](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-installation-configuration.md).
64-
5. [Configure the Beat output to send to Elastic Cloud](asciidocalypse://docs/beats/docs/reference/metricbeat/configure-cloud-id.md).
63+
4. Set up the Beat of your choice, such as [Metricbeat version 7.17](beats://reference/metricbeat/metricbeat-installation-configuration.md).
64+
5. [Configure the Beat output to send to Elastic Cloud](beats://reference/metricbeat/configure-cloud-id.md).
6565

6666
::::{note}
6767
Make sure you replace the values for `cloud.id` and `cloud.auth` with your own information.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refer to [{{stack}} third-party dependencies](https://artifacts.elastic.co/reports/dependencies/dependencies-current.html) for the complete list of dependencies.

deploy-manage/deploy/self-managed/air-gapped-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Specifically:
3838

3939
## {{beats}} [air-gapped-beats]
4040

41-
Elastic {{beats}} are light-weight data shippers. They do not require any special configuration in air-gapped environments. To learn more, refer to the [{{beats}} documentation](asciidocalypse://docs/beats/docs/reference/index.md).
41+
Elastic {{beats}} are light-weight data shippers. They do not require any special configuration in air-gapped environments. To learn more, refer to the [{{beats}} documentation](beats://reference/index.md).
4242

4343

4444
## {{ls}} [air-gapped-logstash]

0 commit comments

Comments
 (0)