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

Jump to bottom

Proposed changes to revise current/ingest.html . . . #28212

Merged
merged 2 commits into from
Jan 16, 2018
Merged

Proposed changes to revise current/ingest.html . . . #28212

merged 2 commits into from
Jan 16, 2018

Conversation

fbsolo
Copy link
Contributor

@fbsolo fbsolo commented Jan 14, 2018

Proposed changes for

https://www.elastic.co/guide/en/elasticsearch/reference/current/ingest.html

to improve the text flow, style, and readability . . .

  • Have you signed the contributor license agreement?
  • Have you followed the contributor guidelines?
  • If submitting code, have you built your formula locally prior to submission with gradle check?
  • If submitting code, is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.
  • If submitting code, have you checked that your submission is for an OS that we support?
  • If you are submitting this code for a class then read our policy for that.

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

1 similar comment
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@fbsolo
Copy link
Contributor Author

fbsolo commented Jan 14, 2018

I did sign the CLA a few minutes ago, but I am not a member of Elasticsearch. LMK what further steps I should take.

Thank you!

@fbsolo fbsolo closed this Jan 14, 2018
@fbsolo fbsolo reopened this Jan 14, 2018
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

1 similar comment
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

cbuescher
cbuescher requested changes Jan 15, 2018
View reviewed changes
Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fbsolo thanks a lot for your contribution, I think it really improves the current documentation. Your CLA signing looks good, however I left two small comments about things I'd like you to change, but once they are adressed I'm happy to merge it.

docs/reference/ingest.asciidoc Outdated
For example, you may have a pipeline that consists of one processor that removes a field from
the document followed by another processor that renames a field. Configured pipelines are then stored
in the <<cluster-state,cluster state>>.
To pre-process documents before indexing, define a pipeline that specifies a series of
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you keep the links to the pipeline and ingest-processor documentation? I think they are useful.

docs/reference/ingest.asciidoc Outdated

To use a pipeline, you simply specify the `pipeline` parameter on an index or bulk request to
tell the ingest node which pipeline to use. For example:
To use a pipeline, simply specify the pipeline parameter on an index or bulk request. This
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The backtics around "pipeline" shouldn't be removed here, we use them to highlight json or url parameters (like in this case).

@cbuescher cbuescher self-assigned this Jan 15, 2018
@fbsolo
Changes to the PR as suggested by @cbuescher
0e333a7 
@cbuescher suggested these changes in this PR:

1) keep the links to the pipeline and ingest-processor documentation in paragraph 3

