Merge pull request elastic#202 from urso/doc/update-logstash-output

Doc/update logstash output
tsg · Oct 22, 2015 · ce15eea · ce15eea
2 parents 0ecc9af + 37e63b1
commit ce15eea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
@@ -511,7 +511,8 @@ TCP for logstash input.
 
 ===== timeout
 
-Logstash connection timeout waiting for responses from logstash server.
+Logstash connection timeout in seconds waiting for responses from logstash
+server. Default is 30 (seconds).
 
 ===== max_retries
 

diff --git a/docs/gettingstarted.asciidoc b/docs/gettingstarted.asciidoc
@@ -145,7 +145,7 @@ https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.h
 
 In this setup, the Beat shippers send events to Logstash. Logstash receives
 these events using the
-https://github.com/logstash-plugins/logstash-input-beats[Beats
+https://www.elastic.co/guide/en/logstash/current/plugins-inputs-beats.html[Beats
 input plugin] and then sends the transaction to Elasticsearch using the
 http://www.elastic.co/guide/en/logstash/current/plugins-outputs-elasticsearch.html[Elasticsearch
 output plugin]. The Elasticsearch plugin of Logstash uses the bulk API, making