fluent-plugin-condition-checker 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c83969fa6928655e996db271f6dab4483b32e7eb2c8282455a4664c96ab904
-  data.tar.gz: e437510a11585f4d31f69adca9bd9a714cf4d084eec45e89081565a44c9bfb47
+  metadata.gz: 7b410013cd3ab83a4d90088d6391d9fdd6534120326fa35380e58801ab5d76dc
+  data.tar.gz: f0f6bc64a9133418e5da83404927d9eb1ba966d4ce9a5d1750cd30939cccc3af
 SHA512:
-  metadata.gz: eed247f918a990606d53ab539cc11d0c266bc263e3385a34b3db33caa13b60ef6d1f94958ace69debad63ac6355fa1785cf0515692a7029e4d5afb7d518a530a
-  data.tar.gz: 17d4ffaa4def66e7baf802da002ef14f70c4e1007d30aab3451b8e949814cdcdbbb5f365ed2c54cef3748ccda3998663fdd89e1af686cc3bc7d372da424c1449
+  metadata.gz: 736f29dc6aea324e2834c97b101b0ebd9bc239f7b80e6f82d8133bceedf69da0a31e213886e052133031f049e4bf49ede2190855e9fe278641b05ebdd0b6e772
+  data.tar.gz: 8e2b6542d02431f4e37fd75bd3aa524aff0c05b3f4781285d97e48244249721fe7cdc3e53a9d1974ae8f91b4365b24d9149bc4894af57d06030e1a36293c929a

data/.gitignore

@@ -1 +1 @@
-pkg/
+.DS_Store

data/Makefile

@@ -0,0 +1,5 @@
+build:
+	gem build fluent-plugin-condition-checker.gemspec
+
+release:
+	rake release

data/fluent-plugin-condition-checker.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-condition-checker"
-  spec.version = "1.0.0"
+  spec.version = "2.0.0"
   spec.authors = ["wally"]
   spec.email   = ["u.str.gm@gmail.com"]
 

data/lib/fluent/plugin/out_condition_checker.rb

@@ -20,7 +20,7 @@ require 'pp'
 module Fluent
   module Plugin
     class ConditionCheckerOutput < Fluent::Plugin::Output
-      Fluent::Plugin.register_output("condition_checker", self)
+      Fluent::Plugin.register_output('condition_checker', self)
 
       helpers :event_emitter
       PATTERN_MAX_NUM = 20
@@ -39,47 +39,79 @@ module Fluent
       # it should always be true
       config_param :auto_typecast, :bool, :default => true, # false for lower version compatibility
                         :desc => 'Automatically cast the field types.'
-      config_param :tag, :string, :default => 'checked_tag', :desc => "new record tag."
-      
-      config_param(
-        "condition".to_sym,
-        :hash,
-        default: nil,
-        desc: 'It is Conditions.'
-      )
 
-      BUILTIN_CONFIGURATIONS = %W(@id @type @label type output_tag remove_keys renew_record keep_keys enable_ruby renew_time_key auto_typecast tag_else record_else tag)
+      # 調整中のconfig_param
+      # これで、何個もconditionを設定して、そして処理を決めることができる。
+      config_param :tag1, :string,
+                  :desc => 'Specify the output tag name when the condition1 is true.'
+      config_param :condition1, :string,
+                        :desc => 'Specify the condition1 to evaluate'
+      (2..PATTERN_MAX_NUM).each do |i|
+        config_param ('tag' + i.to_s).to_sym, :string, default: nil,
+                    desc: 'Specify tag'+i.to_s+' (not necessary)'
+        config_param ('condition' + i.to_s).to_sym, :string, default: nil, # NAME REGEXP
+                    desc: 'Specify the condition'+i.to_s+' to evaluate (not necessary)'
+      end
+
+      config_param :tag_else, :string,
+                  :desc => 'Specify the output tag name when the no conditions are true.'
+
+
+      BUILTIN_CONFIGURATIONS = %W(@id @type @label type output_tag remove_keys renew_record keep_keys enable_ruby renew_time_key auto_typecast tag_else record_else)
 
       def configure(conf)
         super
         # ここで、BUILTIN_CONFIGURATIONS に入っていないものがあった場合はerrorをraise
         conf.each_pair { |k, v|
+          # print k.match('^/tag/\d\d?$')
           next if BUILTIN_CONFIGURATIONS.include?(k) || k.match(/^condition\d\d?$/) || k.match(/^tag\d\d?$/)
 
           raise Fluent::ConfigError, 'out_condition_checker: some weird config is set {'+k.to_s+':'+v.to_s+'}'
         }
 