2) Add the backticks (`) to the second {pipeline} in paragraph 4
@fbsolo
Copy link
Contributor Author

fbsolo commented Jan 15, 2018

Done.

cbuescher
cbuescher approved these changes Jan 16, 2018
View reviewed changes
Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fbsolo thanks for the update, will merge this in.

@cbuescher cbuescher merged commit d819f55 into elastic:6.1 Jan 16, 2018
cbuescher pushed a commit that referenced this pull request Jan 16, 2018
@fbsolo
[Docs] Changes to ingest.asciidoc (#28212)
71ba314
cbuescher pushed a commit that referenced this pull request Jan 16, 2018
@fbsolo
[Docs] Changes to ingest.asciidoc (#28212)
6cbca56
cbuescher pushed a commit that referenced this pull request Jan 16, 2018
@fbsolo
[Docs] Changes to ingest.asciidoc (#28212)
b75f06b
cbuescher pushed a commit that referenced this pull request Jan 16, 2018
@fbsolo
[Docs] Changes to ingest.asciidoc (#28212)
827fee2
martijnvg added a commit that referenced this pull request Jan 16, 2018
@martijnvg
Merge remote-tracking branch 'es/6.x' into ccr-6.x
76809e7 
* es/6.x: (31 commits)
  Fix eclipse build. (#28236)
  Never return null from Strings.tokenizeToStringArray (#28224)
  Fallback to TransportMasterNodeAction for cluster health retries (#28195)
  [Docs] Changes to ingest.asciidoc (#28212)
  TEST: Update logging for testAckedIndexing
  [GEO] Deprecate field parameter in GeoBoundingBoxQueryBuilder
  [GEO] Add WKT Support to GeoBoundingBoxQueryBuilder
  Avoid doing redundant work when checking for self references. (#26927)
  Fix casts in HotThreads. (#27578)
  Ignore the `-snapshot` suffix when comparing the Lucene version in the build and the docs. (#27927)
  Allow update of `eager_global_ordinals` on `_parent`. (#28014)
  Painless: Add whitelist extensions (#28161)
  Fix daitch_mokotoff phonetic filter to use the dedicated Lucene filter (#28225)
  Fix NPE on composite aggregation with sub-aggregations that need scores (#28129)
  #28045 restore removed import after backport
  Fix synonym phrase query expansion for cross_fields parsing (#28045)
  Introduce elasticsearch-core jar (#28191)
  upgrade to lucene 7.2.1 (#28218)
  [Docs] Fix an error in painless-types.asciidoc (#28221)
  Consistent updates of IndexShardSnapshotStatus (#28130)
  ...
martijnvg added a commit that referenced this pull request Jan 16, 2018
@martijnvg
Merge remote-tracking branch 'es/master' into ccr
f2093e7 
* es/master: (30 commits)
  [Docs] Fix Java Api index administration usage (#28133)
  Fix eclipse build. (#28236)
  Never return null from Strings.tokenizeToStringArray (#28224)
  Fallback to TransportMasterNodeAction for cluster health retries (#28195)
  [Docs] Changes to ingest.asciidoc (#28212)
  TEST: Update logging for testAckedIndexing
  [GEO] Add WKT Support to GeoBoundingBoxQueryBuilder
  Painless: Add whitelist extensions (#28161)
  Fix daitch_mokotoff phonetic filter to use the dedicated Lucene filter (#28225)
  Avoid doing redundant work when checking for self references. (#26927)
  Fix casts in HotThreads. (#27578)
  Ignore the `-snapshot` suffix when comparing the Lucene version in the build and the docs. (#27927)
  Allow update of `eager_global_ordinals` on `_parent`. (#28014)
  Fix NPE on composite aggregation with sub-aggregations that need scores (#28129)
  `MockTcpTransport` to connect asynchronously (#28203)
  Fix synonym phrase query expansion for cross_fields parsing (#28045)
  Introduce elasticsearch-core jar (#28191)
  #28218: Update the Lucene version for 6.2.0 after backport
  upgrade to lucene 7.2.1 (#28218)
  [Docs] Fix an error in painless-types.asciidoc (#28221)
  ...
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Jan 16, 2018
@jasontedor
Merge branch 'master' into compile-with-jdk-9
6860f66 
* master:
  [Docs] Fix base directory to include for put_mapping.asciidoc
  Open engine should keep only starting commit (elastic#28228)
  [Docs] Fix Java Api index administration usage (elastic#28133)
  Fix eclipse build. (elastic#28236)
  Never return null from Strings.tokenizeToStringArray (elastic#28224)
  Fallback to TransportMasterNodeAction for cluster health retries (elastic#28195)
  [Docs] Changes to ingest.asciidoc (elastic#28212)
  TEST: Update logging for testAckedIndexing
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Jan 16, 2018
@jasontedor
Merge branch 'master' into mrjar
57972df 
* master: (35 commits)
  Move the multi-get response tests to server
  Require JDK 9 for compilation (elastic#28071)
  Revert "[Docs] Fix Java Api index administration usage (elastic#28133)"
  Revert "[Docs] Fix base directory to include for put_mapping.asciidoc"
  Added multi get api to the high level rest client.
  [Docs] Clarify numeric datatype ranges (elastic#28240)
  [Docs] Fix base directory to include for put_mapping.asciidoc
  Open engine should keep only starting commit (elastic#28228)
  [Docs] Fix Java Api index administration usage (elastic#28133)
  Fix eclipse build. (elastic#28236)
  Never return null from Strings.tokenizeToStringArray (elastic#28224)
  Fallback to TransportMasterNodeAction for cluster health retries (elastic#28195)
  [Docs] Changes to ingest.asciidoc (elastic#28212)
  TEST: Update logging for testAckedIndexing
  [GEO] Add WKT Support to GeoBoundingBoxQueryBuilder
  Painless: Add whitelist extensions (elastic#28161)
  Fix daitch_mokotoff phonetic filter to use the dedicated Lucene filter (elastic#28225)
  Avoid doing redundant work when checking for self references. (elastic#26927)
  Fix casts in HotThreads. (elastic#27578)
  Ignore the `-snapshot` suffix when comparing the Lucene version in the build and the docs. (elastic#27927)
  ...
@fbsolo fbsolo deleted the patch-1 branch January 19, 2018 18:53
@jimczi jimczi added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbuescher cbuescher cbuescher approved these changes

Assignees

@cbuescher cbuescher

Labels
>docs General docs changes v5.6.7 v6.0.3 v6.1.3 v6.2.0 v6.3.0 v7.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fbsolo @elasticmachine @cbuescher @jimczi