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

Commit e2056c1

Browse files
Merge pull request #5 from opendistro/master
merging
2 parents 2621f47 + 9f75537 commit e2056c1

File tree

18 files changed

+1277
-59
lines changed

18 files changed

+1277
-59
lines changed

docs/alerting/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ PUT _opendistro/_alerting/destinations/<destination-id>
836836
#### Request
837837

838838
```
839-
_opendistro/_alerting/destinations/<destination-id>
839+
DELETE _opendistro/_alerting/destinations/<destination-id>
840840
```
841841

842842
#### Sample response

docs/alerting/cron.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Minute | 0-59
1616
Hour | 0-23
1717
Day of month | 1-31
1818
Month | 1-12
19-
Day of week | 0-7 (0 and 7 are both Sunday)
19+
Day of week | 0-7 (0 and 7 are both Sunday) or SUN, MON, TUE, WED, THU, FRI, SAT
2020

2121
For example, the following expression translates to "every Monday through Friday at 11:30 AM":
2222

docs/elasticsearch/cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ In this case, all primary shards are allocated to `odfe-d2`. Again, all replica
327327

328328
A popular approach is to configure your [index templates](../index-templates/) to set the `index.routing.allocation.require.temp` value to `hot`. This way, Elasticsearch stores your most recent data on your hot nodes.
329329

330-
{% comment %}You can then use the [Index State Management (ISM)](../../ism/index/) plugin to periodically check the age of an index and specify actions to take on it. For example, when the index reaches a specific age, change the `index.routing.allocation.require.temp` setting to `warm` to automatically move your data from hot nodes to warm nodes.{% endcomment %}
330+
You can then use the [Index State Management (ISM)](../../ism/index/) plugin to periodically check the age of an index and specify actions to take on it. For example, when the index reaches a specific age, change the `index.routing.allocation.require.temp` setting to `warm` to automatically move your data from hot nodes to warm nodes.
331331

332332

333333
## Next steps

docs/elasticsearch/index-templates.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Index templates let you initialize new indices with predefined mappings and sett
2323
To create an index template, use a POST request:
2424

2525
```json
26-
POST _template
26+
POST _index_template
2727
```
2828

2929
This command creates a template named `daily_logs` and applies it to any new index whose name matches the regular expression `logs-2020-01-*` and also adds it to the `my_logs` alias:
3030

3131
```json
32-
PUT _template/daily_logs
32+
PUT _index_template/daily_logs
3333
{
3434
"aliases": {
3535
"my_logs": {}
@@ -116,25 +116,25 @@ GET _cat/templates
116116
To find a template by its name:
117117

118118
```json
119-
GET _template/daily_logs
119+
GET _index_template/daily_logs
120120
```
121121

122122
To get a list of all your templates:
123123

124124
```json
125-
GET _template/daily_logs
125+
GET _index_template/daily_logs
126126
```
127127

128128
To get a list of all templates that match a pattern:
129129

130130
```json
131-
GET _template/daily*
131+
GET _index_template/daily*
132132
```
133133

134134
To check if a specific template exists:
135135

136136
```json
137-
HEAD _template/<name>
137+
HEAD _index_template/<name>
138138
```
139139

140140
## Configure multiple templates
@@ -150,7 +150,7 @@ For example, say you have the following two templates that both match the `logs-
150150
#### Template 1
151151

152152
```json
153-
PUT _template/template-01
153+
PUT _index_template/template-01
154154
{
155155
"index_patterns": [
156156
"logs*"
@@ -165,7 +165,7 @@ PUT _template/template-01
165165
#### Template 2
166166

167167
```json
168-
PUT _template/template-02
168+
PUT _index_template/template-02
169169
{
170170
"index_patterns": [
171171
"logs-2020-01-*"
@@ -184,7 +184,7 @@ Because `template-02` has a higher `order` value, it takes precedence over `temp
184184
You can delete an index template using its name, as shown in the following command:
185185

186186
```json
187-
DELETE _template/daily_logs
187+
DELETE _index_template/daily_logs
188188
```
189189

190190
## Index template options

docs/elasticsearch/search-template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ To run this search on a specific index, add the index name to the request:
4747
GET shakespeare/_search/template
4848
```
4949

50-
You can implement pagination using the `from` and `size` parameters.
51-
The `from` parameter indicates the document number that you want to start showing the results from. The `size` parameter refers to the number of results that you want to show. For example, if the value of `size` is 10 and the value of `from` is 0, you see the first 10 results. If you change the value of `from` to 10, you will see the next 10 results (because the results are zero-indexed). Each time the user clicks the next page for search results, your application must make the same search query with an incremented `from` value.
50+
Specify the `from` and `size` parameters:
5251

5352
```json
5453
GET _search/template

0 commit comments

Comments
 (0)