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

Backport: Cherrypick #4148, #4108, #4095 into 5.4 #4161

Merged
merged 3 commits into from
May 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion filebeat/docs/modules-overview.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Or via the configuration file:
filebeat.modules:
- module: nginx
access:
var.paths = ["/var/log/nginx/access.log*"]
var.paths: ["/var/log/nginx/access.log*"]
----------------------------------------------------------------------

The Nginx `access` fileset also has a `pipeline` variable which allows
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/communitybeats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ https://github.com/carlpett/prombeat[prombeat]:: Indexes https://prometheus.io[P
https://github.com/voigt/redditbeat[redditbeat]:: Collects new Reddit Submissions of one or multiple Subreddits.
https://github.com/chrsblck/redisbeat[redisbeat]:: Used for Redis monitoring.
https://github.com/consulthys/retsbeat[retsbeat]:: Collects counts of http://www.reso.org[RETS] resource/class records from https://en.wikipedia.org/wiki/Multiple_listing_service[Multiple Listing Service] (MLS) servers.
https://github.com/yourdream/rsbeat[rsbeat]:: Ships redis slow logs to elasticsearch and anlyze by Kibana.
https://github.com/martinhoefling/saltbeat[saltbeat]:: Reads events from salt master event bus.
https://github.com/consulthys/springbeat[springbeat]:: Collects health and metrics data from Spring Boot applications running with the actuator module.
https://github.com/buehler/go-elastic-twitterbeat[twitterbeat]:: Reads tweets for specified screen names.
Expand All @@ -62,7 +63,6 @@ network intrusion detection software and indexes the records in Elasticsearch.
https://github.com/mrkschan/uwsgibeat[uwsgibeat]:: Reads stats from uWSGI.
https://github.com/eskibars/wmibeat[wmibeat]:: Uses WMI to grab your favorite, configurable Windows metrics.


Have you created a Beat that's not listed? If so, add the name and description of your Beat to the source document for
https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.asciidoc[Community Beats] and https://help.github.com/articles/using-pull-requests[open a pull request] in the https://github.com/elastic/beats[Beats GitHub repository] to get your change merged. When you're ready, go ahead and https://discuss.elastic.co/c/annoucements[announce] your new Beat in the Elastic
discussion forum.
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/fsstat/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== System Fsstat Metricset

The System `fsstats` metricset provides overall file system statistics.
The System `fsstat` metricset provides overall file system statistics.

This metricset is available on:

Expand Down