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 Nginx stub status to metricbeat #1642

Merged
merged 8 commits into from
May 17, 2016

Conversation

mrkschan
Copy link

No description provided.

KS Chan added 7 commits April 10, 2016 23:44
Add Nginx module with stub status metric set
Conflicts:
	metricbeat/etc/beat.yml
	metricbeat/include/list.go
	metricbeat/metricbeat.yml
Conflicts:
	metricbeat/docker-entrypoint.sh
	metricbeat/docs/fields.asciidoc
	metricbeat/etc/beat.yml
	metricbeat/etc/fields.yml
	metricbeat/etc/fields_base.yml
	metricbeat/metricbeat.template-es2x.json
	metricbeat/metricbeat.template.json
	metricbeat/metricbeat.yml
	metricbeat/module/nginx/*

=== Example Configuration

The Apache module supports the standard configuration options which can be found
Copy link
Member

Choose a reason for hiding this comment

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

s/Apache/Nginx/

@andrewkroh
Copy link
Member

Looks good, I just had a few minor comments. Thanks for your contribution!

@ruflin
Copy link
Member

ruflin commented May 17, 2016

@mrkschan Thanks a lot for the contribution and already integrating our most recent metricbeat changes. I'm happy to merge it as it is and do the changes found by @andrewkroh afterwards so we can help with it, or you can push them yourself. What do you prefer?

@mrkschan
Copy link
Author

fixed, please let me do if there's any other issue :)

@ruflin ruflin merged commit 86d7c78 into elastic:master May 17, 2016
@ruflin
Copy link
Member

ruflin commented May 17, 2016

@mrkschan All good. Thanks a lot 👍

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