Skip to content

Commit f671327

Browse files
Merge branch 'main' into issue-5061-update-9.0-serv
2 parents 28a198a + d14d4f3 commit f671327

40 files changed

+529
-89
lines changed

.github/ISSUE_TEMPLATE/issue-report.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ body:
1919
- Missing information
2020
- I can't find what I'm looking for
2121
- Other
22-
- Other
2322
- type: input
2423
id: link
2524
attributes:

deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ The following sections describe how to customize an Elastic Maps Server deployme
3535
* [Disable TLS](http-configuration.md#k8s-maps-http-disable-tls)
3636
* [Ingress and Kibana configuration](http-configuration.md#k8s-maps-ingress)
3737

38+
:::{admonition} Support scope for Ingress Controllers
39+
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) is a standard Kubernetes concept. While ECK-managed workloads can be publicly exposed using ingress resources, and we provide [example configurations](/deploy-manage/deploy/cloud-on-k8s/recipes.md), setting up an Ingress controller requires in-house Kubernetes expertise.
40+
41+
If ingress configuration is challenging or unsupported in your environment, consider using standard `LoadBalancer` services as a simpler alternative.
42+
:::
3843

3944

4045

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,10 @@ You can disable the generation of the self-signed certificate and hence disable
3333

3434
To use Elastic Maps Server from your Kibana instances, you need to configure Kibana to fetch maps from your Elastic Maps Server instance by using the [`map.emsUrl`](/explore-analyze/visualize/maps/maps-connect-to-ems.md#elastic-maps-server-kibana) configuration key. The value of this setting needs to be the URL where the Elastic Maps Server instance is reachable from your browser. The certificates presented by Elastic Maps Server need to be trusted by the browser, and the URL must have the same origin as the URL where your Kibana is hosted to avoid cross origin resource issues. Check the [recipe section](https://github.com/elastic/cloud-on-k8s/tree/2.16/config/recipes/) for an example on how to set this up using an Ingress resource.
3535

36+
:::{admonition} Support scope for Ingress Controllers
37+
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) is a standard Kubernetes concept. While ECK-managed workloads can be publicly exposed using ingress resources, and we provide [example configurations](/deploy-manage/deploy/cloud-on-k8s/recipes.md), setting up an Ingress controller requires in-house Kubernetes expertise.
38+
39+
If ingress configuration is challenging or unsupported in your environment, consider using standard `LoadBalancer` services as a simpler alternative.
40+
:::
3641

3742

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ helm install es-quickstart elastic/eck-elasticsearch -n elastic-stack --create-n
101101

102102
## Adding Ingress to the Elastic stack [k8s-eck-stack-ingress]
103103

104+
:::{admonition} Support scope for Ingress Controllers
105+
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) is a standard Kubernetes concept. While ECK-managed workloads can be publicly exposed using ingress resources, and we provide [example configurations](/deploy-manage/deploy/cloud-on-k8s/recipes.md), setting up an Ingress controller requires in-house Kubernetes expertise.
106+
107+
If ingress configuration is challenging or unsupported in your environment, consider using standard `LoadBalancer` services as a simpler alternative.
108+
:::
109+
110+
104111
Both {{es}} and {{kib}} support [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/), which can be enabled using the following options:
105112

106113
**If an individual chart is used (not eck-stack)**

deploy-manage/deploy/cloud-on-k8s/recipes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@ This section includes recipes that provide configuration examples for some commo
2222
Compared to other configuration examples that are consistently tested, like [fleet-managed Elastic Agent on ECK](configuration-examples-fleet.md), [standalone Elastic Agent on ECK](configuration-examples-standalone.md), or [Beats on ECK](/deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md), the recipes in this section are not regularly tested by our automation system, and therefore should not be considered to be production-ready.
2323
::::
2424

25+
:::{admonition} Support scope for Ingress Controllers
26+
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) is a standard Kubernetes concept. While ECK-managed workloads can be publicly exposed using ingress resources, and we provide [example configurations](/deploy-manage/deploy/cloud-on-k8s/recipes.md), setting up an Ingress controller requires in-house Kubernetes expertise.
27+
28+
If ingress configuration is challenging or unsupported in your environment, consider using standard `LoadBalancer` services as a simpler alternative.
29+
:::
30+
31+
2532

deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ The default Kubernetes service created by ECK, named `<cluster_name>-es-http`, i
1212

1313
As an alternative, you can use features provided by third-party software such as service meshes and ingress controllers to achieve more advanced traffic management configurations. Check the [recipes directory](https://github.com/elastic/cloud-on-k8s/tree/2.16/config/recipes) in the ECK source repository for a few examples.
1414

15+
:::{admonition} Support scope for Ingress Controllers
16+
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) is a standard Kubernetes concept. While ECK-managed workloads can be publicly exposed using ingress resources, and we provide [example configurations](/deploy-manage/deploy/cloud-on-k8s/recipes.md), setting up an Ingress controller requires in-house Kubernetes expertise.
17+
18+
If ingress configuration is challenging or unsupported in your environment, consider using standard `LoadBalancer` services as a simpler alternative.
19+
:::
20+
21+
1522
The service configurations shown in these sections are based on the following Elasticsearch cluster definition:
1623

1724
```yaml

deploy-manage/upgrade/prepare-to-upgrade.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,13 @@ POST _create_from/.ml-anomalies-custom-example/.reindexed-v9-ml-anomalies-custom
156156
}
157157
```
158158
159-
2. Set the number of replicas to `0.`
159+
2. Set the number of replicas to `0`. You must also set the `auto_expand_replicas` parameter to `false` to change the number of replicas:
160160
161161
```json
162162
PUT /.reindexed-v9-ml-anomalies-custom-example/_settings
163163
{
164164
"index": {
165+
"auto_expand_replicas": false,
165166
"number_of_replicas": 0
166167
}
167168
}
@@ -187,13 +188,14 @@ POST _create_from/.ml-anomalies-custom-example/.reindexed-v9-ml-anomalies-custom
187188
GET _tasks/<task_id>
188189
```
189190
190-
4. Set the number of replicas to the original number when the reindexing is finished.
191+
4. Set the number of replicas to the original number when the reindexing is finished. Optionally, you can set the `auto_expand_replicas` parameter back to its default value (`0-1`) to allow the number of replicas to be automatically adjusted based on the number of data nodes in the cluster.
191192
192193
```json
193194
PUT /.reindexed-v9-ml-anomalies-custom-example/_settings
194195
{
195196
"index": {
196-
"number_of_replicas": "<original_number_of_replicas>"
197+
"number_of_replicas": "<original_number_of_replicas>",
198+
"auto_expand_replicas": "0-1"
197199
}
198200
}
199201
```

0 commit comments

Comments
 (0)