fluent-plugin-df 0.0.3 → 0.0.4

data/README.md

@@ -20,20 +20,25 @@ Or install it yourself as:
 
     <source>
       type df
-      option -k
-      interval 3
-      tag_prefix df
-      target_mounts /
+      option -k              # df command options
+      interval 3             # execution interval of the df command
+      tag_prefix df          # prefix of tag
+      target_mounts /        # "Mounted on" to filter the information you want to retrieve
+      replace_slash true     # whether to replace '_' by '/' in the file system
+      # tag free_disk        # tag (default is nil)
     </source>
 
   If you specify more than one `target_mounts`, separated by spaces.
 
 ## Output Format
 
-    df._dev_disk0s2: {"size":"487546976","used":"52533512","available":"434757464","capacity":"11"}
+    2013-03-01 00:00:00 +0900 df._dev_disk0s2: {"size":"487546976","used":"52533512","available":"434757464","capacity":"11"}
 
-  Tag name is the concatenation of the name of the `tag_prefix` and file system.
-  `/` in the file system is replaced by an `_`
+  If `tag` specified, character of `tag` is the Tag name.
+
+  Otherwise, Tag name is the concatenation of the name of the `tag_prefix` and file system.
+
+  `/` in the file system is replaced by an `_`, if `replace_slash` is true.
 
 ## Contributing
 

data/fluent-plugin-df.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-df"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["tiwakawa"]
   spec.email         = ["tiwakawa@aiming-inc.com"]
   spec.description   = %q{Df input plugin for Fluent event collector}

data/lib/fluent/plugin/in_df.rb

@@ -6,6 +6,8 @@ module Fluent
     config_param :interval,      :integer, default: 3
     config_param :tag_prefix,    :string,  default: 'df'
     config_param :target_mounts, :string,  default: '/'
+    config_param :replace_slash, :bool,    default: true
+    config_param :tag,           :string,  default: nil
 
     def configure(conf)
       super
@@ -41,7 +43,7 @@ module Fluent
       fss.map do |fs|
         f = fs.split(/\s+/)
         {
-          'fs'        => f[0].gsub(/\//, '_'),
+          'fs'        => replace_slash_in(f[0]),
           'size'      => f[1],
           'used'      => f[2],
           'available' => f[3],
@@ -50,8 +52,12 @@ module Fluent
       end
     end
 
+    def replace_slash_in(fs)
+      @replace_slash ? fs.gsub(/\//, '_') : fs
+    end
+
     def tag_name(fs)
-      @tag_prefix.empty? ? fs : "#{@tag_prefix}.#{fs}"
+      @tag || (@tag_prefix.empty? ? fs : "#{@tag_prefix}.#{fs}")
     end
 
     def watch

data/test/plugin/test_in_df.rb

@@ -10,6 +10,8 @@ class DfInputTest < Test::Unit::TestCase
     interval      3
     tag_prefix    df
     target_mounts /
+    replace_slash true
+    tag           free_disk
   ]
 
   def create_driver(conf=CONFIG)
@@ -18,10 +20,12 @@ class DfInputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver
-    assert_equal "-k",      d.instance.option
-    assert_equal "df",      d.instance.tag_prefix
-    assert_equal 3,         d.instance.interval
-    assert_equal "/",       d.instance.target_mounts
+    assert_equal "-k",        d.instance.option
+    assert_equal "df",        d.instance.tag_prefix
+    assert_equal 3,           d.instance.interval
+    assert_equal "/",         d.instance.target_mounts
+    assert_equal true,        d.instance.replace_slash
+    assert_equal "free_disk", d.instance.tag
   end
 
 #  def test_emit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-df
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: