- Add more config settings

lib/logstash/filters/base.rb

@@ -1,9 +1,15 @@
 require "logstash/namespace"
 require "logstash/logging"
+require "logstash/config"
 
 class LogStash::Filters::Base
+  include LogStash::Config
+
   attr_accessor :logger
 
+  dsl_name "filters"
+  dsl_parent nil
+
   public
   def initialize(config = {})
     @logger = LogStash::Logger.new(STDERR)

lib/logstash/filters/grok.rb

@@ -6,8 +6,9 @@ require "grok" # rubygem 'jls-grok'
 
 class LogStash::Filters::Grok < LogStash::Filters::Base
 
-  config :pattern => LogStash::Config::String,
-         :patterns_dir => LogStash::Config::Path
+  config :pattern => :string
+  config :patterns_dir => :path
+  config :drop_if_match => :boolean  # googlecode/issue/26
          
   public
   def initialize(config = {})

lib/logstash/filters/multiline.rb

@@ -7,6 +7,11 @@ require "logstash/filters/base"
 require "logstash/namespace"
 
 class LogStash::Filters::Multiline < LogStash::Filters::Base
+
+  config :pattern => :string
+  config :negate => :boolean
+  config :what => ["previous", "next"]
+
   # The 'date' filter will take a value from your event and use it as the
   # event timestamp. This is useful for parsing logs generated on remote
   # servers or for importing old logs.

lib/logstash/outputs/amqp.rb

@@ -7,6 +7,10 @@ require "cgi"
 class LogStash::Outputs::Amqp < LogStash::Outputs::Base
   MQTYPES = [ "fanout", "queue", "topic" ]
 
+  config :host => :string
+  config :queue_type => :string
+  config :queue_name => :string
+
   public
   def initialize(url, config={}, &block)
     super

lib/logstash/outputs/base.rb

@@ -2,11 +2,17 @@ require "cgi"
 require "logstash/event"
 require "logstash/logging"
 require "logstash/namespace"
+require "logstash/config"
 require "uri"
 
 class LogStash::Outputs::Base
+  include LogStash::Config
+
   attr_accessor :logger
 
+  dsl_name "outputs"
+  dsl_parent nil
+
   public
   def initialize(url)
     @url = url

lib/logstash/outputs/elasticsearch.rb

@@ -4,6 +4,13 @@ require "logstash/outputs/amqp"
 require "logstash/outputs/base"
 
 class LogStash::Outputs::Elasticsearch < LogStash::Outputs::Base
+
+  # http://host/index/type
+  config :host => :string
+  config :index => :string
+  config :type => :string  
+  # TODO(sissel): Config for river?
+
   public
   def register
     @pending = []

lib/logstash/outputs/nagios.rb

@@ -5,6 +5,8 @@ class LogStash::Outputs::Nagios < LogStash::Outputs::Base
   NAGIOS_CRITICAL = 2
   NAGIOS_WARN = 1
 
+  config :commandfile => :string
+ 
   public
   def initialize(url, config={}, &block)
     super

lib/logstash/outputs/stdout.rb

@@ -2,6 +2,9 @@ require "logstash/outputs/base"
 require "logstash/namespace"
 
 class LogStash::Outputs::Stdout < LogStash::Outputs::Base
+
+  config :debug => :boolean
+
   public
   def register
     # nothing to do

lib/logstash/outputs/websocket.rb

@@ -3,6 +3,8 @@ require "logstash/namespace"
 require "logstash/outputs/base"
 
 class LogStash::Outputs::Websocket < LogStash::Outputs::Base
+  config :address => :string
+
   public
   def register
     @channel = EventMachine::Channel.new