riemann-tools 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028a34582916278f0704c6830fb1accc1fe940e9
-  data.tar.gz: 995651768195d973c5be15c0998e3c2e0be52237
+  metadata.gz: a836eaa2ae5d0547934c781aeeb0534b608ad953
+  data.tar.gz: 987188b8b7cccf081f0916c0538a83bdf72d0510
 SHA512:
-  metadata.gz: 1271ec7e1c3269784a68cf39c64dbe55a5a845c82a06c8fe6afe5a1377a115df023ee248882a33db26642e0fd0e7406126db49b36797ec5914b26a041869f1ab
-  data.tar.gz: 009f079f02ed9e54f57adf2940b710e7c1905c53f99c8704e9647bcddde4aa890944d4c8c92b4bb091da39ad07b4d09aa61865dfc53deb0f7aa17f5a40faac21
+  metadata.gz: d3e486b8ef26b755020a1276e6a7b403448515c82aa4739a196e0cebf38244e15c74240c18c3627288723c1bf2ee07be1c6a99b1dfb36f2932e445d41e7a082c
+  data.tar.gz: c2efb17d675954ea1c1c3c93243f3a4c1690b1a451da7c50c87c8e9f78d05be67cf8107b23c040408ed8dd2c752143956c2f38ad58e1d376ff542a7c5be840bd

data/bin/riemann-health

@@ -24,10 +24,9 @@ class Riemann::Tools::Health
       :load => {:critical => opts[:load_critical], :warning => opts[:load_warning]},
       :memory => {:critical => opts[:memory_critical], :warning => opts[:memory_warning]}
     }
-    case (ostype = `uname -s`.chomp.downcase)
+    case (@ostype = `uname -s`.chomp.downcase)
     when 'darwin'
       @cores = `sysctl -n hw.ncpu`.to_i
-      @df = `df -P -t noiso9660`
       @cpu = method :darwin_cpu
       @disk = method :disk
       @load = method :darwin_load
@@ -35,15 +34,13 @@ class Riemann::Tools::Health
       darwin_top
     when 'freebsd'
       @cores = `sysctl -n hw.ncpu`.to_i
-      @df = `df -P -t noiso9660`
       @cpu = method :freebsd_cpu
       @disk = method :disk
       @load = method :freebsd_load
       @memory = method :freebsd_memory
     else
       @cores = cores
-      @df = `df -P --exclude-type=iso9660`
-      puts "WARNING: OS '#{ostype}' not explicitly supported. Falling back to Linux" unless ostype == "linux"
+      puts "WARNING: OS '#{@ostype}' not explicitly supported. Falling back to Linux" unless @ostype == "linux"
       @cpu = method :linux_cpu
       @disk = method :disk
       @load = method :linux_load
@@ -245,8 +242,17 @@ class Riemann::Tools::Health
     report_pct :memory,  @topdata[:memory], "usage\n\n#{`ps -eo pmem,pid,comm | sort -nrb -k1 | head -10`.chomp}"
   end
 
+  def df
+    case @ostype
+    when 'darwin', 'freebsd'
+      `df -P -t noiso9660`
+    else
+      `df -P --exclude-type=iso9660`
+    end
+  end
+
   def disk
-    @df.split(/\n/).each do |r|
+    df.split(/\n/).each do |r|
       f = r.split(/\s+/)
       next if f[0] == 'Filesystem'
       next unless f[0] =~ /\// # Needs at least one slash in the mount path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client