Skip to content
This repository was archived by the owner on Aug 16, 2022. It is now read-only.

Commit 8a2b628

Browse files
Merge pull request #25 from opendistro/master
merge
2 parents 3b766ee + 232413a commit 8a2b628

File tree

13 files changed

+159
-58
lines changed

13 files changed

+159
-58
lines changed

_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ baseurl: "/for-elasticsearch-docs" # the subpath of your site, e.g. /blog
2020
url: "https://opendistro.github.io" # the base hostname & protocol for your site, e.g. http://example.com
2121
permalink: pretty
2222

23-
odfe_version: 1.13.0
23+
odfe_version: 1.13.1
24+
temp_plugin_version: 1.13.0
2425
es_version: 7.10.2
2526

2627
# Build settings

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bundle exec jekyll serve --host localhost --port 4000 --livereload --open-url
1+
bundle exec jekyll serve --host localhost --port 4000 --incremental --livereload --open-url

docs/elasticsearch/snapshot-restore.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ nav_order: 30
77

88
# Take and restore snapshots
99

10-
Snapshots are backups of a cluster's indices and *state*. State includes cluster settings, node information, index settings, and shard allocation.
10+
Snapshots are backups of a cluster's indices and state. State includes cluster settings, node information, index settings, and shard allocation.
1111

1212
Snapshots have two main uses:
1313

14-
- Recovering from failure
14+
- **Recovering from failure**
1515

1616
For example, if cluster health goes red, you might restore the red indices from a snapshot.
1717

18-
- Migrating from one cluster to another
18+
- **Migrating from one cluster to another**
1919

20-
For example, if you are moving from a proof-of-concept to a production cluster, you might take a snapshot of the former and restore it on the latter.
20+
For example, if you're moving from a proof-of-concept to a production cluster, you might take a snapshot of the former and restore it on the latter.
2121

2222

2323
---
@@ -31,7 +31,7 @@ Snapshots have two main uses:
3131

3232
## About snapshots
3333

34-
Snapshots are not instantaneous; they take time to complete and do not represent perfect point-in-time views of the cluster. While a snapshot is in-progress, you can still index documents and make other requests to the cluster, but new documents (and updates to existing documents) generally aren't included in the snapshot. The snapshot includes primary shards as they existed when Elasticsearch initiated the snapshot. Depending on the size of your snapshot thread pool, different shards might be included in the snapshot at slightly different times.
34+
Snapshots aren't instantaneous. They take time to complete and do not represent perfect point-in-time views of the cluster. While a snapshot is in progress, you can still index documents and make other requests to the cluster, but new documents and updates to existing documents generally aren't included in the snapshot. The snapshot includes primary shards as they existed when Elasticsearch initiated the snapshot. Depending on the size of your snapshot thread pool, different shards might be included in the snapshot at slightly different times.
3535

3636
Elasticsearch snapshots are incremental, meaning that they only store data that has changed since the last successful snapshot. The difference in disk usage between frequent and infrequent snapshots is often minimal.
3737

@@ -43,7 +43,7 @@ If you need to delete a snapshot, be sure to use the Elasticsearch API rather th
4343

4444
## Register repository
4545

46-
Before you can take a snapshot, you have to "register" a snapshot repository. A snapshot repository is really just a storage location: a shared file system, Amazon S3, Hadoop Distributed File System (HDFS), Azure Storage, etc.
46+
Before you can take a snapshot, you have to "register" a snapshot repository. A snapshot repository is just a storage location: a shared file system, Amazon S3, Hadoop Distributed File System (HDFS), Azure Storage, etc.
4747

4848

4949
### Shared file system
@@ -81,13 +81,13 @@ Before you can take a snapshot, you have to "register" a snapshot repository. A
8181
}
8282
```
8383

84-
You probably only need to specify `location`, but to summarize the options:
84+
You probably only need to specify `location`, but the following table summarizes the options:
8585

8686
Setting | Description
8787
:--- | :---
8888
location | The shared file system for snapshots. Required.
8989
chunk_size | Breaks large files into chunks during snapshot operations (e.g. `64mb`, `1gb`), which is important for cloud storage providers and far less important for shared file systems. Default is `null` (unlimited). Optional.
90-
compress | Whether to compress metadata files. This setting does not affect data files, which might already be compressed (depending on your index settings). Default is `false`. Optional.
90+
compress | Whether to compress metadata files. This setting does not affect data files, which might already be compressed, depending on your index settings. Default is `false`. Optional.
9191
max_restore_bytes_per_sec | The maximum rate at which snapshots restore. Default is 40 MB per second (`40m`). Optional.
9292
max_snapshot_bytes_per_sec | The maximum rate at which snapshots take. Default is 40 MB per second (`40m`). Optional.
9393
readonly | Whether the repository is read-only. Useful when migrating from one cluster (`"readonly": false` when registering) to another cluster (`"readonly": true` when registering). Optional.
@@ -165,7 +165,7 @@ readonly | Whether the repository is read-only. Useful when migrating from one c
165165
POST _nodes/reload_secure_settings
166166
```
167167
168-
1. Create an S3 bucket if you don't already have one. To take snapshots, you must have permissions to access the bucket. The following IAM policy is an example of those permissions:
168+
1. Create an S3 bucket if you don't already have one. To take snapshots, you need permissions to access the bucket. The following IAM policy is an example of those permissions:
169169
170170
```json
171171
{
@@ -196,7 +196,7 @@ readonly | Whether the repository is read-only. Useful when migrating from one c
196196
}
197197
```
198198

