Skip to content

Commit c5c21a8

Browse files
authored
Merge branch 'main' into add-failure-store
2 parents 5f77e94 + bda60d9 commit c5c21a8

26 files changed

+212
-47
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The examples in this section are purely descriptive and should not be considered
1919

2020
## Metricbeat for Kubernetes monitoring [k8s_metricbeat_for_kubernetes_monitoring]
2121

22-
```sh
22+
```sh subs=true
2323
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/metricbeat_hosts.yaml
2424
```
2525

@@ -31,7 +31,7 @@ Deploys Metricbeat as a DaemonSet that monitors the usage of the following resou
3131

3232
## Filebeat with autodiscover [k8s_filebeat_with_autodiscover]
3333

34-
```sh
34+
```sh subs=true
3535
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/filebeat_autodiscover.yaml
3636
```
3737

@@ -40,7 +40,7 @@ Deploys Filebeat as a DaemonSet with the autodiscover feature enabled. It collec
4040

4141
## Filebeat with autodiscover for metadata [k8s_filebeat_with_autodiscover_for_metadata]
4242

43-
```sh
43+
```sh subs=true
4444
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
4545
```
4646

@@ -52,7 +52,7 @@ Deploys Filebeat as a DaemonSet with the autodiscover feature enabled. Logs from
5252

5353
## Filebeat without autodiscover [k8s_filebeat_without_autodiscover]
5454

55-
```sh
55+
```sh subs=true
5656
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/filebeat_no_autodiscover.yaml
5757
```
5858

@@ -61,7 +61,7 @@ Deploys Filebeat as a DaemonSet with the autodiscover feature disabled. Uses the
6161

6262
## {{es}} and {{kib}} Stack Monitoring [k8s_elasticsearch_and_kibana_stack_monitoring]
6363

64-
```sh
64+
```sh subs=true
6565
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/stack_monitoring.yaml
6666
```
6767

@@ -75,7 +75,7 @@ In this example, TLS verification is disabled when Metricbeat communicates with
7575

7676
## Heartbeat monitoring {{es}} and {{kib}} health [k8s_heartbeat_monitoring_elasticsearch_and_kibana_health]
7777

78-
```sh
78+
```sh subs=true
7979
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/heartbeat_es_kb_health.yaml
8080
```
8181

@@ -84,7 +84,7 @@ Deploys Heartbeat as a single Pod deployment that monitors the health of {{es}}
8484

8585
## Auditbeat [k8s_auditbeat]
8686

87-
```sh
87+
```sh subs=true
8888
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/auditbeat_hosts.yaml
8989
```
9090

@@ -93,7 +93,7 @@ Deploys Auditbeat as a DaemonSet that checks file integrity and audits file oper
9393

9494
## Packetbeat monitoring DNS and HTTP traffic [k8s_packetbeat_monitoring_dns_and_http_traffic]
9595

96-
```sh
96+
```sh subs=true
9797
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/packetbeat_dns_http.yaml
9898
```
9999

@@ -102,7 +102,7 @@ Deploys Packetbeat as a DaemonSet that monitors DNS on port `53` and HTTP(S) tra
102102

103103
## OpenShift monitoring [k8s_openshift_monitoring]
104104

105-
```sh
105+
```sh subs=true
106106
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/beats/openshift_monitoring.yaml
107107
```
108108

deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The examples in this section are for illustration purposes only and should not b
1919

2020
## System and {{k8s}} {{integrations}} [k8s_system_and_k8s_integrations]
2121

22-
```sh
22+
```sh subs=true
2323
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
2424
```
2525

