Commit graph

980 commits

Author SHA1 Message Date
Jordan Sissel
6a3053caaa Merge branch 'master' of github.com:logstash/logstash 2011-02-20 23:48:15 -08:00
Jordan Sissel
c55537b4e4 - Add LogStash::Event#format(str) for sprintf-like functionality for an
event.
- Updated #to_s to use the new format method.
2011-02-20 23:46:13 -08:00
Pete Fritchman
3e5c62074c support add_tag and add_field in filters/base 2011-02-20 23:26:34 -08:00
Pete Fritchman
1c7dcd4d81 bump gem version 2011-02-20 21:34:51 -08:00
Pete Fritchman
67202f4908 Merge branch 'master' into experimental/petef-jruby 2011-02-20 21:29:08 -08:00
Jordan Sissel
60c7590fed - Make ignore a little better on test/setup 2011-02-20 21:28:50 -08:00
Pete Fritchman
19f8cecc1f don't need to .flatten anymore 2011-02-20 21:20:00 -08:00
Pete Fritchman
f65d21bf38 * logstash -v sets debug loglevel, better passing of logger
* fix grok filters to keep one set of @@grokpiles per event type
* use a LogStash::File::Manager for watching globs and missing files
2011-02-20 20:57:45 -08:00
Pete Fritchman
f0fb7d5001 fix :boolean config types 2011-02-20 20:46:09 -08:00
Pete Fritchman
0290314775 deal with empty parameter lists properly 2011-02-20 20:27:17 -08:00
Pete Fritchman
f7f574340a Merge remote branch 'origin/issue/17' into experimental/petef-jruby
Conflicts:
	lib/logstash/inputs/file.rb
2011-02-20 13:36:41 -08:00
Jordan Sissel
8dbcbef97a - make config accessible externally. 2011-02-20 03:55:48 -08:00
Jordan Sissel
071a0e0242 - fix grammar build
- Add Config mixin instance method 'config_init' which performs
  validation and sets instance variable values.

    If you define a config value like this:
      config :pants => :boolean

    You can expect to do this in the config file:
      pants => true

    And have this in your class:
      @pants # == true or false
2011-02-20 03:48:17 -08:00
Jordan Sissel
b3eae2b9a3 - ensure we have the latest grammar before building packages. 2011-02-20 03:30:13 -08:00
Jordan Sissel
99b182645b - the 'lgtm' config now passes validation.
- Added enum support to the config, like this:
  config :mykey => ["value1", "value2", ...]
- Added simple value validation (:string, :number, :boolean)
- Added value coersion so :number would actually set a proper value of
  type number in the parameter hash.
2011-02-20 03:26:33 -08:00
Jordan Sissel
9b09652bdd - Dynamically load plugins based on data from the config file.
- Add prototype of validation to the config dsl
2011-02-20 02:45:30 -08:00
Jordan Sissel
2a56742cbb - += if an array, otherwise << shift in 2011-02-20 02:41:23 -08:00
Jordan Sissel
33d6619c5e - Config parsing works again; bug was causing '\' in a string to
terminate parsing of the config file. Oops! Was using 'return' from a
  code block.
- Update all the plugins to specify 'config_name'
- Start working more on agent integration
2011-02-20 01:37:50 -08:00
Jordan Sissel
affed158a0 - add missing files 2011-02-19 20:50:48 -08:00
Pete Fritchman
49e41e6712 fix merge-o 2011-02-19 19:28:06 -08:00
Pete Fritchman
ea0a978281 Merge remote branch 'origin/issue/17' into experimental/petef-jruby 2011-02-19 19:13:26 -08:00
Jordan Sissel
a3ebbec089 - More work towards a config file format. 2011-02-19 19:12:55 -08:00
Jordan Sissel
93ec55f20f - update for new config dsl 2011-02-19 19:12:40 -08:00
Pete Fritchman
f79e10be98 minor cleanup 2011-02-19 19:12:29 -08:00
Pete Fritchman
2c24c35dfd merge issue/17 branch 2011-02-19 19:08:15 -08:00
Pete Fritchman
5159f091a3 String#bytesize fix for ruby < 1.8.7 using amqp 2011-02-19 19:03:14 -08:00
Jordan Sissel
96eb87d56f Merge branch 'master' into issue/17 2011-02-19 17:54:51 -08:00
Jordan Sissel
35a789a9f3 - Make ignore a little better on test/setup 2011-02-19 13:50:56 -08:00
Jordan Sissel
2421d66d39 - don't require anymore; config will autorequire 2011-02-19 13:50:00 -08:00
Pete Fritchman
4d395c8674 Merge branch 'master' into experimental/petef-jruby 2011-02-19 11:47:02 -08:00
Pete Fritchman
d6ecf48fab ignore test/setup 2011-02-19 11:46:16 -08:00
Pete Fritchman
e63e63930f update copyright years 2011-02-19 11:45:52 -08:00
Pete Fritchman
13b036b81f Merge branch 'master' into experimental/petef-jruby 2011-02-19 11:43:23 -08:00
Jordan Sissel
988826195b - Got config parsing picking up implementations.
For example, this config:

    input {
      file {
      }
      amqp {
      }
    }

  Will load:
    logstash/inputs/base
    logstash/inputs/file
