fluent-plugin-norikra 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3d07d2f2997aa968bdeb9a2c9b367d11b8402d
-  data.tar.gz: ba678530347bc93801c557d70eaf5bda2aec33e5
+  metadata.gz: e29c9f16d25507902aaf3dd02a7b43e1596880ca
+  data.tar.gz: bc441ac622bbeb6f9c9b40b1eefcd8fd5efc2277
 SHA512:
-  metadata.gz: 06681dafb3386c4773dd557b801103c0d73f9880607d9521abc860b17272b129f612a83217fa305254fa19de569b426e02fa49056fac962525ab9035b1b32ab9
-  data.tar.gz: bab9693ba1db4ca31416bde2dc4d6b1ca91b388562c7364d362adf8916902aa509cb5f42f4729f935813f9f1a22882f28d5a77102a954c257ceb53309167f159
+  metadata.gz: 4b95d21010ab1989e74ccbd19407220af2855bdb1333324edbdf4082ed210e5aa6a0deec663391ea386c478480f093103f2083138fdc184645cdce6a4b72b81f
+  data.tar.gz: c57fe2a8e659919719bf457b4b3eb7215b89d9eec56e77841cec3789ac46285dd392dd0149d397a3994c6b2a79b57c53f190609ed799e54a62504c2baa02e29d

data/README.md

@@ -64,7 +64,10 @@ NorikraOutput plugin opens Norikra's target for newly incoming tags. You can spe
     include *     # send all fields values to norikra
     exclude time  # exclude 'time' field from sending event values
        # AND/OR 'include_regexp' and 'exclude_regexp' available
-    field_integer seq  # field 'seq' defined as integer for all targets
+    field_integer seq    # field 'seq' defined as integer for all targets
+    escape_fieldname yes # Escape field name special chars (non alphabetical or numerical names) with underscore('_')
+                         #  This is friendly for query access (ex: field.key1.cpu_total)
+                         #  Default: no
   </default>
   
   <target users>

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   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/config_section.rb

@@ -1,6 +1,6 @@
 module Fluent::NorikraPlugin
   class ConfigSection
-    attr_accessor :target, :target_matcher, :auto_field, :filter_params, :field_definitions, :query_generators
+    attr_accessor :target, :target_matcher, :auto_field, :escape_fieldname, :filter_params, :field_definitions, :query_generators
 
     def initialize(section, enable_auto_query=true)
       @target = nil
@@ -16,6 +16,7 @@ module Fluent::NorikraPlugin
       end
 
       @auto_field = Fluent::Config.bool_value(section['auto_field'])
+      @escape_fieldname = Fluent::Config.bool_value(section['escape_fieldname'])
 
       @filter_params = {
         :include => section['include'],

data/lib/fluent/plugin/norikra/target.rb

@@ -24,6 +24,7 @@ module Fluent::NorikraPlugin
       @name = target
       @escaped_name = self.class.escape(@name)
       @auto_field = config.auto_field.nil? ? true : config.auto_field
+      @escape_fieldname = config.escape_fieldname
 
       @filter = RecordFilter.new(*([:include, :include_regexp, :exclude, :exclude_regexp].map{|s| config.filter_params[s]}))
       @fields = config.field_definitions
@@ -31,7 +32,30 @@ module Fluent::NorikraPlugin
     end
 
     def filter(record)
-      @filter.filter(record)
+      r = @filter.filter(record)
+      if @escape_fieldname
+        escape_recursive(r)
+      else
+        r
+      end
+    end
+
+    def escape_recursive(record)
+      return record unless record.is_a?(Hash) || record.is_a?(Array)
+      return record.map{|v| escape_recursive(v) } if record.is_a?(Array)
+
+      # Hash
+      r = {}
+      record.keys.each do |key|
+        k = if key =~ /[^$_a-zA-Z0-9]/
+              key.gsub(/[^$_a-zA-Z0-9]/, '_')
+            else
+              key
+            end
+        v = escape_recursive(record[key])
+        r[k] = v
+      end
+      r
     end
 
     def reserve_fields

data/test/test_target.rb

@@ -91,4 +91,45 @@ class TargetTest < Test::Unit::TestCase
     assert_equal 'SELECT * FROM test_service.win:time_batch(30 min) WHERE q3="/"', t.queries[2].expression
     assert_equal 'q3.test', t.queries[2].tag
   end
+
+  C3 = Fluent::Config::Element.new('target', 'test', {
+      'escape_fieldname' => 'no',
+    }, [])
+  S3 = Fluent::NorikraPlugin::ConfigSection.new(C3)
+  C4 = Fluent::Config::Element.new('target', 'test', {
+      'escape_fieldname' => 'yes',
+    }, [])
+  S4 = Fluent::NorikraPlugin::ConfigSection.new(C4)
+
+  def test_escape_fieldname
+    t = @this.new('test.service', S3)
+    r = t.filter({'a 1' => '1', 'b 2' => 2, 'c-1' => { 'd/1' => '1', 'd 2' => '2' }, 'f' => [1, 2, {'g+1' => 3}] })
+    assert_equal '1', r['a 1']
+    assert_equal 2,   r['b 2']
+    assert_equal '1', r['c-1']['d/1']
+    assert_equal '2', r['c-1']['d 2']
+    assert_equal 1,   r['f'][0]
+    assert_equal 2,   r['f'][1]
+    assert_equal 3,   r['f'][2]['g+1']
+
+    assert_nil r['a_1']
+    assert_nil r['b_2']
+    assert_nil r['c_1']
+    assert_nil r['f'][2]['g_1']
+
+    t = @this.new('test.service', S4)
+    r = t.filter({'a 1' => '1', 'b 2' => 2, 'c-1' => { 'd/1' => '1', 'd 2' => '2' }, 'f' => [1, 2, {'g+1' => 3}] })
+    assert_nil r['a 1']
+    assert_nil r['b 2']
+    assert_nil r['c-1']
+    assert_equal 1, r['f'][0]
+    assert_equal 2, r['f'][1]
+    assert_nil r['f'][2]['g+1']
+
+    assert_equal '1', r['a_1']
+    assert_equal 2,   r['b_2']
+    assert_equal '1', r['c_1']['d_1']
+    assert_equal '2', r['c_1']['d_2']
+    assert_equal 3,   r['f'][2]['g_1']
+  end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-norikra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: norikra-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: process events on fluentd with SQL like query, with built-in Norikra
@@ -74,8 +74,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to do CEP with norikra