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

Commit a23f232

Browse files
resolving conflict
2 parents 8c1d8bd + e2b9215 commit a23f232

File tree

20 files changed

+89
-77
lines changed

20 files changed

+89
-77
lines changed

docs/elasticsearch/snapshot-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ readonly | Whether the repository is read-only. Useful when migrating from one c
101101
If you're using the Docker installation, see [Run with custom plugins](../../install/docker/#run-with-custom-plugins). Your `Dockerfile` should look something like this:
102102

103103
```
104-
FROM amazon/opendistro-for-elasticsearch:1.2.1
104+
FROM amazon/opendistro-for-elasticsearch:1.3.0
105105

106106
ENV AWS_ACCESS_KEY_ID <access-key>
107107
ENV AWS_SECRET_ACCESS_KEY <secret-key>

docs/ism/api.md renamed to docs/im/api.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
layout: default
3-
title: ISM API
4-
parent: Index State Management
3+
title: IM API
4+
parent: Index Management
55
nav_order: 5
66
---
77

8-
# ISM API
8+
# IM API
99

10-
Use the index state management operations to programmatically work with policies and managed indices.
10+
Use the index management operations to programmatically work with policies and managed indices.
1111

1212
---
1313

@@ -179,7 +179,7 @@ POST _opendistro/_ism/add/<index>
179179

180180
## Update policy
181181

182-
Updates a policy. Use the `seq_no` and `primary_term` parameters to update an existing policy. If these numbers don't match the existing policy or the policy doesn't exist, ISM throws an error.
182+
Updates a policy. Use the `seq_no` and `primary_term` parameters to update an existing policy. If these numbers don't match the existing policy or the policy doesn't exist, IM throws an error.
183183

184184
#### Request
185185

@@ -408,7 +408,7 @@ DELETE _opendistro/_ism/policies/<policy-id>
408408

409409
## Remove policy from index
410410

411-
Removes any ISM policy from the index.
411+
Removes any IM policy from the index.
412412

413413
#### Request
414414

@@ -459,7 +459,7 @@ POST _opendistro/_ism/update_policy/<index>
459459

460460
## Retry failed index
461461

462-
Retries the failed action for an index. For the retry call to succeed, ISM must manage the index, and the index must be in a failed state. You can use index patterns (`*`) to retry multiple failed indices.
462+
Retries the failed action for an index. For the retry call to succeed, IM must manage the index, and the index must be in a failed state. You can use index patterns (`*`) to retry multiple failed indices.
463463

464464
#### Request
465465

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
---
22
layout: default
3-
title: Index State Management
3+
title: Index Management
44
nav_order: 33
55
has_children: true
66
---
77

8-
# Index State Management
8+
# Index Management
99
Kibana
1010
{: .label .label-yellow :}
1111

1212
If you analyze time-series data, you likely prioritize new data over old data. You might periodically perform certain operations on older indices, such as reducing replica count or deleting them.
1313

14-
Index State Management (ISM) is a plugin that lets you automate these periodic, administrative operations by triggering them based on changes in the index age, index size, or number of documents. Using the ISM plugin, you can define *policies* that automatically handle index rollovers or deletions to fit your use case.
14+
Index Management (IM) is a plugin that lets you automate these periodic, administrative operations by triggering them based on changes in the index age, index size, or number of documents. Using the IM plugin, you can define *policies* that automatically handle index rollovers or deletions to fit your use case.
1515

1616
For example, you can define a policy that moves your index into a `read_only` state after 30 days and then deletes it after a set period of 90 days. You can also set up the policy to send you a notification message when the index is deleted.
1717

1818
You might want to perform an index rollover after a certain amount of time or run a `force_merge` operation on an index during off-peak hours to improve search performance during peak hours.
1919

20-
## Get started with ISM
20+
## Get started with IM
2121

2222
To get started, choose **Index Management** in Kibana.
2323

2424
### Step 1: Set up policies
2525

26-
A policy is a set of rules that describes how an index should be managed. For information about creating a policy, see [Policies](../ism/policies/).
26+
A policy is a set of rules that describes how an index should be managed. For information about creating a policy, see [Policies](../im/policies/).
2727

2828
1. Choose the **Index Policies** tab.
2929
2. Choose **Create policy**.
@@ -42,23 +42,23 @@ You can also include the `policy_id` in an index template so when an index is cr
4242
4. From the **Policy ID** menu, choose the policy that you created.
4343
You can see a preview of your policy.
4444
5. If your policy includes a rollover operation, specify a rollover alias.
45-
Make sure that the alias that you enter already exists. For more information about the rollover operation, see [rollover](../ism/policies/#rollover).
45+
Make sure that the alias that you enter already exists. For more information about the rollover operation, see [rollover](../im/policies/#rollover).
4646
6. Choose **Apply**.
4747

48-
After you attach a policy to an index, a job is created that executes every 5 minutes by default to perform the actions set in the policy and check the conditions to transition the index into different states. To change the default time interval for this job, see [Settings](../ism/settings/).
48+
After you attach a policy to an index, a job is created that executes every 5 minutes by default to perform the actions set in the policy and check the conditions to transition the index into different states. To change the default time interval for this job, see [Settings](../im/settings/).
4949

50-
If you want to use an Elasticsearch operation to create an index with a policy already attached to it, see [create index](../ism/api//#create-index).
50+
If you want to use an Elasticsearch operation to create an index with a policy already attached to it, see [add policy at index creation](../im/api/#add-policy-at-index-creation).
5151

5252
### Step 3: Manage indices
5353

5454
1. Choose **Managed Indices**.
55-
2. To change your policy, see [Change Policy](../ism/managedindices#changepolicy).
55+
2. To change your policy, see [Change Policy](../im/managedindices#changepolicy).
5656
3. To attach a rollover alias to your index, select your policy and choose **Add rollover alias**.
57-
Make sure that the alias that you enter already exists. For more information about the rollover operation, see [rollover](../ism/policies/#rollover).
57+
Make sure that the alias that you enter already exists. For more information about the rollover operation, see [rollover](../im/policies/#rollover).
5858
4. To remove a policy, choose your policy, and then choose **Remove policy**.
5959
5. To retry a policy, choose your policy, and then choose **Retry policy**.
6060

61-
For information about managing your policies, see [Managed Indices](../ism/managedindices/).
61+
For information about managing your policies, see [Managed Indices](../im/managedindices/).
6262

63-
To use the ISM plugin, you need to have the correct admin privileges as set in the security plugin.
63+
To use the IM plugin, you need to have the correct admin privileges as set in the security plugin.
6464
{: .note }

docs/ism/managedindices.md renamed to docs/im/managedindices.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
title: Managed Indices
44
nav_order: 3
5-
parent: Index State Management
5+
parent: Index Management
66
has_children: false
77
---
88

@@ -58,11 +58,11 @@ The following example shows a managed index policy:
5858

5959
## Change policy
6060

61-
You can change any managed index policy, but ISM has a few constraints in place to make sure that policy changes don't break indices.
61+
You can change any managed index policy, but IM has a few constraints in place to make sure that policy changes don't break indices.
6262

63-
If an index is stuck in its current state, never proceeding, and you want to update its policy immediately, make sure that the new policy includes the same state---same name, same actions, same order---as the old policy. In this case, even if the policy is in the middle of executing an action, ISM applies the new policy.
63+
If an index is stuck in its current state, never proceeding, and you want to update its policy immediately, make sure that the new policy includes the same state---same name, same actions, same order---as the old policy. In this case, even if the policy is in the middle of executing an action, IM applies the new policy.
6464

65-
If you update the policy without including an identical state, ISM updates the policy only after all actions in the current state finish executing. Alternately, you can choose a specific state in your old policy after which you want the new policy to take effect.
65+
If you update the policy without including an identical state, IM updates the policy only after all actions in the current state finish executing. Alternately, you can choose a specific state in your old policy after which you want the new policy to take effect.
6666

6767
To change a policy using Kibana, do the following:
6868

docs/ism/policies.md renamed to docs/im/policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
title: Policies
44
nav_order: 1
5-
parent: Index State Management
5+
parent: Index Management
66
has_children: false
77
---
88

@@ -86,8 +86,8 @@ The following example action has a timeout period of one hour. The policy retrie
8686
}
8787
```
8888

