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.

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

Add missing config options to Logstash section of reference.yml #7883

Merged
merged 3 commits into from
Aug 13, 2018

Conversation

dedemorton
Copy link
Contributor

@dedemorton dedemorton commented Aug 6, 2018

Closes #3062

A couple of open issues:

  • So do we want to remove the deprecation statement under port in the reference docs? (NO)
  • The reference docs say that the default setting for port is 10200, but the code here says 5044. I'll change it in the reference docs (assuming I'm reading the code correctly...let me know). (Fixed docs.)

@dedemorton dedemorton added docs review needs_backport PR is waiting to be backported to other branches. labels Aug 6, 2018
@dedemorton dedemorton requested a review from urso August 6, 2018 17:26
@urso
Copy link

urso commented Aug 9, 2018

So do we want to remove the deprecation statement under port in the reference docs?

No. We should add the deprecation notice to the config file. Setting will be removed in 7.0

The reference docs say that the default setting for port is 10200, but the code here says 5044. I'll change it in the reference docs (assuming I'm reading the code correctly...let me know).

10200 is actually correct. It's the one used in code. But for some reason we started documenting 5044 about everywhere. We will change the default to 5044 in beats.

See #7881

Copy link

@urso urso left a comment

Choose a reason for hiding this comment

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

Let's mark port as deprecated.

@urso
Copy link

urso commented Aug 9, 2018

Checking the code we did change the default to 5044 at some point.

@dedemorton
Copy link
Contributor Author

Actually, since port is deprecated, we should not add it to the reference.yml since we say the following at the top of that file:

# This file is a full configuration example documenting all non-deprecated
# options in comments. For a shorter configuration example, that contains only
# the most common options, please see filebeat.yml in the same directory.

@dedemorton
Copy link
Contributor Author

@urso This should be ready for a final review.

@urso urso merged commit 338dbaa into elastic:master Aug 13, 2018
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 18, 2018
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 18, 2018
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Aug 18, 2018
jsoriano pushed a commit that referenced this pull request Aug 27, 2018
* Add missing config options to Logstash section of reference.yml (#7883)
* Add safeguard related statements for max_backoff setting (#7889)
* Add recommendation to avoid harvesting symlinks when dealing with file rotation (#7950)
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 30, 2018
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 31, 2018
dedemorton added a commit that referenced this pull request Sep 4, 2018
…7937 #7939 #7948 #7949 #7950)  (#8188)

* Reset modulename attribute at the end of a file (#7888)

* Add safeguard related statements for max_backoff setting (#7889)

* Add docs about append_fields (#7903)

* Add docs about append_fields
* Remove experimental tag from setup.template.json.enabled description

* Metricbeat: Add compatibility notes where missing (#7939)

* Metricbeat: Add compatibility notes where missing, based on integration tests

* Added review suggestions

* Add missing config options to Logstash section of reference.yml (#7883)

Closes #3062

* Fix processor autodiscovery docs for Filebeat (#7937)

{ needs escaping as otherwise asciidoc will show an empty code block.

* Add document for beat export dashboard (#7696)

* Add document for beat export dashboard

Follow up from #7239

* move to command reference

* address review comments

* review comments applied

* apply review feedback

* Replace golang with Go (#7948)

I've been told that using "golang" instead of "Go" is considered a faux pas in some circles. :-)

I've replaced instances in the external docs, but I did not update the changelog, readmes, or code files.

* Minor fixes to attributes in module docs (#7949)

* Add recommendation to avoid harvesting symlinks when dealing with file rotation (#7950)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…elastic#8013)

* Add missing config options to Logstash section of reference.yml (elastic#7883)
* Add safeguard related statements for max_backoff setting (elastic#7889)
* Add recommendation to avoid harvesting symlinks when dealing with file rotation (elastic#7950)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants