sensu-plugins-disk-checks 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77d5f6201e92d60e58c12447aea22cdef80d04c
-  data.tar.gz: c1e9d61cd0204ab0c2b188aaa5574b89d6ffd8b3
+  metadata.gz: 6e2270b4f0e3f5a79f427d625af1c3bc5bc08e0e
+  data.tar.gz: 2093789afcdb4cdea74ae511a8cbc3f206d0d62c
 SHA512:
-  metadata.gz: 20848ea4819295dd6d8b5860775152db5d6ce42c3c18be95b54ce8738cced8b8888a66f9374c7b9563a3c5f3699643b7ee03ea06539b722558d6374337c4c1c0
-  data.tar.gz: 3122c5ba6f6420260b7f4260b1d8beec8d8adef64d132e6ce56679766c481d1e3d67afd3cddf8f048f278f872778d8f8baff44b715fdef5107f8b11321cb9f77
+  metadata.gz: 3f44ad37fc75fa5cd63db38d76e8765495b751e315b41add5721dc70574f90ab4aae86142829c855066c73881c14fc052a4fd0fce8f55ec04d274480d586c2fd
+  data.tar.gz: 8aec7d6c80cf117ece7a9a41d4c96e7389d2a943b6dce88f80d55bb31c18d98be37356584af64f047da9c9b3009e7b7852cbef2883d32d16187b603a88b4d624

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.5.0] - 2017-08-28
+### Changed
+- check-smart.rb: The JSON file is now does not need to exist (@ChrisPortman)
+
+### Added
+- check-smart.rb: Add support for legacy smartctl output relating to `Available` and `Enabled` (@ChrisPortman)
+- check-smart.rb: Add option to specify the exit code to use when there are no smart capable devices (@ChrisPortman)
+
+### Removed
+- check-smart.rb: Removed duplicated smartctl runs
+
 ## [2.4.2] - 2017-08-17
 ### Fixed
 - check-smart-status.rb: fixed regex for `Available` and `Enabled` (@nagyt234)
@@ -145,7 +156,8 @@ https://mathias-kettner.de/checkmk_filesystems.html
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.4.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.5.0...HEAD
+[2.5.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.4.2...2.5.0
 [2.4.2]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.4.1...2.4.2
 [2.4.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.4.0...2.4.1
 [2.4.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.3.0...2.4.0

data/bin/check-smart.rb

@@ -78,8 +78,17 @@ class Disk
   #
   def check_smart_capability!
     output = `sudo #{@smart_binary} -i #{device_path}`
+
+    # Newer smartctl
     @smart_available = !output.scan(/SMART support is:\s+Available/).empty?
     @smart_enabled = !output.scan(/SMART support is:\s+Enabled/).empty?
+
+    unless smart_capable?
+      # Older smartctl
+      @smart_available = !output.scan(/Device supports SMART/).empty?
+      @smart_enabled = !output.scan(/and is Enabled/).empty?
+    end
+
     @capability_output = output
   end
 
@@ -98,9 +107,17 @@ end
 class CheckSMART < Sensu::Plugin::Check::CLI
   option :smart_incapable_disks,
          long: '--smart-incapable-disks EXIT_CODE',
-         description: 'Exit code when SMART is unavailable/disabled on a disk (ok, warn, critical, unknown)',
+         description: 'Exit code when SMART is unavailable/disabled on a disk',
          proc: proc(&:to_sym),
-         default: :unknown
+         default: :unknown,
+         in: %i(unknown ok warn critical)
+
+  option :no_smart_capable_disks,
+         long: '--no-smart-capable-disks EXIT_CODE',
+         description: 'Exit code when there are no SMART capable disks',
+         proc: proc(&:to_sym),
+         default: :unknown,
+         in: %i(unknown ok warn critical)
 
   option :binary,
          short: '-b path/to/smartctl',
@@ -123,7 +140,11 @@ class CheckSMART < Sensu::Plugin::Check::CLI
     @devices = []
 
     # Load in the device configuration
-    @hardware = JSON.parse(IO.read(config[:json]), symbolize_names: true)[:hardware][:devices]
+    @hardware = if File.readable?(config[:json])
+                  JSON.parse(IO.read(config[:json]), symbolize_names: true)[:hardware][:devices]
+                else
+                  {}
+                end
 
     scan_disks!
   end
@@ -141,13 +162,7 @@ class CheckSMART < Sensu::Plugin::Check::CLI
 
         device = Disk.new(name, override, config[:binary])
 
-        output = `sudo #{config[:binary]} -i #{device.device_path}`
-
-        # Check if we can use this device or not
-        available = !output.scan(/SMART support is:\s+Available/).empty?
-        enabled = !output.scan(/SMART support is:\s+Enabled/).empty?
-
-        @devices << device if available && enabled
+        @devices << device if device.smart_capable?
       end
     end
   end
@@ -155,7 +170,10 @@ class CheckSMART < Sensu::Plugin::Check::CLI
   # Main function
   #
   def run
-    unknown 'No SMART capable devices found' unless @devices.length > 0
+    exit_with(
+      config[:no_smart_capable_disks],
+      'No SMART capable devices found'
+    ) unless @devices.length > 0
 
     unhealthy_disks = @devices.select { |disk| disk.smart_capable? && !disk.healthy? }
     unknown_disks = @devices.reject(&:smart_capable?)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-disk-checks
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin