From 41e005cc0c6e173f43dc20759a4f1934956572ea Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Wed, 17 Aug 2011 18:40:53 -0700 Subject: [PATCH] - use %VERSION% instead --- docs/extending/example-add-a-new-filter.md | 8 ++++---- docs/getting-started-centralized.md | 8 ++++---- docs/getting-started-simple.md | 2 +- docs/installation.md | 4 ++-- docs/learn.md | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/extending/example-add-a-new-filter.md b/docs/extending/example-add-a-new-filter.md index f01a67439..cd3606c61 100644 --- a/docs/extending/example-add-a-new-filter.md +++ b/docs/extending/example-add-a-new-filter.md @@ -89,20 +89,20 @@ plugin tree is. In our case, it's the current directory. If you use the monolith jar release of logstash, you have an additional option - you can include the plugin right in the jar file. - % jar -uf jar -uf logstash-1.0.5-monolithic.jar logstash/filters/foo.rb + % jar -uf jar -uf logstash-%VERSION%-monolithic.jar logstash/filters/foo.rb # Verify it's in the right location in the jar! - % jar tf logstash-1.0.5-monolithic.jar | grep foo.rb + % jar tf logstash-%VERSION%-monolithic.jar | grep foo.rb logstash/filters/foo.rb - % java -jar logstash-1.0.5-monolithic.jar agent -f example.conf + % java -jar logstash-%VERSION%-monolithic.jar agent -f example.conf ## Example running In the example below, I typed in "the quick brown fox" after running the java command. - % java -jar logstash-1.0.5-monolithic.jar agent -f example.conf + % java -jar logstash-%VERSION%-monolithic.jar agent -f example.conf the quick brown fox 2011-05-12T01:05:09.495000Z stdin://snack.home/: Hello world! diff --git a/docs/getting-started-centralized.md b/docs/getting-started-centralized.md index f8ca0ea1e..16e5571eb 100644 --- a/docs/getting-started-centralized.md +++ b/docs/getting-started-centralized.md @@ -90,7 +90,7 @@ correct dependency. Make sure you have the recent-enough versionf of libpcre and tokyocabinet (see above grok/INSTALL url) (This next step can be skipped if you are using a logstash jar release -(logstash-X.Y.jar, etc) Once you have grok installed, you need to install the +(logstash-%VERSION%.jar, etc) Once you have grok installed, you need to install the 'jls-grok' rubygem, which you can do by running: {{{ @@ -152,7 +152,7 @@ Here's a good sample config: Put this in a file and call it 'myshipper.conf' (or anything, really), and run: - java -jar logstash-1.0-monolithic.jar agent -f myshipper.conf + java -jar logstash-%VERSION%-monolithic.jar agent -f myshipper.conf This should start tailing the file inputs specified above and ships them out over amqp. If you included the 'stdout' output you will see events written to @@ -230,7 +230,7 @@ Run this on the same server as your elasticsearch server. To run the logstash web server, just run the jar with 'web' as the first argument. - % java -jar logstash-1.0-monolithic.jar web + % java -jar logstash-%VERSION%-monolithic.jar web >> Thin web server (v1.2.7 codename No Hup) >> Maximum connections set to 1024 >> Listening on 0.0.0.0:9292, CTRL+C to stop @@ -241,4 +241,4 @@ logs! Note: If your elasticsearch server is not discoverable with multicast, you can specify the host explicitly using the --backend flag: - % java -jar logstash-1.0-monolithic.jar web --backend elasticsearch://myserver/ + % java -jar logstash-%VERSION%-monolithic.jar web --backend elasticsearch://myserver/ diff --git a/docs/getting-started-simple.md b/docs/getting-started-simple.md index 2faeb987e..d5e5952bd 100644 --- a/docs/getting-started-simple.md +++ b/docs/getting-started-simple.md @@ -71,7 +71,7 @@ Put this in a file called "mylogstash.conf" Now run it all: - java -jar logstash-1.0-monolithic.jar agent -f mylogstash.conf -- web --backend elasticsearch:///?local + java -jar logstash-%VERSION%-monolithic.jar agent -f mylogstash.conf -- web --backend elasticsearch:///?local Point your browser at and start searching! diff --git a/docs/installation.md b/docs/installation.md index 7b3fe9c5c..20085c8f0 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -16,11 +16,11 @@ it, use it the same way as documented below for 'normal runnable jar' ### web interface - java -jar logstash-0.9.1.jar web + java -jar logstash-%VERSION%-monolithic.jar web ### agent - java -jar logstash-0.9.1.jar agent -f youragent.conf + java -jar logstash-%VERSION%-monolithic.jar agent -f youragent.conf ## 'gem install logstash' diff --git a/docs/learn.md b/docs/learn.md index e9dbdfae9..ca9ac779e 100644 --- a/docs/learn.md +++ b/docs/learn.md @@ -35,9 +35,9 @@ for such things, that works for me, too.) logstash releases come in a few flavors. -* [Monolithic jar](http://semicomplete.com/files/logstash/logstash-1.0.14-monolithic.jar) -* [rubygem](http://rubygems.org/gems/logstash/versions/1.0.14) -* [`gem install logstash -v 1.0.14`](http://rubygems.org/gems/logstash) +* [Monolithic jar](http://semicomplete.com/files/logstash/logstash-%VERSION%-monolithic.jar) +* [rubygem](http://rubygems.org/gems/logstash/versions/%VERSION%) +* [`gem install logstash -v %VERSION%`](http://rubygems.org/gems/logstash) ## What's next?