@@ -28,7 +28,7 @@ Deploys {{agent}} as a DaemonSet in {{fleet}} mode with System and {{k8s}} {{int
2828

2929
## System and {{k8s}} {{integrations}} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
3030

31-
```sh
31+
```sh subs=true
3232
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml
3333
```
3434

@@ -42,7 +42,7 @@ The DaemonSet itself must run as root to set up permissions and ECK >= 2.10.0 is
4242

4343
## Custom logs integration with autodiscover [k8s_custom_logs_integration_with_autodiscover]
4444

45-
```sh
45+
```sh subs=true
4646
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml
4747
```
4848

@@ -51,7 +51,7 @@ Deploys {{agent}} as a DaemonSet in {{fleet}} mode with Custom Logs integration
5151

5252
## APM integration [k8s_apm_integration]
5353

54-
```sh
54+
```sh subs=true
5555
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/fleet-apm-integration.yaml
5656
```
5757

@@ -60,7 +60,7 @@ Deploys single instance {{agent}} Deployment in {{fleet}} mode with APM integrat
6060

6161
## Synthetic monitoring [k8s_synthetic_monitoring]
6262

63-
```sh
63+
```sh subs=true
6464
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/synthetic-monitoring.yaml
6565
```
6666

deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The examples in this section are for illustration purposes only. They should not
1919

2020
## Single pipeline defined in CRD [k8s-logstash-configuration-single-pipeline-crd]
2121

22-
```sh
22+
```sh subs=true
2323
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-eck.yaml
2424
```
2525

@@ -28,7 +28,7 @@ Deploys Logstash with a single pipeline defined in the CRD
2828

2929
## Single Pipeline defined in Secret [k8s-logstash-configuration-single-pipeline-secret]
3030

31-
```sh
31+
```sh subs=true
3232
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-pipeline-as-secret.yaml
3333
```
3434

@@ -37,7 +37,7 @@ Deploys Logstash with a single pipeline defined in a secret, referenced by a `pi
3737

3838
## Pipeline configuration in mounted volume [k8s-logstash-configuration-pipeline-volume]
3939

40-
```sh
40+
```sh subs=true
4141
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-pipeline-as-volume.yaml
4242
```
4343

@@ -46,7 +46,7 @@ Deploys Logstash with a single pipeline defined in a secret, mounted as a volume
4646

4747
## Writing to a custom {{es}} index [k8s-logstash-configuration-custom-index]
4848

49-
```sh
49+
```sh subs=true
5050
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-es-role.yaml
5151
```
5252

@@ -55,7 +55,7 @@ Deploys Logstash and {{es}}, and creates an updated version of the `eck_logstash
5555

5656
## Creating persistent volumes for PQ and DLQ [k8s-logstash-configuration-pq-dlq]
5757

58-
```sh
58+
```sh subs=true
5959
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-volumes.yaml
6060
```
6161

@@ -67,7 +67,7 @@ Deploys Logstash, Beats and {{es}}. Logstash is configured with two pipelines:
6767

6868
## {{es}} and {{kib}} Stack Monitoring [k8s-logstash-configuration-stack-monitoring]
6969

70-
```sh
70+
```sh subs=true
7171
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-monitored.yaml
7272
```
7373

@@ -76,7 +76,7 @@ Deploys an {{es}} and {{kib}} monitoring cluster, and a Logstash that will send
7676

7777
## Multiple pipelines/multiple {{es}} clusters [k8s-logstash-configuration-multiple-pipelines]
7878

79-
```sh
79+
```sh subs=true
8080
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/logstash/logstash-multi.yaml
8181
```
8282

deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The examples in this section are for illustration purposes only and should not b
1919

2020
## System integration [k8s_system_integration]
2121

22-
```sh
22+
```sh subs=true
2323
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/system-integration.yaml
2424
```
2525

@@ -28,7 +28,7 @@ Deploys Elastic Agent as a DaemonSet in standalone mode with system integration
2828

2929
## Kubernetes integration [k8s_kubernetes_integration]
3030

31-
```sh
31+
```sh subs=true
3232
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/kubernetes-integration.yaml
3333
```
3434

@@ -37,7 +37,7 @@ Deploys Elastic Agent as a DaemonSet in standalone mode with Kubernetes integrat
3737

3838
## Multiple {{es}} clusters output [k8s_multiple_elasticsearch_clusters_output]
3939

40-
```sh
40+
```sh subs=true
4141
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/config/recipes/elastic-agent/multi-output.yaml
4242
```
4343

deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can find example Helm values files for deploying and managing more advanced
4545

4646
To use one or more of these example configurations, use the `--values` Helm option, as seen in the following section.
4747

48-
```sh
48+
```sh subs=true
4949
# Install an eck-managed Elasticsearch and Kibana using the Elasticsearch node roles example with hot, warm, and cold data tiers, and the Kibana example customizing the http service.
5050
helm install es-quickstart elastic/eck-stack -n elastic-stack --create-namespace \
5151
--values https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/deploy/eck-stack/examples/elasticsearch/hot-warm-cold.yaml \
@@ -56,7 +56,7 @@ helm install es-quickstart elastic/eck-stack -n elastic-stack --create-namespace
5656

5757
The following section builds upon the previous section, and allows installing Fleet Server, and Fleet-managed Elastic Agents along with {{es}} and {{kib}}.
5858

59-
```sh
59+
```sh subs=true
6060
# Install an eck-managed Elasticsearch, Kibana, Fleet Server, and managed Elastic Agents using custom values.
6161
helm install eck-stack-with-fleet elastic/eck-stack \
6262
--values https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/deploy/eck-stack/examples/agent/fleet-agents.yaml -n elastic-stack
@@ -66,7 +66,7 @@ helm install eck-stack-with-fleet elastic/eck-stack \
6666

6767
The following section builds upon the previous sections, and allows installing Logstash along with {{es}}, {{kib}} and Beats.
6868

69-
```sh
69+
```sh subs=true
7070
# Install an eck-managed Elasticsearch, Kibana, Beats and Logstash using custom values.
7171
helm install eck-stack-with-logstash elastic/eck-stack \
7272
--values https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/deploy/eck-stack/examples/logstash/basic-eck.yaml -n elastic-stack
@@ -76,7 +76,7 @@ helm install eck-stack-with-logstash elastic/eck-stack \
7676

7777
The following section builds upon the previous sections, and allows installing a standalone Elastic APM Server along with {{es}} and {{kib}}.
7878

79-
```sh
79+
```sh subs=true
8080
# Install an eck-managed Elasticsearch, Kibana, and standalone APM Server using custom values.
8181
helm install eck-stack-with-apm-server elastic/eck-stack \
8282
--values https://raw.githubusercontent.com/elastic/cloud-on-k8s/{{eck_release_branch}}/deploy/eck-stack/examples/apm-server/basic.yaml -n elastic-stack

deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,22 @@ products:
1616

1717
Once you are [prepared to upgrade](/deploy-manage/upgrade/prepare-to-upgrade.md), a single click in the {{ecloud}} console can upgrade a deployment to a newer version, add more processing capacity, change plugins, and enable or disable high availability, all at the same time. During the upgrade process, {{es}}, {{kib}}, Elastic APM, and all of your deployment components are upgraded simultaneously.
1818

19-
You can perform minor version upgrades, upgrades from 8.18 to 9.0.0, and cluster configuration changes with no downtime. {{ecloud}} only supports upgrades to released versions. Release candidate builds and master snapshots are not supported.
19+
{{ecloud}} only supports upgrades to released versions. Release candidate builds and master snapshots are not supported.
2020

2121
::::{important}
2222
Although it’s simple to upgrade an {{ecloud}} deployment, the new version might include breaking changes that affect your application. Ensure you review breaking changes and deprecation logs, make any necessary changes, and test against the new version before upgrading your production deployment.
2323
::::
2424

25+
## Availability during upgrades
26+
27+
For deployments with nodes in more than one availability zone, you can perform minor version upgrades, upgrades from 8.18 to 9.0.0, and cluster configuration changes with no downtime. Deployments with nodes in only one zone might experience downtime during these operations.
28+
29+
When {{kib}} instances are upgraded, all instances are shut down simultaneously, making {{kib}} temporarily inaccessible, even if it's deployed across multiple zones.
30+
31+
If your indices are not highly available (configured with at least one replica), or if certain components of your deployment run in only one zone, you might experience availability issues for requests that depend on that specific data or component, while the affected nodes are being restarted.
32+
33+
Refer to [Plan for production](/deploy-manage/deploy/elastic-cloud/elastic-cloud-hosted-planning.md) for more information about High Availability (HA) on ECH.
34+
2535
## Perform the upgrade [perform-cloud-upgrade]
2636

2737
Log in to your {{ecloud}} environment:

manage-data/lifecycle/curator.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
navigation_title: Curator
33
applies_to:
44
stack: ga
5-
serverless: ga
65
---
76

87
# Elasticsearch Curator

manage-data/lifecycle/data-tiers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ mapped_pages:
55
- https://www.elastic.co/guide/en/cloud/current/ec-disable-data-tier.html
66
applies_to:
77
stack: ga
8-
serverless: ga
98
products:
109
- id: elasticsearch
1110
- id: cloud-enterprise

manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mapped_pages:
44
- https://www.elastic.co/guide/en/elasticsearch/reference/current/set-up-lifecycle-policy.html
55
applies_to:
66
stack: ga
7-
serverless: ga
87
products:
98
- id: elasticsearch
109
---

manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mapped_pages:
44
- https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-index-lifecycle.html
55
applies_to:
66
stack: ga
7-
serverless: ga
87
products:
98
- id: elasticsearch
109
---

0 commit comments

Comments
 (0)