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

- version bump

Browse source 
- fix generation of some docs
This commit is contained in:
Jordan Sissel 2011-10-12 19:24:08 -07:00
parent 703c47634d
commit 41afee3a4c
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -188,6 +188,7 @@ build/docs/outputs/%.html: lib/logstash/outputs/%.rb | build/docs/outputs
$(QUIET)ruby docs/docgen.rb -o build/docs $<
build/docs/%: docs/%
@echo "Copying $< (to $@)"
-$(QUIET)mkdir -p $(shell dirname $@)
$(QUIET)sed -re 's/%VERSION%/$(VERSION)/g' $< > $@

4
docs/docgen.rb
View file

@ -12,7 +12,7 @@ require "bluecloth" # for markdown parsing
$: << Dir.pwd
$: << File.join(File.dirname(__FILE__), "..", "lib")
require File.join(File.dirname(__FILE__), "..", "VERSION")
require "logstash/version"
class LogStashConfigDocGenerator
COMMENT_RE = /^ *#(?: (.*)| *$)/
@ -22,7 +22,7 @@ class LogStashConfigDocGenerator
COMMENT_RE => lambda { |m| add_comment(m[1]) },
/^ *class.*< *LogStash::(Outputs|Filters|Inputs)::Base/ => \
lambda { |m| set_class_description },
/^ *config .*/ => lambda { |m| add_config(m[0]) },
/^ *config +[^=].*/ => lambda { |m| add_config(m[0]) },
/^ *config_name .*/ => lambda { |m| set_config_name(m[0]) },
/^ *flag[( ].*/ => lambda { |m| add_flag(m[0]) },
/^ *(class|def|module) / => lambda { |m| clear_comments },

18
docs/tutorials/10-minute-walkthrough/index.md
View file

@ -8,7 +8,7 @@ layout: content_right
### Download logstash:
* [logstash-1.0.17-monolithic.jar](http://semicomplete.com/files/logstash/logstash-1.0.17-monolithic.jar)
* [logstash-%VERSION%-monolithic.jar](http://semicomplete.com/files/logstash/logstash-%VERSION%-monolithic.jar)
### Requirements:
@ -28,7 +28,7 @@ I bake as much as possible into the single release file.
### Run it:
java -jar logstash-1.0.17-monolithic.jar agent -f hello.conf
java -jar logstash-%VERSION%-monolithic.jar agent -f hello.conf
Type stuff on standard input. Press enter. Watch what event logstash sees.
Press ^C to kill it.
@ -41,7 +41,7 @@ Press ^C to kill it.
### Run it:
java -jar logstash-1.0.17-monolithic.jar agent -f hello-search.conf
java -jar logstash-%VERSION%-monolithic.jar agent -f hello-search.conf
Same config as step 2, but now we are also writing events to ElasticSearch. Do
a search for '*' (all):
@ -56,7 +56,7 @@ The same config as step 3 is used.
### Run it:
java -jar logstash-1.0.17-monolithic.jar agent -f hello-search.conf -- web --backend 'elasticsearch:///?local'
java -jar logstash-%VERSION%-monolithic.jar agent -f hello-search.conf -- web --backend 'elasticsearch:///?local'
The above runs both the agent and the logstash web interface in the same
process. Useful for simple deploys.
@ -85,7 +85,7 @@ keep reading below.
### Run it
java -jar logstash-1.0.17-monolithic.jar agent -f apache-parse.conf
java -jar logstash-%VERSION%-monolithic.jar agent -f apache-parse.conf
Logstash will now be listening on TCP port 3333. Send an apache log message at it:
@ -104,7 +104,7 @@ Same as the previous step, but we'll output to ElasticSearch now.
### Run it
java -jar logstash-1.0.17-monolithic.jar agent -f apache-elasticsearch.conf -- web --backend 'elasticsearch:///?local'
java -jar logstash-%VERSION%-monolithic.jar agent -f apache-elasticsearch.conf -- web --backend 'elasticsearch:///?local'
Logstash should be all set for you now. Start feeding it logs:
@ -121,7 +121,7 @@ Try some search queries. Click on some results.
For further learning, try these:
* [Watch a presentation on logstash](http://blip.tv/carolinacon/logstash-open-source-log-and-event-management-jordan-sissel-5123601)
* [Getting started 'standalone' guide](http://logstash.net/docs/1.0.17/getting-started-simple)
* [Getting started 'centralized' guide](http://logstash.net/docs/1.0.17/getting-started-centralized) -
* [Getting started 'standalone' guide](http://logstash.net/docs/%VERSION%-started-simple)
* [Getting started 'centralized' guide](http://logstash.net/docs/%VERSION%-started-centralized) -
learn how to build out your logstash infrastructure and centralize your logs.
* [Dive into the docs](http://logstash.net/docs/1.0.17/)
* [Dive into the docs](http://logstash.net/docs/%VERSION%/)

2
lib/logstash/version.rb
View file

@ -1 +1 @@
LOGSTASH_VERSION = "1.1.0beta4"
LOGSTASH_VERSION = "1.1.0beta5"