diff --git a/CHANGELOG b/CHANGELOG index 7bf1b7bb8..de27995e3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -1.4.0 (???) +1.4.0 beta1 (Feb 20, 2014) # general - Elasticsearch 1.0 libraries are now included. See the Elasticsearch release notes for details: http://www.elasticsearch.org/downloads/1-0-0/ diff --git a/Makefile b/Makefile index e6e405ac1..5365a6718 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,7 @@ build/flatgems: | build vendor/bundle $(QUIET)rsync -a $(VENDOR_DIR)/gems/user_agent_parser-*/vendor/ua-parser $@/vendor $(QUIET)rsync -a $(VENDOR_DIR)/gems/aws-sdk-*/ca-bundle.crt $@/root/ @# A lame hack to work around the aws-sdk bug (LOGSTASH-1718) - sed -i "" -e "s@SRC = ROOT + '/lib/aws'@SRC = ROOT + 'aws'@" $@/lib/aws/core.rb + sed -i -e "s@SRC = ROOT + '/lib/aws'@SRC = ROOT + 'aws'@" $@/lib/aws/core.rb flatjar-test: @@ -351,19 +351,19 @@ build/docs/tutorials/getting-started-with-logstash.xml: docs/tutorials/getting-s # bluecloth gem doesn't work on jruby. Use ruby. build/docs/inputs/%.html: lib/logstash/inputs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/inputs $(QUIET)ruby docs/docgen.rb -o build/docs $< - $(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ - $(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ + $(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@ + $(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ build/docs/filters/%.html: lib/logstash/filters/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/filters $(QUIET)ruby docs/docgen.rb -o build/docs $< - $(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ - $(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ + $(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@ + $(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ build/docs/outputs/%.html: lib/logstash/outputs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/outputs $(QUIET)ruby docs/docgen.rb -o build/docs $< - $(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ - $(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ + $(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@ + $(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ build/docs/codecs/%.html: lib/logstash/codecs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/codecs $(QUIET)ruby docs/docgen.rb -o build/docs $< - $(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ + $(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@ build/docs/%: docs/% lib/logstash/version.rb Makefile @echo "Copying $< (to $@)" @@ -372,8 +372,8 @@ build/docs/%: docs/% lib/logstash/version.rb Makefile $(QUIET)case "$(suffix $<)" in \ .gz|.bz2|.png|.jpg) ;; \ *) \ - sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ ; \ - sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ ; \ + sed -i -e 's/%VERSION%/$(VERSION)/g' $@ ; \ + sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ ; \ ;; \ esac @@ -381,8 +381,8 @@ build/docs/index.html: $(addprefix build/docs/,$(subst lib/logstash/,,$(subst .r build/docs/index.html: docs/generate_index.rb lib/logstash/version.rb docs/index.html.erb Makefile @echo "Building documentation index.html" $(QUIET)ruby $< build/docs > $@ - $(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ - $(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ + $(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@ + $(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ .PHONY: patterns patterns: @@ -453,8 +453,8 @@ prepare-tarball: @echo "=> Preparing tarball" $(QUIET)$(MAKE) $(WORKDIR) $(QUIET)rsync -a --relative bin lib spec locales patterns vendor/bundle/jruby vendor/geoip vendor/jar vendor/kibana vendor/ua-parser vendor/collectd LICENSE README.md --exclude 'vendor/bundle/jruby/1.9/cache' --exclude 'vendor/bundle/jruby/1.9/gems/*/doc' --exclude 'vendor/jar/elasticsearch-$(ELASTICSEARCH_VERSION).tar.gz' $(WORKDIR) - $(QUIET)sed -i "" -e 's/^LOGSTASH_VERSION = .*/LOGSTASH_VERSION = "$(VERSION)"/' $(WORKDIR)/lib/logstash/version.rb - $(QUIET)sed -i "" -e 's/%JRUBY_VERSION%/$(JRUBY_VERSION)/' $(WORKDIR)/bin/logstash.bat + $(QUIET)sed -i -e 's/^LOGSTASH_VERSION = .*/LOGSTASH_VERSION = "$(VERSION)"/' $(WORKDIR)/lib/logstash/version.rb + $(QUIET)sed -i -e 's/%JRUBY_VERSION%/$(JRUBY_VERSION)/' $(WORKDIR)/bin/logstash.bat .PHONY: tarball tarball: | build/logstash-$(VERSION).tar.gz diff --git a/docs/extending/example-add-a-new-filter.md b/docs/extending/example-add-a-new-filter.md index ab2819ac1..6b6132267 100644 --- a/docs/extending/example-add-a-new-filter.md +++ b/docs/extending/example-add-a-new-filter.md @@ -91,27 +91,14 @@ plugin. You can use the agent flag --pluginpath flag to specify where the root of your plugin tree is. In our case, it's the current directory. - % logstash --pluginpath . -f example.conf - -If you use the jar release of logstash, you have an additional option - you can -include the plugin right in the jar file. - - # This command will take your 'logstash/filters/foo.rb' file - # and add it into the jar file. - % jar -uf logstash-%VERSION%-flatjar.jar logstash/filters/foo.rb - - # Verify it's in the right location in the jar! - % jar tf logstash-%VERSION%-flatjar.jar | grep foo.rb - logstash/filters/foo.rb - - % java -jar logstash-%VERSION%-flatjar.jar agent -f example.conf + % bin/logstash --pluginpath your/plugin/root -f example.conf ## Example running In the example below, I typed in "the quick brown fox" after running the java command. - % java -jar logstash-%VERSION%-flatjar.jar agent -f example.conf + % bin/logstash -f example.conf the quick brown fox 2011-05-12T01:05:09.495000Z stdin://snack.home/: Hello world! diff --git a/docs/index.html.erb b/docs/index.html.erb index d44858310..7400e2bec 100644 --- a/docs/index.html.erb +++ b/docs/index.html.erb @@ -6,7 +6,7 @@ layout: content_right

For Users