Skip to content

Commit 6a78b6a

Browse files
authored
Remove types from watcher docs (#38002)
Types have been deprecated and this commit removes the documentation for specifying types in the index action, and search input/transform. Relates #37594 #35190
1 parent 36ee78d commit 6a78b6a

File tree

7 files changed

+7
-23
lines changed

7 files changed

+7
-23
lines changed

x-pack/docs/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ setups['my_inactive_watch'] = '''
122122
"actions": {
123123
"test_index": {
124124
"index": {
125-
"index": "test",
126-
"doc_type": "test2"
125+
"index": "test"
127126
}
128127
}
129128
}

x-pack/docs/en/rest-api/watcher/ack-watch.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ PUT _watcher/watch/my_watch
6868
"test_index": {
6969
"throttle_period": "15m",
7070
"index": {
71-
"index": "test",
72-
"doc_type": "test2"
71+
"index": "test"
7372
}
7473
}
7574
}

x-pack/docs/en/rest-api/watcher/execute-watch.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ This is an example of the output:
255255
"index": {
256256
"response": {
257257
"index": "test",
258-
"type": "test2",
258+
"type": "_doc",
259259
"version": 1,
260260
"created": true,
261261
"result": "created",

x-pack/docs/en/rest-api/watcher/get-watch.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ Response:
8181
"actions": {
8282
"test_index": {
8383
"index": {
84-
"index": "test",
85-
"doc_type": "test2"
84+
"index": "test"
8685
}
8786
}
8887
}

x-pack/docs/en/watcher/actions/index.asciidoc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ The following snippet shows a simple `index` action definition:
1616
"transform": { ... }, <3>
1717
"index" : {
1818
"index" : "my-index", <4>
19-
"doc_type" : "my-type", <5>
20-
"doc_id": "my-id" <6>
19+
"doc_id": "my-id" <5>
2120
}
2221
}
2322
}
@@ -27,8 +26,7 @@ The following snippet shows a simple `index` action definition:
2726
<2> An optional <<condition, condition>> to restrict action execution
2827
<3> An optional <<transform, transform>> to transform the payload and prepare the data that should be indexed
2928
<4> The elasticsearch index to store the data to
30-
<5> The document type to store the data as
31-
<6> An optional `_id` for the document, if it should always be the same document.
29+
<5> An optional `_id` for the document, if it should always be the same document.
3230

3331

3432
[[index-action-attributes]]
@@ -40,7 +38,6 @@ The following snippet shows a simple `index` action definition:
4038

4139
| `index` | yes | - | The Elasticsearch index to index into.
4240

43-
| `doc_type` | yes | - | The type of the document the data will be indexed as.
4441

4542
| `doc_id` | no | - | The optional `_id` of the document.
4643

@@ -75,5 +72,5 @@ When a `_doc` field exists, if the field holds an object, it is extracted and in
7572
as a single document. If the field holds an array of objects, each object is treated as
7673
a document and the index action indexes all of them in a bulk.
7774

78-
An `_index`, `_type` or `_id` value can be added per document to dynamically set the ID
75+
An `_index`, or `_id` value can be added per document to dynamically set the ID
7976
of the indexed document.

x-pack/docs/en/watcher/input/search.asciidoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ documents from the `logs` index:
2424
"search" : {
2525
"request" : {
2626
"indices" : [ "logs" ],
27-
"types" : [ "event" ],
2827
"body" : {
2928
"query" : { "match_all" : {}}
3029
}
@@ -172,9 +171,6 @@ accurately.
172171
| `request.indices` | no | - | The indices to search. If omitted, all indices are searched, which is the
173172
default behaviour in Elasticsearch.
174173

175-
| `request.types` | no | - | The document types to search for. If omitted, all document types are are
176-
searched, which is the default behaviour in Elasticsearch.
177-
178174
| `request.body` | no | - | The body of the request. The {ref}/search-request-body.html[request body]
179175
follows the same structure you normally send in the body of a REST `_search`
180176
request. The body can be static text or include `mustache` <<templates, templates>>.

x-pack/docs/en/watcher/transform/search.asciidoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ The following table lists all available settings for the search transform:
5656

5757
| `request.indices` | no | all indices | One or more indices to search on.
5858

59-
| `request.types` | no | all types | One or more document types to search on (may be a
60-
comma-delimited string or an array of document types
61-
names)
62-
6359
| `request.body` | no | `match_all` query | The body of the request. The
6460
{ref}/search-request-body.html[request body] follows
6561
the same structure you normally send in the body of
@@ -105,7 +101,6 @@ time of the watch:
105101
"search" : {
106102
"request" : {
107103
"indices" : [ "logstash-*" ],
108-
"types" : [ "event" ],
109104
"body" : {
110105
"size" : 0,
111106
"query" : {
@@ -145,7 +140,6 @@ The following is an example of using templates that refer to provided parameters
145140
"search" : {
146141
"request" : {
147142
"indices" : [ "logstash-*" ],
148-
"types" : [ "event" ],
149143
"template" : {
150144
"source" : {
151145
"size" : 0,

0 commit comments

Comments
 (0)