-        # conditionsを読み込む
+        #tagを読み込み
+        tags = []
+        (1..PATTERN_MAX_NUM).each do |i|
+          next unless conf["tag#{i}"]
+          tags.push(conf["tag#{i}"]) # tags[i+1] で、欲しいtagにアクセスできる
+        end
+
+        #conditionを読み込み
         @conditions = []
-        conf.elements.select { |element| element.name.match(/^condition?$/) }
-            .each do |param|
-          condition = {}
-          data_record = {}
-
-          param.elements.select { |element| element.name.match(/^data?$/) }.each do |data|
-            data.each_pair do |key, value|
-              data_record.merge!(key => convert_value(value))
-            end
-          end
+          (1..PATTERN_MAX_NUM).each do |i|
+            next unless conf["condition#{i}"]
+            @conditions.push(conf["condition#{i}"])
+        end
+        if tags.size != @conditions.size
+          raise Fluent::ConfigError, 'match the numbers of tags and conditions; number of tags: '+tags.size.to_s+', number of conditions: '+@conditions.size.to_s
+        end
 
-          param.each_pair do |key, value|
-            condition.merge!(key => convert_value(value))
-          end
 
-          condition.merge!("data" => data_record)
-          @conditions.push(condition)
+        # maps[i] で、欲しいconditionに対応するrecordにアクセスすることができる。
+        # FIXME: conf.elements.forEachでいい感じに回せそう
+        maps = []
+        (1..PATTERN_MAX_NUM).each do |i|
+          next unless conf["condition#{i}"] # 対応するcondition{i}が定義されているものだけ読み込む
+          conf.elements.select { |element| element.name == 'record'+i.to_s }.each { |element|
+            recordTmp = {}
+            element.each_pair { |k, v|
+              element.has_key?(k) # to suppress unread configuration warning
+              recordTmp.merge!({k => parse_value(v)})
+              # map_if_false[k] = parse_value(v)
+            }
+            maps[i] = recordTmp
+          }
         end
 
+        map_else ={}
+        conf.elements.select { |element| element.name == 'record_else' }.each { |element|
+          recordTmp = {}
+          element.each_pair { |k, v|
+          element.has_key?(k) # to suppress unread configuration warning
+            recordTmp.merge!({k => parse_value(v)})
+          }
+          map_else = recordTmp
+        }
 
         if @remove_keys
           @remove_keys = @remove_keys.split(',')
@@ -107,6 +139,11 @@ module Fluent
             end
 
 
+        @maps = @placeholder_expander.preprocess_map(maps)
+        @tags = @placeholder_expander.preprocess_map(tags)
+        @tag_else = @placeholder_expander.preprocess_map(conf['tag_else'])
+        @map_else = @placeholder_expander.preprocess_map(map_else)
+
         @hostname = Socket.gethostname
       end
 
@@ -129,15 +166,23 @@ module Fluent
                                     })
                                     
           # TODO: ここの処理よくないって evaluate
-          matched_conditions, aditional_data = evaluate_condition(@conditions, placeholder_values )
+          result, idx = evaluate_condition(@conditions, placeholder_values)
+          placeholder_values.merge!({ 'result'   => result })
 
-          if matched_conditions.size > 0
-            new_record = reform(record, aditional_data, placeholder_values)
+          if idx
+            new_tag, new_record = reform(@tags[idx], @maps[idx+1], record, placeholder_values)
+          else
+            # TODO: tag_elseは使えなくするoption作る"
+            new_tag, new_record = reform(@tag_else, @map_else, record, placeholder_values)
+            # return
+          end
+
+          if new_tag
             if @renew_time_key && new_record.has_key?(@renew_time_key)
               time = new_record[@renew_time_key].to_i
             end
             @remove_keys.each {|k| new_record.delete(k) } if @remove_keys
-            router.emit(@tag, time, new_record)
+            router.emit(new_tag, time, new_record)
           end
         }
       rescue => e
