Skip to content

Cherry-pick #4753 to 6.0: Remove settings from docs#4878

Merged
andrewkroh merged 1 commit intoelastic:6.0from
urso:backport_4753_6.0
Aug 16, 2017
Merged

Cherry-pick #4753 to 6.0: Remove settings from docs#4878
andrewkroh merged 1 commit intoelastic:6.0from
urso:backport_4753_6.0

Conversation

@urso
Copy link
Copy Markdown

@urso urso commented Aug 11, 2017

Cherry-pick of PR #4753 to 6.0 branch. Original message:

  • remove removed settings in libbeat/filebeat docs
  • add tags/fields/fields_under_root/processor settings to every beat

- remove removed settings in libbeat/filebeat docs
- add tags/fields/fields_under_root/processor settings to every beat
(cherry picked from commit 4b7f097)
[float]
[[monitor-fields-under-root]]
==== `fields_under_root`

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Change this to say,

the custom <<monitor-fields,`fields`>>

I despise hard-coding links, but unfortunately our doc build thinks it's smart and adds text to the link. You end up with this monstrosity when you don't specify link text:

image

You might not have noticed this before because the doc build only adds the link text if you're pointing to a sub-section. (And the logic for deciding whether something is a sub-section depends not just on the heading level that you use in the asciidoc source, but also the chunk level.)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@urso It works because Clint is amazing. I complained about the behavior again yesterday, and he fixed it! elastic/docs@e427db2

@dedemorton
Copy link
Copy Markdown
Contributor

LGTM. Just one minor comment about the link. I've already fixed the problem in the output config topic. I guess it probably needs to be fixed in master, too.

@urso
Copy link
Copy Markdown
Author

urso commented Aug 16, 2017

Not too happy to modify cherry picks. I'd rather update master and cherry pick the change in master into 6.0 branch, after this one has been merged.

@urso
Copy link
Copy Markdown
Author

urso commented Aug 16, 2017

@dedemorton see #4919

@andrewkroh andrewkroh merged commit 3a5689f into elastic:6.0 Aug 16, 2017
@dedemorton dedemorton mentioned this pull request Dec 14, 2017
37 tasks
@urso urso deleted the backport_4753_6.0 branch February 19, 2019 18:39
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
- remove removed settings in libbeat/filebeat docs
- add tags/fields/fields_under_root/processor settings to every beat

(cherry picked from commit 2c07801)
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.

3 participants