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

Set reference config as config for docs #6671

Merged
merged 1 commit into from
Apr 9, 2018

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Mar 27, 2018

Having the reference file as example config in the docs has the advantage that all config options are shown.


# Path to server status. Default server-status
#server_status_path: "server-status"
server_status_path: "server-status"

Copy link
Contributor

@ph ph Mar 27, 2018

Choose a reason for hiding this comment

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

I've looked at the configuration, I see sometime we define enabled: false and sometime we don't, I think we should be explicit and it should be defined all the time.

I am saying this because your changes is removing that option.

Copy link
Member Author

Choose a reason for hiding this comment

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

Agree, see #6672 We will be cleaning this up going through #6668

Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

Small comment concerning the enabled usage in the configuration, other than that LGTM, I've checked the keys present in the config.go.

# If both the `by_cpu` and `by_memory` options are used, the union of the two sets
# is included.
#process.include_top_n:
#
Copy link
Member

Choose a reason for hiding this comment

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

This looks out of place.

Copy link
Member Author

Choose a reason for hiding this comment

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

cleaned it up in our beat.reference.yml.

@ruflin
Copy link
Member Author

ruflin commented Mar 28, 2018

Cleaned up version pushed.

@ruflin
Copy link
Member Author

ruflin commented Apr 4, 2018

This should be rebased and run make update as soon as #6668 is closed. Set to in progress for now.

@ruflin ruflin added the in progress Pull request is currently in progress. label Apr 4, 2018
period: 15m
metricsets:
- uptime
# A list of filesystem types to ignore. The filesystem metricset will not
Copy link
Contributor

Choose a reason for hiding this comment

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

We decided awhile back ago to strip out most comments from config examples because it meant updating duplicate content and making the docs longer. I think short comments are probably OK, but the comments here seem like that might get out-of-date over time. I worry that we'll forget to update the comments here.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is from our reference docs and are the ones that should be most up-to-date. This part is auto generated.

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.

There are some conflicts to resolve, but otherwise LGTM.

@ruflin ruflin removed the in progress Pull request is currently in progress. label Apr 5, 2018
Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

LGTM

@ph
Copy link
Contributor

ph commented Apr 6, 2018

Will need a rebase :(

Having the reference file as example config in the docs has the advantage that all config options are shown. The assumption here is that users already know the short version of the config from the config file and come here to learn additional details.

* Clean up nginx reference config to be more similar to others
@ruflin
Copy link
Member Author

ruflin commented Apr 9, 2018

Ready to go.

@jsoriano jsoriano merged commit 2278910 into elastic:master Apr 9, 2018
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.

5 participants