199-
You probably don't need to specify anything but `bucket` and `base_path`, but to summarize the options:
199+
You probably don't need to specify anything but `bucket` and `base_path`, but the following table summarizes the options:
200200

201201
Setting | Description
202202
:--- | :---
@@ -206,7 +206,7 @@ buffer_size | The threshold beyond which chunks (of `chunk_size`) should be brok
206206
canned_acl | S3 has several [canned ACLs](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) that the `repository-s3` plugin can add to objects as it creates them in S3. Default is `private`. Optional.
207207
chunk_size | Breaks files into chunks during snapshot operations (e.g. `64mb`, `1gb`), which is important for cloud storage providers and far less important for shared file systems. Default is `1gb`. Optional.
208208
client | When specifying client settings (e.g. `s3.client.default.access_key`), you can use a string other than `default` (e.g. `s3.client.backup-role.access_key`). If you used an alternate name, change this value to match. Default and recommended value is `default`. Optional.
209-
compress | Whether to compress metadata files. This setting does not affect data files, which depending on your index settings, might already be compressed. Default is `false`. Optional.
209+
compress | Whether to compress metadata files. This setting does not affect data files, which might already be compressed, depending on your index settings. Default is `false`. Optional.
210210
max_restore_bytes_per_sec | The maximum rate at which snapshots restore. Default is 40 MB per second (`40m`). Optional.
211211
max_snapshot_bytes_per_sec | The maximum rate at which snapshots take. Default is 40 MB per second (`40m`). Optional.
212212
readonly | Whether the repository is read-only. Useful when migrating from one cluster (`"readonly": false` when registering) to another cluster (`"readonly": true` when registering). Optional.
@@ -227,7 +227,7 @@ The following snapshot includes all indices and the cluster state:
227227
PUT _snapshot/my-repository/1
228228
```
229229

230-
You can also add a request body to include or exclude certain indices or specify some other settings:
230+
You can also add a request body to include or exclude certain indices or specify other settings:
231231

232232
```json
233233
PUT _snapshot/my-repository/2
@@ -241,12 +241,12 @@ PUT _snapshot/my-repository/2
241241

242242
Setting | Description
243243
:--- | :---
244-
indices | The indices that you want to include in the snapshot. You can use `,` to create a list of indices, `*` to specify an index pattern, and `-` to exclude certain indices. Don't put spaces between items. Default is all indices.
244+
indices | The indices you want to include in the snapshot. You can use `,` to create a list of indices, `*` to specify an index pattern, and `-` to exclude certain indices. Don't put spaces between items. Default is all indices.
245245
ignore_unavailable | If an index from the `indices` list doesn't exist, whether to ignore it rather than fail the snapshot. Default is false.
246246
include_global_state | Whether to include cluster state in the snapshot. Default is true.
247247
partial | Whether to allow partial snapshots. Default is false, which fails the entire snapshot if one or more shards fails to store.
248248

249-
If you request the snapshot immediately after taking it, you might see something like:
249+
If you request the snapshot immediately after taking it, you might see something like this:
250250

251251
```json
252252
GET _snapshot/my-repository/2
@@ -267,7 +267,7 @@ GET _snapshot/my-repository/2
267267
}
268268
```
269269

270-
Note that the snapshot is still in progress. If you want to wait for the snapshot to finish before continuing, add the `wait_for_completion` parameter to your request. Snapshots can take a while to complete, though, so consider whether or not this option fits your use case:
270+
Note that the snapshot is still in progress. If you want to wait for the snapshot to finish before continuing, add the `wait_for_completion` parameter to your request. Snapshots can take a while to complete, so consider whether or not this option fits your use case:
271271