@@ -147,16 +192,11 @@ module Fluent
       private
 
       def evaluate_condition(conditions, placeholders)
-        matched_conditions = []
-        aditional_data = {}
         conditions.each_with_index{ |condition, idx|
-          result = expand_placeholders(condition["rule"], placeholders)
-          if result
-            matched_conditions.push(condition["condition"])
-             aditional_data.merge!(condition["data"])
-          end
+          result = expand_placeholders(condition, placeholders)
+          if result then return [result, idx] end
         }
-        return matched_conditions, aditional_data
+        [@map_else, nil]
       end
 
       def parse_value(value_str)
@@ -170,24 +210,23 @@ module Fluent
         value_str # emit as string
       end
 
-      def reform(record, aditional_data, placeholder_values)
+      def reform(tag, map, record, placeholder_values)
+        placeholders = @placeholder_expander.prepare_placeholders(placeholder_values)
+        new_tag = expand_placeholders(tag, placeholders)
         new_record = @renew_record ? {} : record.dup
-        new_record.merge!(create_record(aditional_data, placeholder_values))
         @keep_keys.each {|k| new_record[k] = record[k]} if @keep_keys and @renew_record
-        return new_record
+        new_record.merge!(create_record(map, placeholders)) unless map.nil?
+        [new_tag, new_record]
       end
 
       def create_record(map, placeholders)
         new_record = {}
-        map.each do |k, v|
-          value = @placeholder_expander.expand(v, placeholders, true)
-          if value.nil?
-            new_record.merge!({ k => convert_num(v) })
-          else
-            new_record.merge!({ k => convert_num(value) })
-          end
+
+        map.each_pair do |k, v|
+          new_key = @placeholder_expander.expand(k, placeholders, true)
+
+          new_record.merge!({ new_key => convert_num(@placeholder_expander.expand(v, placeholders, true)) })
         end
-        pp new_record
 
         new_record
       end
@@ -207,19 +246,6 @@ module Fluent
         end
       end
 
-      def convert_value(value)
-        # Booleanがチェック
-        return true if value == 'true'
-
-        return false if value == 'false'
-
-        # 数値データなら数値で返す
-        return value.to_i if value.to_i.to_s == value.to_s
-        return value.to_f if value.to_f.to_s == value.to_s
-
-        value
-      end
-
       def expand_placeholders(value, placeholders)
         if value.is_a?(String)
           new_value = @placeholder_expander.expand(value, placeholders)

data/test/plugin/test_out_condition_checker.rb

@@ -14,7 +14,9 @@ class ConditionCheckerOutputTest < Test::Unit::TestCase
     conf = config_element(
       'ROOT',
       '',
-      {'tag' => "speak_chekc"},
+      {'tag1' => "speak_chekc",
+        'tag_else' => 'a',
+        'condition1' => 'b'},
       [
         config_element(
           'condition',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-condition-checker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - wally
@@ -84,12 +84,13 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
-- example/fluent.conf
-- example/scenario.json
 - fluent-plugin-condition-checker.gemspec
 - lib/fluent/plugin/out_condition_checker.rb
+- pkg/fluent-plugin-condition-checker-0.1.0.gem
+- pkg/fluent-plugin-condition-checker-1.0.0.gem
 - test/helper.rb
 - test/plugin/test_out_condition_checker.rb
 homepage: https://github.com/NumaoLab/condition-checker-plugin

data/example/fluent.conf

@@ -1,31 +0,0 @@
-<source>
-  @type forward
-  port 24224
-</source>
-
-<match **>
-  @type copy
-  <store>
-    @type stdout
-  </store>
-  <store>
-    @type condition-checker
-     tag "speak_condition"
-    <condition>
-      rule record["action"] == "speak"
-      condition "speak_action"
-      <data>
-        word record["word"] + "こんにちは"
-        aditiona_data 1
-      </data>
-    </condition>
-    <condition>
-      rule record["action"]  == "alert"
-      condition "alert_action"
-      <data>
-        word record["word"] + "はじめまして"
-      </data>
-    </condition>
-  </store>
-</match>
-

data/example/scenario.json

@@ -1 +0,0 @@
-{"label":"greeting","priority":2,"limit":30,"action":"greet"}