fluent-plugin-df 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 216123b90b59322370df7ad113ecaefa7c67c07e
+  data.tar.gz: 5b3b8fc1f2ddc17c7bbe9c183d1c3ce21bd1f998
+SHA512:
+  metadata.gz: bd2d36798960934ce0ad57778464f7f91aae5cac11f8bccd550ef4a199cdefa77319c5c6bd7e62d93e5fd2d6c07e3fb4c8d013102cc47454902622d57d64c012
+  data.tar.gz: 35a97e49b0c7ea11b92a34b7b3aa4ff05744b7b2f32429d1bbb511bf2c1e434f1400517bfeec5b389ca2225e63669c39a04de35fb5267f671ab904bcee282f3c

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.4"
+  spec.version       = "0.0.5"
   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

@@ -2,16 +2,19 @@ module Fluent
   class DfInput < Fluent::Input
     Fluent::Plugin.register_input('df', self)
 
+    EXPECTED_DF_OUTPUT_COLS_LENGTH = 6 # filesystem, blocks, used, available, capacity, mounted on
+
     config_param :option,        :string,  default: '-k'
     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
+    config_param :rm_percent,    :bool,    default: true
 
     def configure(conf)
       super
-      @command = "df #{@option} #{@target_mounts} 2> /dev/null"
+      @command = "df -P #{@option} #{@target_mounts} 2> /dev/null"
     end
 
     def start
@@ -42,12 +45,17 @@ module Fluent
       fss.shift # remove header
       fss.map do |fs|
         f = fs.split(/\s+/)
+
+        unless f.length == EXPECTED_DF_OUTPUT_COLS_LENGTH
+          $log.warn "The output of the df command is unexpected. May not obtain the correct result."
+        end
+
         {
           'fs'        => replace_slash_in(f[0]),
           'size'      => f[1],
           'used'      => f[2],
           'available' => f[3],
-          'capacity'  => f[4].delete('%')
+          'capacity'  => f[4] && @rm_percent ? f[4].delete('%') : f[4]
         }
       end
     end

data/test/plugin/test_in_df.rb

@@ -12,6 +12,7 @@ class DfInputTest < Test::Unit::TestCase
     target_mounts /
     replace_slash true
     tag           free_disk
+    rm_percent    true
   ]
 
   def create_driver(conf=CONFIG)
@@ -26,6 +27,7 @@ class DfInputTest < Test::Unit::TestCase
     assert_equal "/",         d.instance.target_mounts
     assert_equal true,        d.instance.replace_slash
     assert_equal "free_disk", d.instance.tag
+    assert_equal true,        d.instance.rm_percent
   end
 
 #  def test_emit

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-df
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - tiwakawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,33 +27,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Df input plugin for Fluent event collector
@@ -78,27 +71,26 @@ files:
 homepage: https://github.com/tiwakawa/fluent-plugin-df
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Df input plugin for Fluent event collector
 test_files:
 - test/helper.rb