89-
## ISM supported operations
90-
ISM supports the following operations:
89+
## IM supported operations
90+
IM supports the following operations:
9191

9292
- [forcemerge](#forcemerge)
9393
- [read_only](#read_only)
@@ -267,7 +267,7 @@ The following example transitions the index to a `cold` state after a period of
267267
]
268268
```
269269

270-
ISM checks the conditions every execution of the policy based on the set interval.
270+
IM checks the conditions every execution of the policy based on the set interval.
271271

272272
## Example policy
273273

docs/ism/settings.md renamed to docs/im/settings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
layout: default
33
title: Settings
4-
parent: Index State Management
4+
parent: Index Management
55
nav_order: 4
66
---
77

88
# Settings
99

10-
We recommend that you don't change the settings. The default settings should work well for most use cases.
10+
We don't recommend changing these settings; the defaults should work well for most use cases.
1111

12-
Index Management (IM) stores its configuration in the `.opendistro-ism-config` index. Don't modify this index without using the [IM API operations](../api/).
12+
IM stores its configuration in the `.opendistro-ism-config` index. Don't modify this index without using the [IM API operations](../api/).
1313

1414
All settings are available using the Elasticsearch `_cluster/settings` operation. None require a restart, and all can be marked `persistent` or `transient`.
1515

docs/install/deb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ These steps assume you're using Ubuntu 18.04.
3737
1. Install Elasticsearch OSS:
3838

3939
```bash
40-
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.2.1-amd64.deb
41-
sudo dpkg -i elasticsearch-oss-7.2.1-amd64.deb
40+
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.3.2-amd64.deb
41+
sudo dpkg -i elasticsearch-oss-7.3.2-amd64.deb
4242
```
4343

4444
1. Install the latest version of Open Distro for Elasticsearch:

docs/install/docker-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Before deploying to a production environment, you should replace the demo securi
1616
version: '3'
1717
services:
1818
odfe-node1:
19-
image: amazon/opendistro-for-elasticsearch:1.2.1
19+
image: amazon/opendistro-for-elasticsearch:1.3.0
2020
container_name: odfe-node1
2121
environment:
2222
- cluster.name=odfe-cluster
@@ -52,7 +52,7 @@ services:
5252
networks:
5353
- odfe-net
5454
odfe-node2:
55-
image: amazon/opendistro-for-elasticsearch:1.2.1
55+
image: amazon/opendistro-for-elasticsearch:1.3.0
5656
container_name: odfe-node2
5757
environment:
5858
- cluster.name=odfe-cluster
@@ -85,7 +85,7 @@ services:
8585
networks:
8686
- odfe-net
8787
kibana:
88-
image: amazon/opendistro-for-elasticsearch-kibana:1.2.1
88+
image: amazon/opendistro-for-elasticsearch-kibana:1.3.0
8989
container_name: odfe-kibana
9090
ports:
9191
- 5601:5601

docs/install/docker.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ nav_order: 1
1010
You can pull the Open Distro for Elasticsearch Docker image just like any other image:
1111

1212
```bash
13-
docker pull amazon/opendistro-for-elasticsearch:1.2.1
14-
docker pull amazon/opendistro-for-elasticsearch-kibana:1.2.1
13+
docker pull amazon/opendistro-for-elasticsearch:1.3.0
14+
docker pull amazon/opendistro-for-elasticsearch-kibana:1.3.0
1515
```
1616

1717
To check available versions, see [Docker Hub](https://hub.docker.com/r/amazon/opendistro-for-elasticsearch/tags).
@@ -33,7 +33,7 @@ Open Distro for Elasticsearch images use `centos:7` as the base image. If you ru
3333
To run the image for local development:
3434

3535
```bash
36-
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.2.1
36+
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.3.0
3737
```
3838

3939
Then send requests to the server to verify that Elasticsearch is up and running:
@@ -86,7 +86,7 @@ This sample file starts two data nodes and Kibana.
8686
version: '3'
8787
services:
8888
odfe-node1:
89-
image: amazon/opendistro-for-elasticsearch:1.2.1
89+
image: amazon/opendistro-for-elasticsearch:1.3.0
9090
container_name: odfe-node1
9191
environment:
9292
- cluster.name=odfe-cluster
@@ -110,7 +110,7 @@ services:
110110
networks:
111111
- odfe-net
112112
odfe-node2:
113-
image: amazon/opendistro-for-elasticsearch:1.2.1
113+
image: amazon/opendistro-for-elasticsearch:1.3.0
114114
container_name: odfe-node2
115115
environment:
116116
- cluster.name=odfe-cluster
@@ -131,7 +131,7 @@ services:
131131
networks:
132132
- odfe-net
133133
kibana:
134-
image: amazon/opendistro-for-elasticsearch-kibana:1.2.1
134+
image: amazon/opendistro-for-elasticsearch-kibana:1.3.0
135135
container_name: odfe-kibana
136136
ports:
137137
- 5601:5601
@@ -164,7 +164,7 @@ docker run \
164164
-p 9200:9200 -p 9600:9600 \
165165
-e "discovery.type=single-node" \
166166
-v /<full-path-to>/custom-elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml \
167-
amazon/opendistro-for-elasticsearch:1.2.1
167+
amazon/opendistro-for-elasticsearch:1.3.0
168168
```
169169

170170
You can perform the same operation in `docker-compose.yml` using a relative path:
@@ -220,7 +220,7 @@ The `docker-compose.yml` file above also contains several key settings: `bootstr
220220
To run the image with a custom plugin, first create a [`Dockerfile`](https://docs.docker.com/engine/reference/builder/):
221221

222222
```
223-
FROM amazon/opendistro-for-elasticsearch:1.2.1
223+
FROM amazon/opendistro-for-elasticsearch:1.3.0
224224
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch <plugin-name-or-url>
225225
```
226226

@@ -234,7 +234,7 @@ docker run -p 9200:9200 -p 9600:9600 -v /usr/share/elasticsearch/data odfe-custo
234234
You can also use a `Dockerfile` to pass your own certificates for use with the [Security](../../security-configuration/) plugin, similar to the `-v` argument in [Configure Elasticsearch](#configure-elasticsearch):
235235

236236
```
237-
FROM amazon/opendistro-for-elasticsearch:1.2.1
237+
FROM amazon/opendistro-for-elasticsearch:1.3.0
238238
COPY --chown=elasticsearch:elasticsearch elasticsearch.yml /usr/share/elasticsearch/config/
239239
COPY --chown=elasticsearch:elasticsearch my-key-file.pem /usr/share/elasticsearch/config/
240240
COPY --chown=elasticsearch:elasticsearch my-certificate-chain.pem /usr/share/elasticsearch/config/

docs/install/plugins.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ If you don't want to use the all-in-one Open Distro for Elasticsearch installati
2929
</tr>
3030
</thead>
3131
<tbody>
32+
<tr>
33+
<td>7.3.2</td>
34+
<td>
35+
<pre>opendistro-job-scheduler 1.3.0.0
36+
opendistro_alerting 1.3.0.1
37+
opendistro_index_management 1.3.0.1
38+
opendistro_performance_analyzer 1.3.0.0
39+
opendistro_security 1.3.0.0
40+
opendistro_sql 1.3.0.0
41+
</pre>
42+
</td>
43+
</tr>
3244
<tr>
3345
<td>7.2.1</td>
3446
<td>
@@ -129,7 +141,7 @@ Navigate to the Elasticsearch home directory (most likely, it is `/usr/share/ela
129141
### Security
130142

131143
```bash
132-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-security/opendistro_security-1.2.1.0.zip
144+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-security/opendistro_security-1.3.0.0.zip
133145
```
134146

135147
After installing the Security plugin, you can run `sudo sh /usr/share/elasticsearch/plugins/opendistro_security/tools/install_demo_configuration.sh` to quickly get started with demo certificates. Otherwise, you must configure it manually and run [securityadmin.sh](../../security-configuration/security-admin/).
@@ -140,7 +152,7 @@ Security has a corresponding [Kibana plugin](../../kibana/plugins) that you prob
140152
### Alerting
141153

142154
```bash
143-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-alerting/opendistro_alerting-1.2.1.0.zip
155+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-alerting/opendistro_alerting-1.3.0.1.zip
144156
```
145157

146158
Alerting has a corresponding [Kibana plugin](../../kibana/plugins) that you probably want to install as well.
@@ -149,19 +161,17 @@ Alerting has a corresponding [Kibana plugin](../../kibana/plugins) that you prob
149161
### SQL
150162

151163
```bash
152-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-sql/opendistro_sql-1.2.1.0.zip
164+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-sql/opendistro_sql-1.3.0.0.zip
153165
```
154166

155-
### Index State Management
156-
157-
This plugin is not officially released.
158167

159-
To beta test this plugin, download the latest release from [GitHub](https://github.com/opendistro-for-elasticsearch/index-management/releases) and install the plugin:
168+
### Index Management
160169

161170
```bash
162-
sudo bin/elasticsearch-plugin install file:///path/to/file
171+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-index-management/opendistro_index_management-1.3.0.1.zip
163172
```
164173

174+
165175
### Anomaly Detection
166176

167177
This is a preview plugin, which we do not recommend using in production. It's currently in development and is subject to change.
@@ -172,7 +182,7 @@ To test this plugin, clone [the anomaly detection repository](https://github.com
172182
### Performance Analyzer
173183

174184
```bash
175-
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/performance-analyzer/opendistro_performance_analyzer-1.2.1.0.zip
185+
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/performance-analyzer/opendistro_performance_analyzer-1.3.0.0.zip
176186
```
177187

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

0 commit comments

Comments
 (0)