2011-02-18 23:47:12 -08:00
Jordan Sissel
a3014f2d61 - clean up extra output from the parser
- expose config object after parsing.
- Clean up some of the grammar
2011-02-18 03:48:28 -08:00
Jordan Sissel
aee28de463 - Grammar is almost complete. 2011-02-18 03:11:43 -08:00
Jordan Sissel
31e2bebde7 - cherrypick petef's stdout:///debug support 2011-02-16 11:52:14 -08:00
Jordan Sissel
c464ecea8e Merge branch 'issue/17' of github.com:logstash/logstash into issue/17 2011-02-16 11:44:14 -08:00
Jordan Sissel
c0551dfaaf - default 'logging' of true removed since it is immediately overridden. 2011-02-16 11:43:32 -08:00
Jordan Sissel
dfbfc4e7e7 - Add more config settings 2011-02-16 11:41:48 -08:00
Jordan Sissel
9c9932bebe - Make configs inheritable and other goodies in this prototype
Example:
    % RUBYLIB=lib ruby -rubygems -e 'require "logstash/config";  require "logstash/inputs/file"; require "logstash/inputs/amqp"; LogStash::Inputs::Amqp.dsl_gen; LogStash::Inputs::File.dsl_gen'
    input { #parent
      amqp { #node
        "somename":
          tag => string,
          path => string,
          pantscon => string,
      } #node
    } #parent
    input { #parent
      file { #node
        "somename":
          tag => string,
          path => string,
      } #node
    } #parent
2011-02-16 11:41:48 -08:00
Jordan Sissel
b025425e73 - Start working on a DSL for describing how each component can be
configured.
2011-02-16 11:41:48 -08:00
Pete Fritchman
c081a9eec7 first cut at jruby/threaded logstash 2011-02-16 11:41:48 -08:00
Jordan Sissel
9058b5050c - Add Charles Duffy (patched issue/41) 2011-02-16 11:41:16 -08:00
Charles Duffy
764de3095b add vhost and log flag support to AMQP URLs 2011-02-16 11:58:19 -06:00
Jordan Sissel
bc2c59c15d - Add more config settings 2011-02-14 23:27:49 -08:00
Jordan Sissel
8fb2eefc1d - Make configs inheritable and other goodies in this prototype
Example:
    % RUBYLIB=lib ruby -rubygems -e 'require "logstash/config";  require "logstash/inputs/file"; require "logstash/inputs/amqp"; LogStash::Inputs::Amqp.dsl_gen; LogStash::Inputs::File.dsl_gen'
    input { #parent
      amqp { #node
        "somename":
          tag => string,
          path => string,
          pantscon => string,
      } #node
    } #parent
    input { #parent
      file { #node
        "somename":
          tag => string,
          path => string,
      } #node
    } #parent
2011-02-14 22:24:49 -08:00
Jordan Sissel
40a48ab9e5 - Start working on a DSL for describing how each component can be
configured.
2011-02-14 20:01:11 -08:00
Pete Fritchman
5bd23ceca3 grok filter (using latest jls-grok with ffi) works now 2011-02-14 01:04:45 -08:00
Pete Fritchman
0c776e071d Merge branch 'master' into experimental/petef-jruby 2011-02-13 17:58:42 -08:00