sensu-plugins-disk-checks 1.1.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70cfbdd21bd520136259552003e3a60d363246f3
-  data.tar.gz: e922cddef3c7b7dee281556e26bb65ff22d91598
+  metadata.gz: e9e27d97d82cd497c6fe1fc5b96945f2b6c81aa5
+  data.tar.gz: 207be7ea90fcd64d563cc74779e396b4c2a1c64a
 SHA512:
-  metadata.gz: 7af23943cd7939e1fd36c10939ecc814a4418c79fb15301d2d35f91e7b8ee31655e2c2631eddc33b240f589283927e00258be16635b75b9d3170fb52d1ffdfc4
-  data.tar.gz: 2ac99b50435fe73d71b85811c8784462bd3cbe9f5542f45c82fc48df58b36a8c67128590f24d220367bc378f5134a2e4635b6cd6fa8015d5848a86f7d700eed5
+  metadata.gz: 762876c2a66994b5de9d54455971acee350c91bcf91aba7fd00bee398c112113c90bd0d265799f8cec34fbf40a3ebb9ccc0583b1af2093aab4eedcbc1f86270a
+  data.tar.gz: c9a35497d489ad4cc1b5c133b9f37a5a68f5398a142bbdcb1fe2bcb0cffaedb39eab21fbf120c9138b892261f1b14edadcb99e75db584cf4eb62772909a4963c

data/CHANGELOG.md

@@ -3,9 +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]
 
-[1.1.3] - 2016-01-15
+## [2.0.0]
+### Changed
+- Updated Rubocop to 0.40, applied auto-correct.
+- metrics-disk.rb: Now using sysfs instead of lsblk for translating device mapper numbers to names
+- check-disk-usage.rb: values =< 1024 will not be modified for display in output
+
+### Removed
+- Remove Ruby 1.9.3 support; add Ruby 2.3.0 support
+
+## [1.1.3] - 2016-01-15
 ### Added
 - Add --json option to check-smart-status.rb
 
@@ -93,6 +102,20 @@ https://mathias-kettner.de/checkmk_filesystems.html
 ### Fixed
 - deployment issue
 
-## [0.0.1] - 2015-04-21
+## 0.0.1 - 2015-04-21
 ### Added
 - initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.1.3...2.0.0
+[1.1.3]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.1.2...1.1.3
+[1.1.2]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.1.1...1.1.2
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.1.1...1.1.1
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.0.3...1.1.0
+[1.0.3]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.0.2...1.0.3
+[1.0.2]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.0.1...1.0.2
+[1.0.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/0.0.4...1.0.0
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,7 @@
 [![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)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-disk-checks.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-disk-checks)
-[![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-usage**

data/bin/check-disk-usage.rb

@@ -179,7 +179,7 @@ class CheckDisk < Sensu::Plugin::Check::CLI
 
   def to_human(s)
     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]}"
+    "#{s >= 1024 ? s / unit[0] : s} #{unit[1]}"
   end
 
   # Determine the percent inode usage

data/bin/check-fstab-mounts.rb

@@ -63,7 +63,7 @@ class CheckFstabMounts < Sensu::Plugin::Check::CLI
       if fields[2] != 'swap'
         @missing_mounts << fields[1] if @mtab.select { |m| m.split(/\s+/)[1] == fields[1] }.empty?
       else
-        @missing_mounts << fields[1] if @swap_mounts.select { |m| m.split(/\s+/)[0] == Pathname.new(fields[0]).realpath.to_s }.empty?
+        @missing_mounts << fields[1] if @swap_mounts.select { |m| m.split(/\s+/)[0] == Pathname.new(fields[0]).realpath.to_s }.empty? # rubocop:disable Style/IfInsideElse
       end
     end
   end

data/bin/check-smart-status.rb

@@ -132,7 +132,7 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
 
     # Set default threshold
     default_threshold = config[:defaults].split(',')
-    fail 'Invalid default threshold parameter count' unless default_threshold.size == 4
+    raise 'Invalid default threshold parameter count' unless default_threshold.size == 4
     @smart_attributes.each do |att|
       att[:crit_min] = default_threshold[0].to_i if att[:crit_min].nil?
       att[:warn_min] = default_threshold[1].to_i if att[:warn_min].nil?
@@ -144,7 +144,7 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
     unless config[:threshold].nil?
       thresholds = config[:threshold].split(',')
       # Check threshold parameter length
-      fail 'Invalid threshold parameter count' unless thresholds.size % 5 == 0
+      raise 'Invalid threshold parameter count' unless thresholds.size % 5 == 0
 
       (0..(thresholds.size / 5 - 1)).each do |i|
         att_id = @smart_attributes.index { |att| att[:id] == thresholds[i + 0].to_i }
@@ -203,7 +203,7 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
             warnings << "#{dev} warning #{fields[0]} #{smart_att[:name]}: #{att_value}"
             puts "#{fields[0]} #{smart_att[:name]}: #{att_value} (warning)" if @smart_debug
           else
-            puts "#{fields[0]} #{smart_att[:name]}: #{att_value} (ok)" if @smart_debug
+            puts "#{fields[0]} #{smart_att[:name]}: #{att_value} (ok)" if @smart_debug # rubocop:disable Style/IfInsideElse
           end
         end
       end

data/bin/check-smart.rb

@@ -53,7 +53,7 @@ class Disk
     check_health! if smart_capable?
   end
   attr_reader :capability_output, :health_output, :smart_healthy
-  alias_method :healthy?, :smart_healthy
+  alias healthy? smart_healthy
 
   # Is the device SMART capable and enabled
   #

data/bin/metrics-disk-capacity.rb

@@ -39,7 +39,7 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
          description: 'Metric naming scheme, text to prepend to .$parent.$child',
          long: '--scheme SCHEME',
-         default: "#{Socket.gethostname}"
+         default: Socket.gethostname.to_s
 
   # Unused ?
   #
@@ -63,13 +63,13 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
         fs, _type, _blocks, used, avail, capacity, _mnt = line.split
 
         timestamp = Time.now.to_i
-        if fs.match('/dev')
+        if fs =~ '/dev'
           fs = fs.gsub('/dev/', '')
           metrics = {
             disk: {
               "#{fs}.used" => used,
               "#{fs}.avail" => avail,
-              "#{fs}.capacity" => capacity.gsub('%', '')
+              "#{fs}.capacity" => capacity.delete('%')
             }
           }
           metrics.each do |parent, children|
@@ -89,13 +89,13 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
         fs, _inodes, used, avail, capacity, _mnt = line.split
 
         timestamp = Time.now.to_i
-        if fs.match('/dev')
+        if fs =~ '/dev'
           fs = fs.gsub('/dev/', '')
           metrics = {
             disk: {
               "#{fs}.iused" => used,
               "#{fs}.iavail" => avail,
-              "#{fs}.icapacity" => capacity.gsub('%', '')
+              "#{fs}.icapacity" => capacity.delete('%')
             }
           }
           metrics.each do |parent, children|

data/bin/metrics-disk-usage.rb

@@ -99,21 +99,21 @@ 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[/|$]} =~ 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]
-          mnt = mnt.eql?('/') ? 'root' : mnt.gsub(/^\//, '')
-        else
-          # If mnt is only / replace that with root if its /tmp/foo
-          # replace first occurance of / with root.
-          mnt = mnt.length == 1 ? 'root' : mnt.gsub(/^\//, 'root.')
-        end
+        mnt = if config[:flatten]
+                mnt.eql?('/') ? 'root' : mnt.gsub(/^\//, '')
+              else
+                # If mnt is only / replace that with root if its /tmp/foo
+                # replace first occurance of / with root.
+                mnt.length == 1 ? 'root' : mnt.gsub(/^\//, 'root.')
+              end
         # Fix subsequent slashes
         mnt = mnt.gsub '/', delim
         output [config[:scheme], mnt, 'used'].join('.'), used.gsub(config[:block_size], '')
         output [config[:scheme], mnt, 'avail'].join('.'), avail.gsub(config[:block_size], '')
-        output [config[:scheme], mnt, 'used_percentage'].join('.'), used_p.gsub('%', '')
+        output [config[:scheme], mnt, 'used_percentage'].join('.'), used_p.delete('%')
       end
     end
     ok

data/bin/metrics-disk.rb

@@ -72,7 +72,7 @@ class DiskGraphite < Sensu::Plugin::Metric::CLI::Graphite
       stats = line.strip.split(/\s+/)
       _major, _minor, dev = stats.shift(3)
       if config[:convert]
-        dev = `lsblk -P -o NAME /dev/"#{dev}"| cut -d\\" -f2`.lines.first.chomp! if dev =~ /^dm-.*$/
+        dev = File.read('/sys/block/' + dev + '/dm/name').chomp! if dev =~ /^dm-.*$/
       end
       next if stats == ['0'].cycle.take(stats.size)
 

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

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

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-disk-checks
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2016-01-15 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
@@ -162,16 +140,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -192,13 +170,13 @@ description: |-
                                 health, usage, and various metrics.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-disk.rb
-- metrics-disk-usage.rb
-- metrics-disk-capacity.rb
-- check-smart.rb
-- check-smart-status.rb
-- check-fstab-mounts.rb
 - check-disk-usage.rb
+- check-fstab-mounts.rb
+- check-smart-status.rb
+- check-smart.rb
+- metrics-disk-capacity.rb
+- metrics-disk-usage.rb
+- metrics-disk.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -232,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -240,8 +218,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for disk checks
 test_files: []
+has_rdoc: