Skip to content

Commit 698f710

Browse files
Misc formatting fixes (#1115)
I did a broad search of all the generated HTML for a few patterns that suggested formatting errors. Here are the fixes to the issues I found in this repo. Note: Some of the changes are subjective (for example, when to use `subs=true` vs. just hardcoding a term like `Elasticsearch` in a code comment).
1 parent 3f7b06a commit 698f710

File tree

53 files changed

+156
-154
lines changed

Some content is hidden

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

53 files changed

+156
-154
lines changed

deploy-manage/autoscaling/autoscaling-in-eck.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ kind: ElasticsearchAutoscaler
4747
metadata:
4848
name: autoscaling-sample
4949
spec:
50-
## The name of the {{es}} cluster to be scaled automatically.
50+
## The name of the Elasticsearch cluster to be scaled automatically.
5151
elasticsearchRef:
5252
name: elasticsearch-sample
5353
## The autoscaling policies.
@@ -301,7 +301,7 @@ You should adjust those settings manually to match the size of your deployment w
301301

302302
## Autoscaling stateless applications on ECK [k8s-stateless-autoscaling]
303303

304-
::::{note}
304+
::::{note}
305305
This section only applies to stateless applications. Check [{{es}} autoscaling](#k8s-autoscaling) for more details about automatically scaling {{es}}.
306306
::::
307307

deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ To import a JVM trust store:
262262
1. The URL for the bundle ZIP file must be always available. Make sure you host the plugin artefacts internally in a highly available environment.
263263
2. Wildcards are allowed here, since the certificates are independent from the {{es}} version.
264264
265-
4. (Optional) If you prefer to use a different file name and/or password for the trust store, you also need to add an additional configuration section to the cluster metadata before adding the bundle. This configuration should be added to the `{{es}} cluster data` section of the [advanced configuration](./advanced-cluster-configuration.md) page:
265+
4. (Optional) If you prefer to use a different file name and/or password for the trust store, you also need to add an additional configuration section to the cluster metadata before adding the bundle. This configuration should be added to the `Elasticsearch cluster data` section of the [advanced configuration](./advanced-cluster-configuration.md) page:
266266
267267
```sh
268268
"jvm_trust_store": {

deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
7272
```
7373

7474
4. Install Podman:
75-
75+
7676
* For Podman 4
7777

7878
* Install the latest available version `4.*` using dnf.
@@ -322,7 +322,7 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
322322
vm.max_map_count=262144
323323
# enable forwarding so the Docker networking works as expected
324324
net.ipv4.ip_forward=1
325-
# Decrease the maximum number of TCP retransmissions to 5 as recommended for {{es}} TCP retransmission timeout.
325+
# Decrease the maximum number of TCP retransmissions to 5 as recommended for Elasticsearch TCP retransmission timeout.
326326
# See /deploy-manage/deploy/self-managed/system-config-tcpretries.md
327327
net.ipv4.tcp_retries2=5
328328
# Make sure the host doesn't swap too early

deploy-manage/deploy/cloud-enterprise/configure-host-suse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ You must use XFS and have quotas enabled on all allocators, otherwise disk usage
159159
vm.max_map_count=262144
160160
# enable forwarding so the Docker networking works as expected
161161
net.ipv4.ip_forward=1
162-
# Decrease the maximum number of TCP retransmissions to 5 as recommended for {{es}} TCP retransmission timeout.
162+
# Decrease the maximum number of TCP retransmissions to 5 as recommended for Elasticsearch TCP retransmission timeout.
163163
# See https://www.elastic.co/guide/en/elasticsearch/reference/current/system-config-tcpretries.html
164164
net.ipv4.tcp_retries2=5
165165
# Make sure the host doesn't swap too early

deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ You must use XFS and have quotas enabled on all allocators, otherwise disk usage
136136
vm.max_map_count=262144
137137
# enable forwarding so the Docker networking works as expected
138138
net.ipv4.ip_forward=1
139-
# Decrease the maximum number of TCP retransmissions to 5 as recommended for {{es}} TCP retransmission timeout.
139+
# Decrease the maximum number of TCP retransmissions to 5 as recommended for Elasticsearch TCP retransmission timeout.
140140
# See https://www.elastic.co/guide/en/elasticsearch/reference/current/system-config-tcpretries.html
141141
net.ipv4.tcp_retries2=5
142142
# Make sure the host doesn't swap too early

deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The process involves two main steps:
1717
2. [Update the {{stack}} pack included in your ECE installation to point to your modified Docker image.](#ece-modify-stack-pack)
1818

1919

20-
## Before you begin [ece_before_you_begin_5]
20+
## Before you begin [ece_before_you_begin_5]
2121

2222
Note the following restrictions:
2323

@@ -27,7 +27,7 @@ Note the following restrictions:
2727
* The Dockerfile used in this example includes an optimization process that is relatively expensive and may require a machine with several GB of RAM to run successfully.
2828

2929

30-
## Extend a {{kib}} Docker image to include additional plugins [ece-create-modified-docker-image]
30+
## Extend a {{kib}} Docker image to include additional plugins [ece-create-modified-docker-image]
3131

3232
This example runs a Dockerfile to install the [analyze_api_ui plugin](https://github.com/johtani/analyze-api-ui-plugin) or [kibana-enhanced-table](https://github.com/fbaligand/kibana-enhanced-table) into different versions of {{kib}} Docker image. The contents of the Dockerfile varies depending on the version of the {{stack}} pack that you want to modify.
3333

@@ -46,7 +46,7 @@ This example runs a Dockerfile to install the [analyze_api_ui plugin](https://gi
4646
* The version of the image
4747
* The plugin name and version number
4848

49-
::::{important}
49+
::::{important}
5050
When you modify a {{kib}} Docker image, make sure you maintain the original image structure and only add the additional plugins.
5151
::::
5252

@@ -73,7 +73,7 @@ This example runs a Dockerfile to install the [analyze_api_ui plugin](https://gi
7373

7474

7575

76-
## Modify the {{stack}} pack to point to your modified image [ece-modify-stack-pack]
76+
## Modify the {{stack}} pack to point to your modified image [ece-modify-stack-pack]
7777

7878
Follow these steps to update the {{stack}} pack zip files in your ECE setup to point to your modified Docker image:
7979

@@ -85,7 +85,7 @@ Follow these steps to update the {{stack}} pack zip files in your ECE setup to p
8585
8686
set -eo pipefail
8787
88-
# Repack a stackpack to modify the {{kib}} image it points to
88+
# Repack a stackpack to modify the Kibana image it points to
8989
9090
NO_COLOR='\033[0m'
9191
ERROR_COLOR='\033[1;31m'
@@ -152,7 +152,7 @@ Follow these steps to update the {{stack}} pack zip files in your ECE setup to p
152152

153153

154154

155-
## Common causes of problems [ece-custom-plugin-problems]
155+
## Common causes of problems [ece-custom-plugin-problems]
156156

157157
1. If the custom Docker image is not available, make sure that the image has been uploaded to your Docker repository or loaded locally onto each ECE allocator.
158158
2. If the container takes a long time to start, the problem might be that the `reoptimize` step in the Dockerfile did not complete successfully.

deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Using Docker or Podman as container runtime is a configuration local to the host
102102
```
103103

104104
4. Install Podman:
105-
105+
106106
* For Podman 4
107107

108108
* Install the latest available version `4.*` using dnf.
@@ -352,7 +352,7 @@ Using Docker or Podman as container runtime is a configuration local to the host
352352
vm.max_map_count=262144
353353
# enable forwarding so the Docker networking works as expected
354354
net.ipv4.ip_forward=1
355-
# Decrease the maximum number of TCP retransmissions to 5 as recommended for {{es}} TCP retransmission timeout.
355+
# Decrease the maximum number of TCP retransmissions to 5 as recommended for Elasticsearch TCP retransmission timeout.
356356
# See /deploy-manage/deploy/self-managed/system-config-tcpretries.md
357357
net.ipv4.tcp_retries2=5
358358
# Make sure the host doesn't swap too early

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Now that you know how to use the APM keystore and customize the server configura
160160
secret:
161161
defaultMode: 420
162162
optional: false
163-
secretName: es-ca # This is the secret that holds the {{es}} CA cert
163+
secretName: es-ca # This is the secret that holds the Elasticsearch CA cert
164164
```
165165

166166

deploy-manage/deploy/cloud-on-k8s/configure-eck.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ If you use [Operator Lifecycle Manager (OLM)](https://github.com/operator-framew
119119

120120
* Update your [Subscription](https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/subscription-config.md) to mount the ConfigMap under `/conf`.
121121

122-
```yaml
122+
```yaml subs=true
123123
apiVersion: operators.coreos.com/v1alpha1
124124
kind: Subscription
125125
metadata:

deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Validating webhooks are defined using a `ValidatingWebhookConfiguration` object
2323
* Failure policy if the webhook is unavailable (block the operation or continue without validation)
2424

2525

26-
## Defaults provided by ECK [k8s-webhook-defaults]
26+
## Defaults provided by ECK [k8s-webhook-defaults]
2727

2828
When using the default `operator.yaml` manifest, ECK is installed with a `ValidatingWebhookConfiguration` configured as follows:
2929

@@ -32,12 +32,12 @@ When using the default `operator.yaml` manifest, ECK is installed with a `Valida
3232
* The operator generates a certificate for the webhook and stores it in a secret named `elastic-webhook-server-cert` in the `elastic-system` namespace. This certificate is automatically rotated by the operator when it is due to expire.
3333

3434

35-
## Manual configuration [k8s-webhook-manual-config]
35+
## Manual configuration [k8s-webhook-manual-config]
3636

3737
If you installed ECK without the webhook and want to enable it later on, or if you want to customise the configuration such as providing your own certificates, this section describes the options available to you.
3838

3939

40-
### Configuration options [k8s-webhook-config-options]
40+
### Configuration options [k8s-webhook-config-options]
4141

4242
You can customise almost all aspects of the webhook setup by changing the [operator configuration](configure-eck.md).
4343

@@ -51,7 +51,7 @@ You can customise almost all aspects of the webhook setup by changing the [opera
5151
| `webhook-port` | 9443 | Port to listen for incoming validation requests. |
5252

5353

54-
### Using your own certificates [k8s-webhook-existing-certs]
54+
### Using your own certificates [k8s-webhook-existing-certs]
5555

5656
This section describes how you can use your own certificates for the webhook instead of letting the operator manage them automatically. There are a few important things to be aware of when going down this route:
5757

@@ -60,7 +60,7 @@ This section describes how you can use your own certificates for the webhook ins
6060
* You must update the `caBundle` fields in the `ValidatingWebhookConfiguration` yourself. This must be done at the beginning and whenever the certificate is rotated.
6161

6262

63-
#### Use a certificate signed by your own CA [k8s-webhook-own-ca]
63+
#### Use a certificate signed by your own CA [k8s-webhook-own-ca]
6464

6565
* The certificate must have a Subject Alternative Name (SAN) of the form `<service_name>.<namespace>.svc` (for example `elastic-webhook-server.elastic-system.svc`). A typical OpenSSL command to generate such a certificate would be as follows:
6666

@@ -81,7 +81,7 @@ This section describes how you can use your own certificates for the webhook ins
8181
* Set `webhook-secret` to the name of the secret you have just created (`elastic-webhook-server-custom-cert`)
8282

8383

84-
::::{note}
84+
::::{note}
8585
If you are using the [Helm chart installation method](install-using-helm-chart.md), you can install the operator by running this command:
8686

8787
```sh
@@ -95,7 +95,7 @@ helm install elastic-operator elastic/eck-operator -n elastic-system --create-na
9595

9696

9797

98-
#### Use a certificate from cert-manager [k8s-webhook-cert-manager]
98+
#### Use a certificate from cert-manager [k8s-webhook-cert-manager]
9999

100100
This section describes how to use [cert-manager](https://cert-manager.io/) to manage the webhook certificate. It assumes that there is a `ClusterIssuer` named `self-signing-issuer` available.
101101

@@ -138,7 +138,7 @@ This section describes how to use [cert-manager](https://cert-manager.io/) to ma
138138
* Set `webhook-secret` to the name of the certificate secret (`elastic-webhook-server-cert`)
139139

140140

141-
::::{note}
141+
::::{note}
142142
If you are using the [Helm chart installation method](install-using-helm-chart.md), you can install the operator by running the following command:
143143

144144
```sh
@@ -152,7 +152,7 @@ helm install elastic-operator elastic/eck-operator -n elastic-system --create-na
152152

153153

154154

155-
## Disable the webhook [k8s-disable-webhook]
155+
## Disable the webhook [k8s-disable-webhook]
156156

157157
To disable the webhook, set the [`enable-webhook`](configure-eck.md) operator configuration flag to `false` and remove the `ValidatingWebhookConfiguration` named `elastic-webhook.k8s.elastic.co`:
158158

@@ -161,12 +161,12 @@ kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io elas
161161
```
162162

163163

164-
## Troubleshooting [k8s-webhook-troubleshooting]
164+
## Troubleshooting [k8s-webhook-troubleshooting]
165165

166166
You might get errors in your Kubernetes API server logs indicating that it cannot reach the operator service (`elastic-webhook-server`). This could be because no operator pods are available to handle request or because a network policy or a firewall rule is preventing the control plane from accessing the service. To help with troubleshooting, you can change the [`failurePolicy`](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#failure-policy) of the webhook configuration to `Fail`. This will cause create or update operations to fail if there is an error contacting the webhook. Usually the error message will contain helpful information about the failure that will allow you to diagnose the root cause.
167167

168168

169-
### Resource creation taking too long or timing out [k8s-webhook-troubleshooting-timeouts]
169+
### Resource creation taking too long or timing out [k8s-webhook-troubleshooting-timeouts]
170170

171171
Webhooks require network connectivity between the Kubernetes API server and the operator. If the creation of an {{es}} resource times out with an error message similar to the following, then the Kubernetes API server might be unable to connect to the webhook to validate the manifest.
172172

@@ -228,10 +228,10 @@ spec:
228228
```
229229

230230

231-
### Updates failing due to validation errors [k8s-webhook-troubleshooting-validation-failure]
231+
### Updates failing due to validation errors [k8s-webhook-troubleshooting-validation-failure]
232232

233233
If your attempts to update a resource fail with an error message similar to the following, you can force the webhook to ignore it by removing the `kubectl.kubernetes.io/last-applied-configuration` annotation from your resource.
234234

235-
```
235+
```txt subs=true
236236
admission webhook "elastic-es-validation-v1.k8s.elastic.co" denied the request: {{es}}.elasticsearch.k8s.elastic.co "quickstart" is invalid: some-misspelled-field: Invalid value: "some-misspelled-field": some-misspelled-field field found in the kubectl.kubernetes.io/last-applied-configuration annotation is unknown
237237
```

0 commit comments

Comments
 (0)