sensu-plugins-disk-checks 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622f5bf2da931ca722782ea642a949686e732b58
-  data.tar.gz: 9cd1be8138f58bee6a9ba0a7bf4bc09f0a72dce7
+  metadata.gz: 70cfbdd21bd520136259552003e3a60d363246f3
+  data.tar.gz: e922cddef3c7b7dee281556e26bb65ff22d91598
 SHA512:
-  metadata.gz: 635831818d4b37822f3deb173d71bd6b40ae88894df25abfcb0b77dc9b3da7ef36ad17775feb0e6f0fc55ee775c75b0340ccb8eff94b06ae1426a68392cb51fa
-  data.tar.gz: c4a61d6eab601a67b5e63f59584988ba23099af05af14c3415521b37c7fa2816ec1e12e4c20c41bb6780982c0ba652fd084cb233400eee48b638b35fa9490e1d
+  metadata.gz: 7af23943cd7939e1fd36c10939ecc814a4418c79fb15301d2d35f91e7b8ee31655e2c2631eddc33b240f589283927e00258be16635b75b9d3170fb52d1ffdfc4
+  data.tar.gz: 2ac99b50435fe73d71b85811c8784462bd3cbe9f5542f45c82fc48df58b36a8c67128590f24d220367bc378f5134a2e4635b6cd6fa8015d5848a86f7d700eed5

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+[1.1.3] - 2016-01-15
+### Added
+- Add --json option to check-smart-status.rb
+
+### Changed
+- Let check-smart-status.rb skip SMART incapable disks
+
+### Fixed
+- metrics-disk-usage.rb: fix regular expression in unless statement
+- check-disk-usage.rb: fix wrong TiB formatting in to_human function
+
 ## [1.1.2] - 2015-12-14
 ### Added
 - check-disk-usage.rb: Add option to include only certain mount points

data/README.md

@@ -93,3 +93,8 @@ This is a sample input file used by check-smart-status, see the script for furth
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+
+### Certification Verification
+
+If you are verifying certificates in the gem install you will need the certificate for the `sys-filesystem` gem loaded
+in the gem certificate store. That cert can be found [here](https://raw.githubusercontent.com/djberg96/sys-filesystem/ffi/certs/djberg96_pub.pem).

data/bin/check-disk-usage.rb

@@ -178,14 +178,8 @@ class CheckDisk < Sensu::Plugin::Check::CLI
   end
 
   def to_human(s)
-    prefix = %w(TiB GiB MiB KiB B)
-    s.to_f
-    i = prefix.length - 1
-    while s > 512 && i > 0
-      s /= 1024
-      i -= 1
-    end
-    ((s > 9 || s.modulo(1) < 0.1 ? '%d' : '%.1f') % s) + ' ' + prefix[i]
+    unit = [[1_099_511_627_776, 'TiB'], [1_073_741_824, 'GiB'], [1_048_576, 'MiB'], [1024, 'KiB'], [0, 'B']].detect { |u| s >= u[0] }
+    "#{s > 0 ? s / unit[0] : s} #{unit[1]}"
   end
 
   # Determine the percent inode usage

data/bin/check-smart-status.rb

@@ -72,6 +72,13 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
          required: false,
          default: 'smartctl'
 
+  option :json,
+         short: '-j path/to/smart.json',
+         long: '--json path/to/smart.json',
+         description: 'Path to SMART attributes JSON file',
+         required: false,
+         default: File.dirname(__FILE__) + '/smart.json'
+
   option :defaults,
          short: '-d 0,0,0,0',
          long: '--defaults 0,0,0,0',
@@ -120,7 +127,7 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
   # Main function
   #
   def run
-    @smart_attributes = JSON.parse(IO.read(File.dirname(__FILE__) + '/smart.json'), symbolize_names: true)[:smart][:attributes]
+    @smart_attributes = JSON.parse(IO.read(config[:json]), symbolize_names: true)[:smart][:attributes]
     @smart_debug = config[:debug] == 'on'
 
     # Set default threshold
@@ -241,7 +248,11 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
     devices = []
     all.each do |line|
       partition = line.scan(/\w+/).last.scan(/^\D+$/).first
-      devices << partition unless partition.nil?
+      next if partition.nil?
+      output = `sudo #{config[:binary]} -i /dev/#{partition}`
+      available = !output.scan(/SMART support is: Available/).empty?
+      enabled = !output.scan(/SMART support is: Enabled/).empty?
+      devices << partition if available && enabled
     end
 
     devices

data/bin/metrics-disk-usage.rb

@@ -99,7 +99,7 @@ class DiskUsageMetrics < Sensu::Plugin::Metric::CLI::Graphite
     `df -PB#{config[:block_size]} #{config[:local] ? '-l' : ''}`.split("\n").drop(1).each do |line|
       _, _, used, avail, used_p, mnt = line.split
 
-      unless %r{/sys|/dev|/run}.match(mnt)
+      unless %r{/sys[/|$]|/dev[/|$]|/run[/|$]}.match(mnt)
         next if config[:ignore_mnt] && config[:ignore_mnt].find { |x| mnt.match(x) }
         next if config[:include_mnt] && !config[:include_mnt].find { |x| mnt.match(x) }
         if config[:flatten]

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

@@ -2,7 +2,7 @@ module SensuPluginsDiskChecks
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
 
     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.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin