github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into HEAD

Browse source
This commit is contained in:
Jordan Sissel 2012-01-25 22:50:49 -08:00
commit 01439c0923
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -195,6 +195,7 @@ build/docs/%: docs/% lib/logstash/version.rb
@echo "Copying $< (to $@)"
-$(QUIET)mkdir -p $(shell dirname $@)
$(QUIET)sed -re 's/%VERSION%/$(VERSION)/g' $< > $@
$(QUIET)sed -re 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $< > $@
build/docs/index.html: $(addprefix build/docs/,$(subst lib/logstash/,,$(subst .rb,.html,$(PLUGIN_FILES))))
build/docs/index.html: docs/generate_index.rb lib/logstash/version.rb docs/index.html.erb

14
docs/getting-started-centralized.md
View file

@ -36,7 +36,7 @@ You'll most likely want the version of ElasticSearch specified by the
<outputs/elasticsearch> docs. Modify this in your shell for easy downloading of
ElasticSearch:
ES_PACKAGE=elasticsearch-0.17.6.zip
ES_PACKAGE=elasticsearch-%ELASTICSEARCH_VERSION%.zip
ES_DIR=${ES_PACKAGE%%.zip}
SITE=https://github.com/downloads/elasticsearch/elasticsearch
if [ ! -d "$ES_DIR" ] ; then
@ -54,16 +54,16 @@ foreground, use 'bin/elasticsearch -f'
AMQP is a standard for message-based communication. It supports
publish-subscribe, queues, etc. AMQP is supported way to ship your logs
between servers with logstash. You could also use redis, xmpp, stomp, tcp, or
other means to transport your logs.
between servers with logstash. You could also use redis, xmpp, stomp, tcp,
zeromq, or other means to transport your logs.
If you don't know what AMQP is, that's fine, you don't need to know anything
about it for this config. If you already have an AMQP server and know how to
configure it, you can skip this section.
If you don't have an AMQP server already, you might as well download [rabbitmq
http://www.rabbitmq.com/server.html] I recommend using the native packages
(rpm, deb) if those are available for your system.
If you don't have an AMQP server already, you might as well download
[rabbitmq](http://www.rabbitmq.com/server.html). I recommend using the native
packages (rpm, deb) if those are available for your system.
Configuring RabbitMQ is out of scope for this doc, but know that if you use the
RPM or Deb package you'll probably end up with a rabbitmq startup script that
@ -80,7 +80,7 @@ Download the monolithic logstash release package. By 'monolithic' I mean the
package contains all required dependencies to save you time chasing down
requirements.
You can download the latest release on the [front page](/)
Follow [this link to download logstash-%VERSION%](http://semicomplete.com/files/logstash/logstash-%VERSION%-monolithic.jar).
Since we're doing a centralized configuration, you'll have two main logstash
agent roles: a shipper and an indexer. You will ship logs from all servers to a