fluent-plugin-norikra 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad302afdc9dbfe8520b8d4efafc200e61014e66
-  data.tar.gz: ef1c67429f4912690dd8351589f50123cf93f227
+  metadata.gz: 15fd701a1f7292330d4194352d96518347ec9ae9
+  data.tar.gz: c2933984c912bdbdd3a07623a1e1a74fe2204839
 SHA512:
-  metadata.gz: b6efb974e0587929e664ec773bda14b814729c13e9f08d627d466c7c876725ab269d4bb1f029ea07771f858e110df6b19c571793f3c9e3d01df1d4c1bd074071
-  data.tar.gz: 02a0122e9401292e6428a7c37db35cbbb2f8010f9effc8d4551cdc9ecf39c11b5d8ba6e6f258902b78b6b361b35a9cbd4f2bfec5be16b8ffaf5d07b9b0785f1e
+  metadata.gz: e159da05aaa724db968679bfcd55ffe32f98c91cd65105de506838e643fce5c42a6ea5979f06afd4b35ed9128b48db898ca1173ca5db55b31eefb1f3877fae76
+  data.tar.gz: 4505078afa2c522412f74d0b401a89a8f856c6ae318c43aadd15f0895b1e280b3d84d1c1db23c1e585c5d0d9c8d829a9bc25eaa8235d88a10cab2bf78b577a62

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -92,7 +92,7 @@ If you know some field's types of records, you can define types of these fields.
       </default>
     </match>
 
-Additional field definitions and query registrations should be written in `<target TARGET_NAME>` sections.
+Additional field definitions and query registrations should be written in `<target TARGET_NAME>` sections. In each sections (or also in 'default'), you can specify `auto_field false` to suppress field number which increasing infinitely.
 
     <default>
       ... # for all of access logs
@@ -107,10 +107,13 @@ Additional field definitions and query registrations should be written in `<targ
 	  </query>
     </target>
     <target other_action>
+      auto_field false
 	  ...
     </target>
 	# ...
 
+Fields which are referred in queries are automatically registered on norikra server in spite of `auto_field false`.
+
 ### Input event data filtering
 
 If you want send known fields only, specify `exclude *` and `include` or `include_regexp` like this:
@@ -171,6 +174,8 @@ NOTE: 'sweep' get all events from Norikra, and other clients cannot get these ev
 * TODO: write this section
   * `fetch_interval`
   * error logs for new target, success logs of retry
+* input/output plugin
+  * output plugin with active-standby servers
 
 # TODO
 

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.0.6"
+  spec.version       = "0.0.7"
   spec.authors       = ["TAGOMORI Satoshi"]
   spec.email         = ["tagomoris@gmail.com"]
   spec.description   = %q{process events on fluentd with SQL like query, with built-in Norikra server if needed.}
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "norikra-client", ">= 0.0.2"
+  spec.add_runtime_dependency "norikra-client", ">= 0.0.7"
   spec.add_runtime_dependency "fluentd"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/fluent/plugin/norikra_target.rb

@@ -130,7 +130,7 @@ class Fluent::NorikraOutput
   end
 
   class ConfigSection
-    attr_accessor :target, :target_matcher, :filter_params, :field_definitions, :query_generators
+    attr_accessor :target, :target_matcher, :auto_field, :filter_params, :field_definitions, :query_generators
 
     def initialize(section)
       @target = nil
@@ -144,6 +144,9 @@ class Fluent::NorikraOutput
       else
         raise ArgumentError, "invalid section for this class, #{section.name}: ConfigSection"
       end
+
+      @auto_field = section['auto_field']
+
       @filter_params = {
         :include => section['include'],
         :include_regexp => section['include_regexp'],
@@ -175,6 +178,8 @@ class Fluent::NorikraOutput
         other = self.class.new(Fluent::Config::Element.new('target', 'dummy', {}, []))
       end
       r = self.class.new(Fluent::Config::Element.new('target', (other.target ? other.target : self.target), {}, []))
+      r.auto_field = (other.auto_field.nil? ? self.auto_field : other.auto_field)
+
       others_filter = {}
       other.filter_params.keys.each do |k|
         others_filter[k] = other.filter_params[k] if other.filter_params[k]
@@ -194,7 +199,7 @@ class Fluent::NorikraOutput
   end
 
   class Target
-    attr_accessor :name, :fields, :queries
+    attr_accessor :name, :auto_field, :fields, :queries
     attr_reader :escaped_name
 
     def self.escape(src)
@@ -217,6 +222,7 @@ class Fluent::NorikraOutput
     def initialize(target, config)
       @name = target
       @escaped_name = self.class.escape(@name)
+      @auto_field = config.auto_field.nil? ? true : config.auto_field
 
       @filter = RecordFilter.new(*([:include, :include_regexp, :exclude, :exclude_regexp].map{|s| config.filter_params[s]}))
       @fields = config.field_definitions

data/lib/fluent/plugin/out_norikra.rb

@@ -177,14 +177,13 @@ module Fluent
       $log.info "starting Norikra server process #{@host}:#{@port}"
       base_options = [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]
       cmd,options = if @execute_jruby_path
-                      args = [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]
-                      if @execute_server_opts
-                        args.unshift(*@execute_server_opts.split(/ +/).map{|opt| '-J' + opt})
-                      end
-                      [@execute_jruby_path, args]
+                      [@execute_jruby_path, [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]]
                     else
                       [@execute_server_path, ['start', '-H', @host, '-P', @port.to_s]]
                     end
+      if @execute_server_opts
+        options += @execute_server_opts.split(/ +/)
+      end
       @norikra_pid = fork do
         ENV.keys.select{|k| k =~ /^(RUBY|GEM|BUNDLE|RBENV|RVM|rvm)/}.each {|k| ENV.delete(k)}
         exec([cmd, 'norikra(fluentd)'], *options)
@@ -324,7 +323,7 @@ module Fluent
       begin
         unless client.targets.include?(target.escaped_name)
           $log.debug "opening target #{target.escaped_name}"
-          client.open(target.escaped_name, target.reserve_fields)
+          client.open(target.escaped_name, target.reserve_fields, target.auto_field)
           $log.debug "opening target #{target.escaped_name}, done."
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-norikra
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: norikra-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md