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

Minor fixes to attributes in module docs #7949

Merged
merged 1 commit into from
Aug 14, 2018

Conversation

dedemorton
Copy link
Contributor

{fileset} should have been replaced by log, but wasn't, so it was showing up in the output.

Also clarified the usage of fileset_ex attribute.

@dedemorton dedemorton added docs needs_backport PR is waiting to be backported to other branches. labels Aug 11, 2018
@ycombinator ycombinator self-requested a review August 14, 2018 23:08

include::../include/var-paths.asciidoc[]

:fileset_ex!:
Copy link
Contributor

Choose a reason for hiding this comment

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

@dedemorton What does this actually do? It doesn't seem to be having any visible effect in the generated HTML that I'm seeing:

screen shot 2018-08-14 at 4 11 25 pm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ycombinator It clears the attribute value so that it doesn't inadvertently get carried into the next topic. The attribute value will be in scope within the book until it's either cleared or reset, so clearing the value is a best practice unless you want to value to exist in other topics (and in this case, you do not).

Copy link
Contributor

@ycombinator ycombinator Aug 14, 2018

Choose a reason for hiding this comment

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

Gotcha, thanks for explaining that. From what I see, after that attribute is set on line 27, it is used by the included file on line 29 (config-option-intro.asciidoc). It is not, however, used by the included file on line 34 (var-paths.asciidoc). So does it make sense to clear the attribute right after line 29?

I'm referencing line numbers in the generated asciidoc file here, but I understand that the actual changes would happen in the filebeat/module/kibana/_meta/docs.asciidoc file, where the line numbers are different.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think it really matters. Clearing everything at the end is probably easier for people updating the files (they are less likely to accidentally delete the entries...maybe).

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, fair point. I see you're doing that with modulename too. I'm good with keeping things as-is.

Copy link
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

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

LGTM.

@ycombinator ycombinator merged commit 3819e55 into elastic:master Aug 14, 2018
@ycombinator
Copy link
Contributor

@dedemorton I added the v7.0.0-alpha1 label as this PR is being merged into master. I also saw the needs backport label so I added the v6.5.0 label. If the PR needs to be backported even further, could you add the remaining version labels? Thanks.

dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 17, 2018
jsoriano pushed a commit that referenced this pull request Aug 17, 2018
…#7996)

* Add document for beat export dashboard (#7696)
* Add safeguard related statements for max_backoff setting (#7889)
* Add docs about append_fields (#7903)
* Fix processor autodiscovery docs for Filebeat (#7937)
* Minor fixes to attributes in module docs (#7949)
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Aug 18, 2018
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
…tic#7903 elastic#7937 elastic#7949) (elastic#7996)

* Add document for beat export dashboard (elastic#7696)
* Add safeguard related statements for max_backoff setting (elastic#7889)
* Add docs about append_fields (elastic#7903)
* Fix processor autodiscovery docs for Filebeat (elastic#7937)
* Minor fixes to attributes in module docs (elastic#7949)
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