272272
```
273273
PUT _snapshot/my-repository/3?wait_for_completion=true
@@ -283,7 +283,7 @@ PARTIAL | At least one shard failed to store successfully. Can only occur if you
283283
FAILED | The snapshot encountered an error and stored no data.
284284
INCOMPATIBLE | The snapshot is incompatible with the version of Elasticsearch running on this cluster. See [Conflicts and compatibility](#conflicts-and-compatibility).
285285

286-
You can't take a snapshot if one is currently in progress. To check:
286+
You can't take a snapshot if one is currently in progress. To check the status:
287287

288288
```
289289
GET _snapshot/_status
@@ -304,7 +304,7 @@ To see all snapshots in a repository:
304304
GET _snapshot/my-repository/_all
305305
```
306306

307-
Then you can restore a snapshot:
307+
Then restore a snapshot:
308308

309309
```
310310
POST _snapshot/my-repository/2/_restore
@@ -333,7 +333,7 @@ POST _snapshot/my-repository/2/_restore
333333

334334
Setting | Description
335335
:--- | :---
336-
indices | The indices that you want to restore. You can use `,` to create a list of indices, `*` to specify an index pattern, and `-` to exclude certain indices. Don't put spaces between items. Default is all indices.
336+
indices | The indices you want to restore. You can use `,` to create a list of indices, `*` to specify an index pattern, and `-` to exclude certain indices. Don't put spaces between items. Default is all indices.
337337
ignore_unavailable | If an index from the `indices` list doesn't exist, whether to ignore it rather than fail the restore operation. Default is false.
338338
include_global_state | Whether to restore the cluster state. Default is false.
339339
include_aliases | Whether to restore aliases alongside their associated indices. Default is true.
@@ -356,19 +356,19 @@ We recommend ceasing write requests to a cluster before restoring from a snapsho
356356
1. A write request to the now-deleted alias creates a new index with the same name as the alias.
357357
1. The alias from the snapshot fails to restore due to a naming conflict with the new index.
358358

359-
Snapshots are only forward-compatible, and only by one major version. For example, snapshots taken on a 2.x cluster can't be restored on a 1.x cluster or a 6.x cluster, but they *can* be restored on a 2.x or 5.x cluster.
359+
Snapshots are only forward-compatible by one major version. For example, you can't restore snapshots taken on a 2.x cluster to a 1.x cluster or a 6.x cluster, but you *can* restore them on a 2.x or 5.x cluster.
360360

361361
If you have an old snapshot, you can sometimes restore it into an intermediate cluster, reindex all indices, take a new snapshot, and repeat until you arrive at your desired version, but you might find it easier to just manually index your data on the new cluster.
362362

363363

364364
## Security plugin considerations
365365

366-
If you are using the security plugin, snapshots have some additional restrictions:
366+
If you're using the security plugin, snapshots have some additional restrictions:
367367

368-
- In order to perform snapshot and restore operations, users must have the built-in `manage_snapshots` role.
368+
- To perform snapshot and restore operations, users must have the built-in `manage_snapshots` role.
369369
- You can't restore snapshots that contain global state or the `.opendistro_security` index.
370370

371-
If a snapshot contains global state, you must exclude it when performing the restore. If your snapshot also contains the `.opendistro_security` index, either exclude it or list all the other indices that you want to include:
371+
If a snapshot contains global state, you must exclude it when performing the restore. If your snapshot also contains the `.opendistro_security` index, either exclude it or list all the other indices you want to include:
372372

373373
```json
374374
POST _snapshot/my-repository/3/_restore

docs/im/ism/policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The following example action has a timeout period of one hour. The policy retrie
8888
}
8989
```
9090

91-
For a list of available unit types, see [Supported units](../../elasticsearch/units/).
91+
For a list of available unit types, see [Supported units](../../../elasticsearch/units/).
9292

9393
## ISM supported operations
9494

@@ -159,7 +159,7 @@ Parameter | Description | Type | Required
159159
}
160160
```
161161

162-
For information about setting replicas, see [Primary and replica shards](../../elasticsearch/#primary-and-replica-shards).
162+
For information about setting replicas, see [Primary and replica shards](../../../elasticsearch/#primary-and-replica-shards).
163163

164164
### close
165165

@@ -308,7 +308,7 @@ Parameter | Description | Type
308308

309309
### snapshot
310310

311-
Backup your cluster’s indices and state. For more information about snapshots, see [Take and restore snapshots](../../elasticsearch/snapshot-restore/).
311+
Backup your cluster’s indices and state. For more information about snapshots, see [Take and restore snapshots](../../../elasticsearch/snapshot-restore/).
312312

313313
The `snapshot` operation has the following parameters:
314314

@@ -435,7 +435,7 @@ Note that this condition does not execute at exactly 5:00 PM; the job still exec
435435

436436
A window of an hour, which this example uses, is generally sufficient, but you might increase it to 2--3 hours to avoid missing the window and having to wait a week for the transition to occur. Alternately, you could use a broader expression such as `* * * * SAT,SUN` to have the transition occur at any time during the weekend.
437437

438-
For information on writing cron expressions, see [Cron expression reference](../../alerting/cron/).
438+
For information on writing cron expressions, see [Cron expression reference](../../../alerting/cron/).
439439

440440
---
441441

docs/im/ism/settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Setting | Default | Description
3232

3333
## Audit history indices
3434

35-
If you don't want to disable ISM audit history or shorten the retention period, you can create an [index template](../../elasticsearch/index-templates/) to reduce the shard count of the history indices:
35+
If you don't want to disable ISM audit history or shorten the retention period, you can create an [index template](../../../elasticsearch/index-templates/) to reduce the shard count of the history indices:
3636

3737
```json
3838
PUT _index_template/ism_history_indices

docs/install/helm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Resource | Description
2020
The specification in the default Helm chart supports many standard use cases and setups. You can modify the default chart to configure your desired specifications and set Transport Layer Security (TLS) and role-based access control (RBAC).
2121

2222
For information about the default configuration, steps to configure security, and configurable parameters, see the
23-
[README](https://github.com/opendistro-for-elasticsearch/community/tree/master/open-distro-elasticsearch-kubernetes/helm).
23+
[README](https://github.com/opendistro-for-elasticsearch/community/tree/main/open-distro-elasticsearch-kubernetes/helm).
2424

2525
The instructions here assume you have a Kubernetes cluster with Helm preinstalled. See the [Kubernetes documentation](https://kubernetes.io/docs/setup/) for steps to configure a Kubernetes cluster and the [Helm documentation](https://helm.sh/docs/intro/install/) to install Helm.
2626
{: .note }

docs/install/plugins.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ If you don't want to use the all-in-one Open Distro for Elasticsearch installati
3232
<tr>
3333
<td>7.10.2</td>
3434
<td>
35-
<pre>opendistro-alerting 1.13.0.0
35+
<pre>opendistro-alerting 1.13.1.0
3636
opendistro-anomaly-detection 1.13.0.0
3737
opendistro-asynchronous-search 1.13.0.1
38-
opendistro-index-management 1.13.0.0
38+
opendistro-index-management 1.13.1.0
3939
opendistro-job-scheduler 1.13.0.0
4040
opendistro-knn 1.13.0.0
4141
opendistro-performance-analyzer 1.13.0.0
4242
opendistro-reports-scheduler 1.13.0.0
4343
opendistro-sql 1.13.0.0
44-
opendistro_security 1.13.0.0
44+
opendistro_security 1.13.1.0
4545
</pre>
4646
</td>
4747
</tr>
@@ -252,7 +252,7 @@ The security plugin has a corresponding [Kibana plugin](../../kibana/plugins) th
252252
### Job scheduler
253253

254254
```bash
255-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-job-scheduler/opendistro-job-scheduler-{{site.odfe_version}}.0.zip
255+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-job-scheduler/opendistro-job-scheduler-{{site.temp_plugin_version}}.0.zip
256256
```
257257

258258

@@ -268,14 +268,14 @@ To install Alerting, you must first install the Job Scheduler plugin. Alerting h
268268
### SQL
269269

270270
```bash
271-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-sql/opendistro-sql-{{site.odfe_version}}.0.zip
271+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-sql/opendistro-sql-{{site.temp_plugin_version}}.0.zip
272272
```
273273

274274

275275
### Reports scheduler
276276

277277
```bash
278-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-reports-scheduler/opendistro-reports-scheduler-{{site.odfe_version}}.0.zip
278+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-reports-scheduler/opendistro-reports-scheduler-{{site.temp_plugin_version}}.0.zip
279279
```
280280

281281

@@ -296,21 +296,21 @@ k-NN is only available as part of the all-in-one installs: Docker, RPM, and Debi
296296
### Anomaly detection
297297

298298
```bash
299-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-anomaly-detection/opendistro-anomaly-detection-{{site.odfe_version}}.0.zip
299+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-anomaly-detection/opendistro-anomaly-detection-{{site.temp_plugin_version}}.0.zip
300300
```
301301

302302

303303
### Asynchronous search
304304

305305
```bash
306-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-asynchronous-search/opendistro-asynchronous-search-{{site.odfe_version}}.1.zip
306+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-asynchronous-search/opendistro-asynchronous-search-{{site.temp_plugin_version}}.1.zip
307307
```
308308

309309

310310
### Performance Analyzer
311311

312312
```bash
313-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/performance-analyzer/opendistro-performance-analyzer-{{site.odfe_version}}.0.zip
313+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/performance-analyzer/opendistro-performance-analyzer-{{site.temp_plugin_version}}.0.zip
314314
```
315315

316316
Performance Analyzer requires some manual configuration after installing the plugin:

0 commit comments

Comments
 (0)