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

[Doc]Update config example and bump to v6.0.3 #371

Merged
merged 3 commits into from
Oct 3, 2019
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 6.0.3
- Fixed configuration example in doc [#371](https://github.com/logstash-plugins/logstash-input-beats/pull/371)

## 6.0.2
- Improved handling of invalid compressed content [#368](https://github.com/logstash-plugins/logstash-input-beats/pull/368)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.2
6.0.3
33 changes: 18 additions & 15 deletions docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ https://www.elastic.co/products/beats[Elastic Beats] framework.
The following example shows how to configure Logstash to listen on port
5044 for incoming Beats connections and to index into Elasticsearch.

[source,ruby]
------------------------------------------------------------------------------
[source,logstash]
-----

input {
beats {
port => 5044
Expand All @@ -37,21 +38,23 @@ input {

output {
elasticsearch {
hosts => "localhost:9200"
manage_template => false
index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}" <1>
document_type => "%{[@metadata][type]}" <2>
hosts => ["http://localhost:9200"]
index => "%{[@metadata][beat]}-%{[@metadata][version]}" <1>
}
}
------------------------------------------------------------------------------
<1> Specifies the index to write events to. See <<plugins-{type}s-{plugin}-versioned-indexes>> for
more about this setting.
<2> Starting with Logstash 6.0, the `document_type` option is
deprecated due to the
https://www.elastic.co/guide/en/elasticsearch/reference/6.0/removal-of-types.html[removal of types in Logstash 6.0].
It will be removed in the next major version of Logstash. If you are running
Logstash 6.0 or later, do not set `document_type` in your configuration because
Logstash sets the type to `doc` by default.
-----
<1> `%{[@metadata][beat]}` sets the first part of the index name to the value
of the `beat` metadata field and `%{[@metadata][version]}` sets the second part to
the Beat's version. For example:
metricbeat-7.4.0.

Events indexed into Elasticsearch with the Logstash configuration shown here
will be similar to events directly indexed by Beats into Elasticsearch.

NOTE: If ILM is not being used, set `index` to
`%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}` instead so
Logstash creates an index per day, based on the `@timestamp` value of the events
coming from Beats.

IMPORTANT: If you are shipping events that span multiple lines, you need to
use the https://www.elastic.co/guide/en/beats/filebeat/current/multiline-examples.html[configuration options available in Filebeat] to handle multiline events
Expand Down