Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove types from watcher docs #38002

Merged
merged 4 commits into from
Jan 30, 2019
Merged

Remove types from watcher docs #38002

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dba086
Remove types from watcher docs
jakelandis Jan 30, 2019
5954cda
handle rest-api docs
jakelandis Jan 30, 2019
faa0195
Merge branch 'master' into watcher_types_removal_docs
jakelandis Jan 30, 2019
7aa41de
remove type from doc test setup
jakelandis Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions x-pack/docs/en/watcher/actions/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ The following snippet shows a simple `index` action definition:
"transform": { ... }, <3>
"index" : {
"index" : "my-index", <4>
"doc_type" : "my-type", <5>
"doc_id": "my-id" <6>
"doc_id": "my-id" <5>
}
}
}
Expand All @@ -27,8 +26,7 @@ The following snippet shows a simple `index` action definition:
<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
<4> The elasticsearch index to store the data to
<5> The document type to store the data as
<6> An optional `_id` for the document, if it should always be the same document.
<5> An optional `_id` for the document, if it should always be the same document.


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

| `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.

Expand Down Expand Up @@ -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
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.
4 changes: 0 additions & 4 deletions x-pack/docs/en/watcher/input/search.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ documents from the `logs` index:
"search" : {
"request" : {
"indices" : [ "logs" ],
"types" : [ "event" ],
"body" : {
"query" : { "match_all" : {}}
}
Expand Down Expand Up @@ -172,9 +171,6 @@ accurately.
| `request.indices` | no | - | The indices to search. If omitted, all indices are searched, which is the
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]
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>>.
Expand Down
6 changes: 0 additions & 6 deletions x-pack/docs/en/watcher/transform/search.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
{ref}/search-request-body.html[request body] follows
the same structure you normally send in the body of
Expand Down Expand Up @@ -105,7 +101,6 @@ time of the watch:
"search" : {
"request" : {
"indices" : [ "logstash-*" ],
"types" : [ "event" ],
"body" : {
"size" : 0,
"query" : {
Expand Down Expand Up @@ -145,7 +140,6 @@ The following is an example of using templates that refer to provided parameters
"search" : {
"request" : {
"indices" : [ "logstash-*" ],
"types" : [ "event" ],
"template" : {
"source" : {
"size" : 0,
Expand Down