fluent-plugin-grepcounter 0.1.0.pre → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c342677be8075559528320aa8964dd2208f6d2cb
-  data.tar.gz: 28f6b36798b5023e180a9247ef6480b3997633c6
+  metadata.gz: 6e975b60c3a77833ed72a229d79c7c0cc64efa5a
+  data.tar.gz: 2aa97645c4645e08b2d0ce5cb0fc6576a688b53c
 SHA512:
-  metadata.gz: 96e1fd97aee7feeb3f2843cac84558b4163e95bb175750e766bf5ea66da275556f75b425669c505ab51468b61a1047e8517aa4605f139358acdae4e92d96a7bb
-  data.tar.gz: f6fc309ed2057081fe6a724a213f491c146dede6cad7d490ca92c186918a3e5e09874cce81d6e1da18c0de9feff0395956197b70f74d6bb0b2520eed842675e9
+  metadata.gz: df73667b60738771cc4adb82d4e79dc48defd6f9b8db5056787b0e71721cb897065b69bf71a6bc3cd50414ece433d718aecbf8dde8de7685ea19cd150cfc6dfe
+  data.tar.gz: d70577b7bd642a1360b57b91a92f716cb4b470f3e26cd26fe68566ef1bf57536b827824cdb01a33ede8a0816862c86ef53d69de00a82c91606db61390ad7d1f0

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.1.0 (2013/05/01)
+## 0.1.1 (2013/05/05)
+
+Changes:
+
+  - Revert `output_delimiter` to `output_with_joined_delimiter`.
+
+## 0.1.0 (2013/05/05)
 
 Features:
 

data/README.md

@@ -23,9 +23,14 @@ An example of grepcounter configuration:
       add_tag_prefix warn.count
     </source>
 
-Then, output bocomes as belows:
+Then, output bocomes as belows (indented):
 
-    warn.count.syslog.host1: {"count":2,"message":["2013/01/13T07:02:13.232645 WARN POST /auth","2013/01/13T07:02:43.632145 WARN POST /login"]}
+    warn.count.syslog.host1: {
+      "count":2,
+      "message":["2013/01/13T07:02:13.232645 WARN POST /auth","2013/01/13T07:02:43.632145 WARN POST /login"],
+      "input_tag":"syslog.host1",
+      "input_tag_last":"host1",
+    }
 
 Another example of grepcounter configuration to use `output_delimiter`:
 
@@ -40,9 +45,14 @@ Another example of grepcounter configuration to use `output_delimiter`:
       output_delimiter \n
     </source>
 
-Then, output bocomes as belows. You can use the `message` field is joined with \n.
+Then, output bocomes as belows (indented). You can use the `message` field is joined with \n.
 
-    warn.count.syslog.host1: {"count":2,"message":"2013/01/13T07:02:13.232645 WARN POST /auth\n2013/01/13T07:02:43.632145 WARN POST /login"}
+    warn.count.syslog.host1: {
+      "count":2,
+      "message":"2013/01/13T07:02:13.232645 WARN POST /auth\n2013/01/13T07:02:43.632145 WARN POST /login",
+      "input_tag":"syslog.host1",
+      "input_tag_last":"host1",
+    }
 
 ## Parameters
 

data/fluent-plugin-grepcounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grepcounter"
-  s.version     = "0.1.0.pre"
+  s.version     = "0.1.1"
   s.authors     = ["Naotoshi SEO"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"

data/lib/fluent/plugin/out_grepcounter.rb

@@ -9,7 +9,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   config_param :threshold, :integer, :default => 1
   config_param :output_tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => 'count'
-  config_param :output_delimiter, :string, :default => nil
+  config_param :output_with_joined_delimiter, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
 
   attr_accessor :matches
@@ -115,7 +115,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
     return nil if count < @threshold
     output = {}
     output['count'] = count
-    output['message'] = @output_delimiter.nil? ? matches : matches.join(@output_delimiter)
+    output['message'] = @output_with_joined_delimiter.nil? ? matches : matches.join(@output_with_joined_delimiter)
     if tag
       output['input_tag'] = tag
       output['input_tag_last'] = tag.split('.').last

data/spec/out_grepcounter_spec.rb

@@ -182,12 +182,12 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
-    context 'output_delimiter' do
+    context 'output_with_joined_delimiter' do
       let(:config) do
         # \\n shall be \n in config file
         CONFIG + %[
           regexp WARN
-          output_delimiter \\n
+          output_with_joined_delimiter \\n
         ]
       end
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi SEO
@@ -115,9 +115,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-grepcounter
 rubygems_version: 2.0.0