fluent-plugin-hostname 0.0.1 → 0.0.2

data/README.md

@@ -9,6 +9,11 @@ Fluentd plugin put the hostname in the data.
     <match hoge.foo>
         type hostname
         key_name host
+        add_prefix filtered
+    </match>
+
+    <match filterd.hoge.foo>
+        ...
     </match>
 
 Output messages like:

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.2

data/fluent-plugin-hostname.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-hostname"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.authors       = ["Tatsuya Fukata"]
   gem.email         = ["tatsuya.fukata@gmail.com"]
-  gem.summary       = %q{Fluentd plugin to data mixin hostname}
+  gem.summary       = %q{Fluentd plugin put the hostname in the data}
   gem.description   = %q{}
   gem.homepage      = "https://github.com/fukata/fluent-plugin-hostname"
 

data/lib/fluent/plugin/out_hostname.rb

@@ -9,6 +9,7 @@ class Fluent::HostnameOutput < Fluent::Output
   include Fluent::SetTimeKeyMixin
   config_set_default :include_time_key, true
 
+  config_param :add_prefix, :string, :default => nil
   config_param :key_name, :string, :default => 'host'
   config_param :host, :string, :default => Socket.gethostname
 
@@ -18,9 +19,21 @@ class Fluent::HostnameOutput < Fluent::Output
     if @key_name.empty?
       raise Fluent::ConfigError, "key_name is must not be specified"
     end
+
+    if @add_prefix
+      @added_prefix_string = @add_prefix + '.'
+    end
   end
 
   def emit(tag, es, chain)
+    if @add_prefix
+      tag = if tag.length > 0
+              @added_prefix_string + tag
+            else
+              @add_prefix
+            end
+    end
+
     es.each do |time,record|
       record[@key_name] = @host 
       Fluent::Engine.emit(tag, time, record)

data/test/plugin/test_out_hostname.rb

@@ -9,10 +9,12 @@ class HostnameOutputTest < Test::Unit::TestCase
     host app01.hoge
   ]
   CONFIG2 = %[
+    add_prefix filtered
     key_name server
     host app02.hoge
   ]
   CONFIG3 = %[
+    add_prefix filtered
     host app03.hoge
   ]
 
@@ -52,13 +54,13 @@ class HostnameOutputTest < Test::Unit::TestCase
     emits = d.emits
     assert_equal 2, emits.length
 
-    assert_equal 'test', emits[0][0]
+    assert_equal 'filtered.test', emits[0][0]
     assert_equal time, emits[0][1]
     assert_equal ['foo','baz','server'], emits[0][2].keys
     assert_equal 'app02.hoge', emits[0][2]['server']
 
 
-    assert_equal 'test', emits[0][0]
+    assert_equal 'filtered.test', emits[0][0]
     assert_equal time, emits[0][1]
     assert_equal ['foo','baz','server'], emits[0][2].keys
     assert_equal 'app02.hoge', emits[0][2]['server']
@@ -74,13 +76,13 @@ class HostnameOutputTest < Test::Unit::TestCase
     emits = d.emits
     assert_equal 2, emits.length
 
-    assert_equal 'test', emits[0][0]
+    assert_equal 'filtered.test', emits[0][0]
     assert_equal time, emits[0][1]
     assert_equal ['foo','baz','host'], emits[0][2].keys
     assert_equal 'app03.hoge', emits[0][2]['host']
 
 
-    assert_equal 'test', emits[0][0]
+    assert_equal 'filtered.test', emits[0][0]
     assert_equal time, emits[0][1]
     assert_equal ['foo','baz','host'], emits[0][2].keys
     assert_equal 'app03.hoge', emits[0][2]['host']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-hostname
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -91,18 +91,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4194763417812664163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4194763417812664163
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Fluentd plugin to data mixin hostname
+summary: Fluentd plugin put the hostname in the data
 test_files:
 - test/helper.rb
 - test/plugin/test_out_hostname.rb