fluent-plugin-norikra 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15eebb32dfadbfe46e9c5d52c7c3eae438cb772
-  data.tar.gz: 25e60695315a63fd5e3e774a63e03500bb4b5bef
+  metadata.gz: f504242a8eb349502eea219ee7ba8c378e1f7f63
+  data.tar.gz: 4b6ae2bbfdc505b8217e44d6770d154aaf58c34b
 SHA512:
-  metadata.gz: ab124b24f446d522b688ace53ea7f1a65ffc095c82e2fef64f44cf78327214908ed9e9fc4e0deecee30aade019973f2482be83bae33eba7b356c6741bb076dff
-  data.tar.gz: f03549e79600346c01af7806274c7d004bbcd374fdfeea589b0f955f2da1efccc6e348c46b0169aa1997291708a23bc000e4c538d6c3a75c314e6d62cb93f603
+  metadata.gz: 27f5ea700e25021121a250c0737e5644b63ea2c412c3c739debfadf0ccadd16b2e7bf1e24237779a25b3c55f100011a5ff2f2424bd7e038e4d3c00c40bec5656
+  data.tar.gz: 4f30c7a90aef5a8ddf08e062477a77050183a0d08d852a34bff5376c57c791f8795d642324a6fdf049d5bc3a6c4bdb894d9404513b4e9cd873e14966bdde642b

data/example/test2.conf

@@ -0,0 +1,29 @@
+<source>
+  type forward
+</source>
+
+<match {accesslog,applog}.**>
+  type norikra
+  norikra localhost:26571
+  target_map_tag yes
+
+  <default>
+    include *
+    exclude hhmmss
+  </default>
+
+  <target accesslog.**>
+    field_string  vhost,path,method,referer,rhost,userlabel,agent,ua_name,ua_category,ua_os,ua_version,ua_vendor
+    field_int     status
+    field_long    bytes,duration
+    field_boolean FLAG,status_redirection,status_errors,rhost_internal,suffix_miscfile,suffix_imagefile,agent_bot
+  </target>
+
+  <events>
+    method sweep
+    tag query_name
+    tag_prefix norikra.event
+    sweep_interval 5s
+  </events>
+</match>
+

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   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.}

data/lib/fluent/plugin/norikra_target.rb

@@ -130,17 +130,20 @@ class Fluent::NorikraOutput
   end
 
   class ConfigSection
-    attr_accessor :target, :filter_params, :field_definitions, :query_generators
+    attr_accessor :target, :target_matcher, :filter_params, :field_definitions, :query_generators
 
     def initialize(section)
-      @target = case section.name
-                when 'default'
-                  nil
-                when 'target'
-                  section.arg
-                else
-                  raise ArgumentError, "invalid section for this class, #{section.name}: ConfigSection"
-                end
+      @target = nil
+      @target_matcher = nil
+      if section.name == 'default'
+        # nil
+      elsif section.name == 'target'
+        # unescaped target name (tag style with dots)
+        @target = section.arg
+        @target_matcher = Fluent::GlobMatchPattern.new(section.arg)
+      else
+        raise ArgumentError, "invalid section for this class, #{section.name}: ConfigSection"
+      end
       @filter_params = {
         :include => section['include'],
         :include_regexp => section['include_regexp'],

data/lib/fluent/plugin/out_norikra.rb

@@ -75,7 +75,7 @@ module Fluent
           @execute_jruby_path = element['jruby']
           @execute_server_path = element['path']
           @execute_server_opts = element['opts']
-        when 'event'
+        when 'event', 'events'
           event_section = element
         else
           raise Fluent::ConfigError, "unknown configuration section name for this plugin: #{element.name}"
@@ -264,7 +264,16 @@ module Fluent
 
         t = @target_map[target]
         unless t || tobe_registered_target_names.include?(target)
-          t = Target.new(target, @default_target + @config_targets[target])
+          conf = @config_targets[target]
+          unless conf
+            @config_targets.values.each do |c|
+              if c.target_matcher.match(target)
+                conf = c
+                break
+              end
+            end
+          end
+          t = Target.new(target, @default_target + conf)
           @register_queue.push(t)
           tobe_registered_target_names.push(target)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-norikra
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: norikra-client
@@ -82,6 +82,7 @@ files:
 - example/blank.conf
 - example/example1.conf
 - example/test1.conf
+- example/test2.conf
 - fluent-plugin-norikra.gemspec
 - lib/fluent/plugin/norikra_target.rb
 - lib/fluent/plugin/out_norikra.rb
@@ -124,4 +125,3 @@ test_files:
 - test/test_query_generator.rb
 - test/test_record_filter.rb
 - test/test_target.rb
-has_rdoc: