lib/fluent/plugin/out_grepcounter.rb in fluent-plugin-grepcounter-0.5.2 vs lib/fluent/plugin/out_grepcounter.rb in fluent-plugin-grepcounter-0.5.3

@@ -28,10 +28,12 @@
   config_param :greater_equal, :float, :default => nil
   config_param :output_tag, :string, :default => nil # obsolete
   config_param :tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => nil
   config_param :remove_tag_prefix, :string, :default => nil
+  config_param :add_tag_suffix, :string, :default => nil
+  config_param :remove_tag_suffix, :string, :default => nil
   config_param :output_with_joined_delimiter, :string, :default => nil # obsolete
   config_param :delimiter, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
   config_param :replace_invalid_sequence, :bool, :default => false
   config_param :store_file, :string, :default => nil
@@ -90,26 +92,28 @@
       else
         @less_equal = @threshold
       end
     end
 
-    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil?
       @add_tag_prefix = 'count' # not ConfigError to support lower version compatibility
     end
     @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
+    @tag_suffix = ".#{@add_tag_suffix}" if @add_tag_suffix
     @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
+    @tag_suffix_match = ".#{@remove_tag_suffix}" if @remove_tag_suffix
     @tag_proc =
       if @tag
         Proc.new {|tag| @tag }
-      elsif @tag_prefix and @tag_prefix_match
-        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}" }
+      elsif @tag_prefix_match and @tag_suffix_match
+        Proc.new {|tag| "#{@tag_prefix}#{rstrip(lstrip(tag, @tag_prefix_match), @tag_suffix_match)}#{@tag_suffix}" }
       elsif @tag_prefix_match
-        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
-      elsif @tag_prefix
-        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
+        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}#{@tag_suffix}" }
+      elsif @tag_suffix_match
+        Proc.new {|tag| "#{@tag_prefix}#{rstrip(tag, @tag_suffix_match)}#{@tag_suffix}" }
       else
-        Proc.new {|tag| tag }
+        Proc.new {|tag| "#{@tag_prefix}#{tag}#{@tag_suffix}" }
       end
 
     case @aggregate
     when 'all'
       raise Fluent::ConfigError, "grepcounter: `tag` must be specified with aggregate all" if @tag.nil?
@@ -241,9 +245,13 @@
     if tag
       output['input_tag'] = tag
       output['input_tag_last'] = tag.split('.').last
     end
     output
+  end
+
+  def rstrip(string, substring)
+    string.chomp(substring)
   end
 
   def lstrip(string, substring)
     string.index(substring) == 0 ? string[substring.size..-1] : string
   end