graphiterb 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/graphiterb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphiterb}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip (flip) Kromer (@mrflip)"]

data/lib/graphiterb/monitors/system.rb

@@ -33,25 +33,31 @@ module Graphiterb
 
       def memory lines
         lines.each do |line|
-          next unless line =~ /^Mem: *\d+k *total, *(\d+)k *used, *(\d+)k *free/
-          return [$1, $2].map(&:to_i)
+          next unless line =~ /^Mem: *(\d+)k *total, *(\d+)k *used, *(\d+)k *free/
+          total = $1.to_f
+          return [$2, $3].map do |bytes|
+            bytes.to_f / total rescue 0.0
+          end
         end
         [0,0]
       end
 
       def swap lines
         lines.each do |line|
-          next unless line =~ /^Swap: *\d+k *total, *(\d+)k *used, *(\d+)k *free/
-          return [$1, $2].map(&:to_i)
+          next unless line =~ /^Swap: *(\d+)k *total, *(\d+)k *used, *(\d+)k *free/
+          total = $1.to_f
+          return [$2, $3].map do |bytes|
+            bytes.to_f / total rescue 0.0
+          end
         end
         [0,0]
       end
 
-
       def get_metrics metrics, since
-        df.each do |handle, size, spaceused, spacefree, percentfree, location|
+        df.each do |handle, size, spaceused, spacefree, percentused, location|
           disk_name = handle.gsub(/^\//, '').split('/')
-          metrics << [scope(hostname, disk_name, 'available'), spacefree.to_i]
+          percent_free = (100.0 * spaceused.to_f / (spaceused.to_f + spacefree.to_f)) rescue 0.0
+          metrics << [scope(hostname, disk_name, 'available'), percent_free]
         end
 
         lines = top

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphiterb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Philip (flip) Kromer (@mrflip)