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
This commit is contained in:
Jake Landis 2019-01-30 13:12:13 -06:00 committed by GitHub
parent 36ee78d924
commit 6a78b6a31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 23 deletions

View File

@ -122,8 +122,7 @@ setups['my_inactive_watch'] = '''
"actions": { "actions": {
"test_index": { "test_index": {
"index": { "index": {
"index": "test", "index": "test"
"doc_type": "test2"
} }
} }
} }

View File

@ -68,8 +68,7 @@ PUT _watcher/watch/my_watch
"test_index": { "test_index": {
"throttle_period": "15m", "throttle_period": "15m",
"index": { "index": {
"index": "test", "index": "test"
"doc_type": "test2"
} }
} }
} }

View File

@ -255,7 +255,7 @@ This is an example of the output:
"index": { "index": {
"response": { "response": {
"index": "test", "index": "test",
"type": "test2", "type": "_doc",
"version": 1, "version": 1,
"created": true, "created": true,
"result": "created", "result": "created",

View File

@ -81,8 +81,7 @@ Response:
"actions": { "actions": {
"test_index": { "test_index": {
"index": { "index": {
"index": "test", "index": "test"
"doc_type": "test2"
} }
} }
} }

View File

@ -16,8 +16,7 @@ The following snippet shows a simple `index` action definition:
"transform": { ... }, <3> "transform": { ... }, <3>
"index" : { "index" : {
"index" : "my-index", <4> "index" : "my-index", <4>
"doc_type" : "my-type", <5> "doc_id": "my-id" <5>
"doc_id": "my-id" <6>
} }
} }
} }
@ -27,8 +26,7 @@ The following snippet shows a simple `index` action definition:
<2> An optional <<condition, condition>> to restrict action execution <2> An optional <<condition, condition>> to restrict action execution
<3> An optional <<transform, transform>> to transform the payload and prepare the data that should be indexed <3> An optional <<transform, transform>> to transform the payload and prepare the data that should be indexed
<4> The elasticsearch index to store the data to <4> The elasticsearch index to store the data to
<5> The document type to store the data as <5> An optional `_id` for the document, if it should always be the same document.
<6> An optional `_id` for the document, if it should always be the same document.
[[index-action-attributes]] [[index-action-attributes]]
@ -40,7 +38,6 @@ The following snippet shows a simple `index` action definition:
| `index` | yes | - | The Elasticsearch index to index into. | `index` | yes | - | The Elasticsearch index to index into.
| `doc_type` | yes | - | The type of the document the data will be indexed as.
| `doc_id` | no | - | The optional `_id` of the document. | `doc_id` | no | - | The optional `_id` of the document.
@ -75,5 +72,5 @@ When a `_doc` field exists, if the field holds an object, it is extracted and in
as a single document. If the field holds an array of objects, each object is treated as as a single document. If the field holds an array of objects, each object is treated as
a document and the index action indexes all of them in a bulk. a document and the index action indexes all of them in a bulk.
An `_index`, `_type` or `_id` value can be added per document to dynamically set the ID An `_index`, or `_id` value can be added per document to dynamically set the ID
of the indexed document. of the indexed document.

View File

@ -24,7 +24,6 @@ documents from the `logs` index:
"search" : { "search" : {
"request" : { "request" : {
"indices" : [ "logs" ], "indices" : [ "logs" ],
"types" : [ "event" ],
"body" : { "body" : {
"query" : { "match_all" : {}} "query" : { "match_all" : {}}
} }
@ -172,9 +171,6 @@ accurately.
| `request.indices` | no | - | The indices to search. If omitted, all indices are searched, which is the | `request.indices` | no | - | The indices to search. If omitted, all indices are searched, which is the
default behaviour in Elasticsearch. default behaviour in Elasticsearch.
| `request.types` | no | - | The document types to search for. If omitted, all document types are are
searched, which is the default behaviour in Elasticsearch.
| `request.body` | no | - | The body of the request. The {ref}/search-request-body.html[request body] | `request.body` | no | - | The body of the request. The {ref}/search-request-body.html[request body]
follows the same structure you normally send in the body of a REST `_search` follows the same structure you normally send in the body of a REST `_search`
request. The body can be static text or include `mustache` <<templates, templates>>. request. The body can be static text or include `mustache` <<templates, templates>>.

View File

@ -56,10 +56,6 @@ The following table lists all available settings for the search transform:
| `request.indices` | no | all indices | One or more indices to search on. | `request.indices` | no | all indices | One or more indices to search on.
| `request.types` | no | all types | One or more document types to search on (may be a
comma-delimited string or an array of document types
names)
| `request.body` | no | `match_all` query | The body of the request. The | `request.body` | no | `match_all` query | The body of the request. The
{ref}/search-request-body.html[request body] follows {ref}/search-request-body.html[request body] follows
the same structure you normally send in the body of the same structure you normally send in the body of
@ -105,7 +101,6 @@ time of the watch:
"search" : { "search" : {
"request" : { "request" : {
"indices" : [ "logstash-*" ], "indices" : [ "logstash-*" ],
"types" : [ "event" ],
"body" : { "body" : {
"size" : 0, "size" : 0,
"query" : { "query" : {
@ -145,7 +140,6 @@ The following is an example of using templates that refer to provided parameters
"search" : { "search" : {
"request" : { "request" : {
"indices" : [ "logstash-*" ], "indices" : [ "logstash-*" ],
"types" : [ "event" ],
"template" : { "template" : {
"source" : { "source" : {
"size" : 0, "size" : 0,