sensu-plugins-disk-checks 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6928e842b69da0370f869cc6bb4ad23002b04730
-  data.tar.gz: 11046434136bfc5fb222777795accc7ab1965987
+  metadata.gz: cf541ed738c5dda0c98dee881ee6de9d206a1b97
+  data.tar.gz: 5f527a4c79146b1fd4ee1d8db4aca2259f630b62
 SHA512:
-  metadata.gz: f19fd7cf5136f02b029069cc28e0f7c35121a4de6eeff1839d09b01b509feb6893a7d851dc69b3730514d087e42da95cc05ed211bf0a383619e8f34330f1b69c
-  data.tar.gz: 7c8657194de211450f0fb26555e52f19427aecb7e4d229a6120eaf835894f5d08045cc53f16ab409dbc9b8908d62a0c2bb6f5a5e7dedd5ebeaa0d17dccd2d891
+  metadata.gz: 1ece7fc89f0ec93ae225e9c5229dd9c920a8abcf6d54eed318cfddcd56b7ba18fd3bfc3bcdd2b8da9d48fa994e257e6067933f5acc748a615ec18b836425b578
+  data.tar.gz: cdc6bd79598623f77623598a907910df9eeff9a95b696bf43367350014d4c6057f5993861e51c2e3a2e7c2663e363cb2fef2df4448eb9a7e86552526d656351b

data/CHANGELOG.md

@@ -3,8 +3,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## [Unreleased][unreleased]
-- nothing
+## Unreleased
+
+## [1.1.0] - 2015-12-08
+### Added
+- check-disk-usage.rb: Add ignore option to exclude mount point(s) based on regular expression
+- metrics-disk.rb: Add ignore and include options to exclude or include devices
+
+### Fixed
+- check-disk-usage.rb: Don't blow up when unable to read a filesystem
+
+### Removed
+- Remove dependency on `filesystem` gem
 
 ## [1.0.3] - 2015-10-25
 ### Changed

data/README.md

@@ -1,6 +1,6 @@
 ## Sensu-Plugins-disk-checks
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-disk-checks.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-disk-checks)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-disk-checks.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-disk-checks)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-disk-checks.svg)](http://badge.fury.io/rb/sensu-plugins-disk-checks)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-disk-checks/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-disk-checks)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-disk-checks/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-disk-checks)
@@ -8,14 +8,6 @@
 [![Codeship Status for sensu-plugins/sensu-plugins-disk-checks](https://codeship.com/projects/a78630e0-cc5b-0132-01ab-7a3494c6b360/status?branch=master)](https://codeship.com/projects/76007)
 ## Functionality
 
-**check-disk-fail**
-
-Check the output of dmesg for a given set of strings that may correspond to a failure
-
-**check-disk**
-
-Check disk capacity and inodes based upon the output of df.
-
 **check-disk-usage**
 
 Check disk capacity and inodes based upon the gem sys-filesystem.
@@ -36,23 +28,19 @@ You can also visualize the adjustment using
 
 Where P = base percentage, N = normalize factor, and m = magic factor
 
-**check-fs-writeable**
-
-Check to make sure a filesytem is writable.  This will check both proc and do a smoke test of each given mountpoint.  It can also auto-discover mount points in the self namespace.
-
 **check-fstab-mounts**
 
 Check the mount points in */etc/fstab* to ensure they are all accounted for.
 
-**disk-capacity-metrics**
+**metrics-disk-capacity**
 
 Acquire disk capacity metrics from `df` and convert them to a form usable by graphite
 
-**disk-metrics**
+**metrics-disk**
 
 Read */proc/iostats* for disk metrics and put them in a form usable by Graphite.  See [iostats.txt](http://www.kernel.org/doc/Documentation/iostats.txt) for more details.
 
-**disk-usage-metrics**
+**metrics-disk-uasage**
 
 Based on disk-capacity-metrics.rb by bhenerey and nstielau. The difference here being how the key is defined in graphite and the size we emit to graphite(now using megabytes), inode info has also been dropped.
 
@@ -65,10 +53,7 @@ Check the SMART status of hardrives and alert based upon a given set of threshol
 Check the health of a disk using `smartctl`
 
 ## Files
- * bin/check-disk-fail.rb
- * bin/check-disk.rb
  * bin/check-disk-usage.rb
- * bin/check-fs-writable.rb
  * bin/check-fstab-mounts.rb
  * bin/check-smart-status.rb
  * bin/check-smart.rb

data/bin/check-disk-usage.rb

@@ -48,6 +48,11 @@ class CheckDisk < Sensu::Plugin::Check::CLI
          description: 'Ignore mount point(s)',
          proc: proc { |a| a.split(',') }
 
+  option :ignorepathre,
+         short: '-p PATHRE',
+         description: 'Ignore mount point(s) matching regular expression',
+         proc: proc { |a| Regexp.new(a) }
+
   option :ignoreopt,
          short: '-o TYPE[.TYPE]',
          description: 'Ignore option(s)',
@@ -113,6 +118,7 @@ class CheckDisk < Sensu::Plugin::Check::CLI
         next if config[:fstype] && !config[:fstype].include?(line.mount_type)
         next if config[:ignoretype] && config[:ignoretype].include?(line.mount_type)
         next if config[:ignoremnt] && config[:ignoremnt].include?(line.mount_point)
+        next if config[:ignorepathre] && config[:ignorepathre].match(line.mount_point)
         next if config[:ignoreopt] && config[:ignoreopt].include?(line.options)
       rescue
         unknown 'An error occured getting the mount info'
@@ -131,7 +137,12 @@ class CheckDisk < Sensu::Plugin::Check::CLI
   end
 
   def check_mount(line)
-    fs_info = Filesystem.stat(line.mount_point)
+    begin
+      fs_info = Filesystem.stat(line.mount_point)
+    rescue
+      @warn_fs << "#{line.mount_point} Unable to read."
+      return
+    end
     if fs_info.respond_to?(:inodes) # needed for windows
       percent_i = percent_inodes(fs_info)
       if percent_i >= config[:icrit]

data/bin/metrics-disk.rb

@@ -18,6 +18,8 @@
 # USAGE:
 #
 # NOTES:
+#   Devices can be specifically included or ignored using -i or -I options:
+#     e.g. metrics-disk.rb -I [svx]d[a-z][0-9]*
 #
 # LICENSE:
 #   Copyright 2012 Sonian, Inc <chefs@sonian.net>
@@ -49,6 +51,18 @@ class DiskGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--convert',
          default: false
 
+  option :ignore_device,
+         description: 'Ignore devices matching pattern(s)',
+         short: '-i DEV[,DEV]',
+         long: '--ignore-device',
+         proc: proc { |a| a.split(',') }
+
+  option :include_device,
+         description: 'Include only devices matching pattern(s)',
+         short: '-I DEV[,DEV]',
+         long: '--include-device',
+         proc: proc { |a| a.split(',') }
+
   # Main function
   def run
     # http://www.kernel.org/doc/Documentation/iostats.txt
@@ -62,6 +76,9 @@ class DiskGraphite < Sensu::Plugin::Metric::CLI::Graphite
       end
       next if stats == ['0'].cycle.take(stats.size)
 
+      next if config[:ignore_device] && config[:ignore_device].find { |x| dev.match(x) }
+      next if config[:include_device] && !config[:include_device].find { |x| dev.match(x) }
+
       metrics.size.times { |i| output "#{config[:scheme]}.#{dev}.#{metrics[i]}", stats[i] }
     end
 

data/lib/sensu-plugins-disk-checks/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsDiskChecks
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 3
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-disk-checks
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,22 +30,8 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: filesystem
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement