server_metrics 0.0.8.5 → 0.0.8.6

data/lib/server_metrics/collectors/disk.rb

@@ -6,7 +6,8 @@
 class ServerMetrics::Disk < ServerMetrics::MultiCollector
 
   def build_report
-    @df_output = `df -h`.split("\n")
+    ENV['LANG'] = 'C' # forcing English for parsing
+    @df_output = `df -Pkh`.split("\n")
     @devices = `mount`.split("\n").grep(/^\/dev/).map{|l|l.split.first} # any device that starts with /dev
 
     @devices.each do |device|
@@ -17,15 +18,12 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
 
   # called from build_report for each device
   def get_sizes(device)
-    ENV['LANG'] = 'C' # forcing English for parsing
-
     header_line=@df_output.first
-    num_columns = header_line.include?("iused") ? 9 : 6 # Mac has extra columns
-    headers = header_line.split(/\s+/,num_columns)
+    headers = header_line.split(/\s+/,6) # limit to 6 columns - last column is "mounted on"
     parsed_lines=[] # Each line will look like {"%iused" => "38%","Avail" => "289Gi", "Capacity=> "38%", "Filesystem"=> "/dev/disk0s2","Mounted => "/", "Size" => "465Gi", "Used" => "176Gi", "ifree" => "75812051", "iused"  => "46116178"}
 
     @df_output[1..@df_output.size-1].each do |line|
-      values=line.split(/\s+/,num_columns)
+      values=line.split(/\s+/,6)
       parsed_lines<<Hash[headers.zip(values)]
     end
 

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "0.0.8.5"
+  VERSION = "0.0.8.6"
 end

data/test/fixtures/disk.txt

@@ -13,7 +13,7 @@ none on /var/lock type tmpfs (rw,noexec,nosuid,nodev)
 none on /lib/init/rw type tmpfs (rw,nosuid,mode=0755)
 nfsd on /proc/fs/nfsd type nfsd (rw)
 
-### `df -h` ubuntu
+### `df -Pkh` ubuntu
 Filesystem            Size  Used Avail Use% Mounted on
 /dev/xvda1            124G   84G   37G  70% /
 none                  7.9G  128K  7.9G   1% /dev

data/test/test_with_fixtures.rb

@@ -38,7 +38,7 @@ class TestWithFixtures < Test::Unit::TestCase
     c = ServerMetrics::Disk.new()
     fixture = fixtures(:disk)
     c.expects(:`).with("mount").returns(fixture.command("mount")).once
-    c.expects(:`).with("df -h").returns(fixture.command("df -h")).once
+    c.expects(:`).with("df -Pkh").returns(fixture.command("df -Pkh")).once
     c.expects(:`).with("cat /proc/diskstats").returns(fixture.command("cat /proc/diskstats")).once
     c.run
 
@@ -85,7 +85,7 @@ eos
       c = ServerMetrics::Disk.new()
       c.expects(:`).with("mount").returns(fixture.command("mount")).once
       c.expects(:`).with("cat /proc/diskstats").returns(fixture.command("cat /proc/diskstats")).once
-      c.expects(:`).with("df -h").returns(response)
+      c.expects(:`).with("df -Pkh").returns(response)
       c.run
 
       assert c.data['/dev/xvda1'][:used_percent]
@@ -97,7 +97,7 @@ eos
     c=test_disk
     fixture = fixtures(:disk)
     c.expects(:`).with("mount").returns(fixture.command("mount")).once
-    c.expects(:`).with("df -h").returns(fixture.command("df -h")).once
+    c.expects(:`).with("df -Pkh").returns(fixture.command("df -Pkh")).once
     c.expects(:`).with("cat /proc/diskstats").returns(fixture.command("cat /proc/diskstats", "ubuntu second run")).once
 
     Timecop.travel(60) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8.5
+  version: 0.0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1712031912329811387
+      hash: -1938747791304012429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1712031912329811387
+      hash: -1938747791304012429
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23