sensu-plugins-zfs 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183780cd78d850ca4df74099c6ab32d80adfa824
-  data.tar.gz: e6c302360c0f34ad209e0fefb30f563ae5c068bc
+  metadata.gz: 9819878e1bc706d727fdb27a4f10ab04d36bea72
+  data.tar.gz: dcc0cf15963fab400f4b105d819b149bbc36d650
 SHA512:
-  metadata.gz: db7d9d2caaba44d9cf2d85d5e30a8a321c2fe1d33df155c67fefa40a688383d866682e8ff644f0adb9692e8d053cbe5fca2802225824c836912989ea49e570b5
-  data.tar.gz: b533ad3959a7ece387e7d15b8f61c0cb771411c35647cdf360e6419b2d9a06ea7f28d4d3dd7df6a4b7cf10ae5b0b19446721916fda3cc744a6e1e6552795cf8b
+  metadata.gz: 33cff7c92b5771efc2623422386722a66c13830ca0c500b9177d539f0adc4f537e914d4c5e6a8742b193863e14833e5418cd404bac7a073a941540048ad05007
+  data.tar.gz: d74a8dec3268d5ede33575824f25c586dfca6f78c1a982b5af876178f89d3795605300604aa26c5b704bb47bb4b99f16ce683b95d55da73759646bee68c9be5d

data/README.md

@@ -10,6 +10,8 @@ Checks if the zpool state is ONLINE and wether there has been any errors on
 vdevs.
 
 - `-z, --zpool` What zpool to check. If omitted, we check all zpools.
+- `-c, --capacity-warn` Capacity threshold for when to warn. (default 80)
+- `-C, --capacity-crit` Capacity threshold for when to crit. (default 90)
 
 ## Installation
 [Installation and setup](http://sensu-plugins.io/docs/installation_instructions.html)
@@ -20,8 +22,11 @@ At this time ideas for additional checks/metrics would be very much appreciated.
 
 I have a few ideas that would be nice:
 
+- [x] Check for zpool state
+- [x] Check for vdev errors
+- [x] Check for pool capacity
 - [ ] Check that disks have been scrubbed recently
-- [ ] Check/metric for pool capacity
+- [ ] Metric for disk utilization
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/blacksails/sensu-plugins-zfs.
 

data/bin/check-zpool.rb

@@ -12,15 +12,21 @@ class CheckZPool < Sensu::Plugin::Check::CLI
   option :cap_warn,
          short: "-c PERCENTAGE",
          long: "--capacity-warn PERCENTAGE",
-         description: "Warn if capacity is above this threshold",
+         description: "Warn if capacity in percent is above this threshold",
          default: 80
 
   option :cap_crit,
          short: "-C PERCENTAGE",
          long: "--capacity-crit PERCENTAGE",
-         description: "Crit if capacity is above this threshold",
+         description: "Crit if capacity in percent is above this threshold",
          default: 90
 
+  option :scrubbing_interval,
+         short: "-s DAYS",
+         long: "--scrubbing-interval DAYS",
+         description: "Warn it is more than this number of days since last scrub",
+         default: 7
+
   def run
     zpools = []
     if config[:zpool]
@@ -32,6 +38,7 @@ class CheckZPool < Sensu::Plugin::Check::CLI
       check_state zp
       check_vdevs zp
       check_capacity zp
+      check_recently_scrubbed zp
     end
     if config[:zpool]
       ok "zpool #{config[:zpool]} is ok"
@@ -62,4 +69,11 @@ class CheckZPool < Sensu::Plugin::Check::CLI
       warning "capacity for zpool #{zp.name} is above #{config[:cap_warn]}% (currently #{zp.capacity}%)"
     end
   end
+
+  def check_recently_scrubbed(zp)
+    last_scrub = zp.scrubbed_at
+    if last_scrub > Time.now - 60 * 60 * 24 * config[:scrubbing_interval]
+      warning "It is more than #{config[:scrubbing_interval]} days since zpool #{zp.name} was scrubbed. Last scrubbed #{last_scrub.to_s}"
+    end
+  end
 end

data/lib/sensu-plugins-zfs/version.rb

@@ -1,3 +1,3 @@
 module SensuPluginsZFS
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/sensu-plugins-zfs/zpool.rb

@@ -1,3 +1,5 @@
+require "time"
+
 module SensuPluginsZFS
   class ZFS
     def self.zpools
@@ -13,12 +15,21 @@ module SensuPluginsZFS
     def initialize(name)
       @name = name
       @state = %x[sudo zpool status #{name} | grep '^ state: ' | cut -d ' ' -f 3].strip
-      @capacity = %x[zpool get -H capacity #{@name} | awk '{print $3}' | cut -d '%' -f1].strip.to_i
+      @capacity = %x[sudo zpool get -H capacity #{@name} | awk '{print $3}' | cut -d '%' -f1].strip.to_i
       @vdevs = create_vdevs name
     end
 
     def ok?
-      return @state == "ONLINE"
+      @state == "ONLINE"
+    end
+
+    def scrubbed_at
+      if never_scrubbed?
+        return Time.at(0)
+      elsif scrub_in_progress?
+        return Time.now
+      end
+      Time.parse %[zpool status tank | grep '^  scan: scrub' | awk '{print $11" "$12" "$13" "$14" "$15}'].strip
     end
 
     private
@@ -30,6 +41,14 @@ module SensuPluginsZFS
         VDev.new(self, arr[0], arr[1], arr[2].to_i, arr[3].to_i, arr[4].to_i)
       end
     end
+    
+    def never_scrubbed?
+      %x[sudo zpool status #{@name} | egrep -c "none requested"].strip.to_i == 1
+    end
+
+    def scrub_in_progress?
+      %x[sudo zpool status #{@name} | egrep -c "scrub in progress|resilver"].strip.to_i == 1
+    end
   end
 
   class VDev

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-zfs
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Nørgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin