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

docs: Update ESS and Elasticsearch output documentation #20074

Merged
merged 4 commits into from
Jul 22, 2020
Merged

docs: Update ESS and Elasticsearch output documentation #20074

merged 4 commits into from
Jul 22, 2020

Conversation

bmorelli25
Copy link
Member

This PR:

  • Renames the "Elastic Cloud" output documentation to "Elasticsearch Service". It updates all terminology and adds tracking links to the ESS product page. It also moves the ESS output documentation to the top of the output list.
  • Updates the Elasticsearch output documentation for APM Server. Specifically, it updates the index and indices default pattern for ILM and non-ILM use-cases. (docs: Clarify Elasticsearch output sample config apm-server#3870).
  • Updates the Elasticsearch output documentation examples for Beats and APM Server. There was a lot of duplication between the ES Output docs and the Secure ES docs. My idea was to simplify the examples in the ES output, and keep all details in Secure ES.

@bmorelli25 bmorelli25 added the Team:apm APM Server team issues/PRs label Jul 20, 2020
@bmorelli25 bmorelli25 self-assigned this Jul 20, 2020
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 20, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 20, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20074 updated]

  • Start Time: 2020-07-21T15:47:39.125+0000

  • Duration: 24 min 33 sec

@bmorelli25 bmorelli25 mentioned this pull request Jul 20, 2020
Merged
dedemorton
dedemorton reviewed Jul 21, 2020
View reviewed changes
Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

Just a few minor comments. Thanks for cleaning this up!!

libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc
@@ -5,69 +5,54 @@
<titleabbrev>Elasticsearch</titleabbrev>
++++

When you specify Elasticsearch for the output, {beatname_uc} sends the transactions directly to Elasticsearch by using the Elasticsearch HTTP API.
The Elasticsearch output sends events directly to Elasticsearch using the Elasticsearch HTTP API.
Copy link
Contributor

Choose a reason for hiding this comment

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

boom...nice....

libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc Show resolved Hide resolved
libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc Show resolved Hide resolved
dedemorton
dedemorton approved these changes Jul 22, 2020
View reviewed changes
Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

LGTM

@bmorelli25 bmorelli25 merged commit 40174bc into elastic:master Jul 22, 2020
@bmorelli25 bmorelli25 deleted the update-output-ed branch July 22, 2020 17:59
This was referenced Jul 22, 2020
Merged
Merged
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Jul 22, 2020
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (elastic#20074)
fb959f0
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Jul 22, 2020
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (elastic#20074)
1a38f42
@bmorelli25 bmorelli25 mentioned this pull request Jul 22, 2020
Merged
bmorelli25 added a commit that referenced this pull request Jul 30, 2020
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (#20074) (#20157
0d6d5d5 
)
bmorelli25 added a commit that referenced this pull request Jul 30, 2020
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (#20074) (#20158
1824ce1 
)
bmorelli25 added a commit that referenced this pull request Jul 30, 2020
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (#20074) (#20159
a4d090e 
)
@bmorelli25 bmorelli25 mentioned this pull request Aug 20, 2020
Closed
@bmorelli25 bmorelli25 mentioned this pull request Sep 1, 2020
Merged
1 task
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@bmorelli25 @melchiormoulin
docs: Update ESS and Elasticsearch output documentation (elastic#20074)
78e6daa
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (elastic#20074)…
d1d81cc 
… (elastic#20157)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@bmorelli25
docs: Update ESS and Elasticsearch output documentation (elastic#20074)…
c582a76 
… (elastic#20158)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dedemorton dedemorton dedemorton approved these changes

@EamonnTP EamonnTP Awaiting requested review from EamonnTP

Assignees

@bmorelli25 bmorelli25

Labels
Team:apm APM Server team issues/PRs v7.8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bmorelli25 @elasticmachine @dedemorton