sensu-plugins-disk-checks 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1017c60b1c58d6bce40c4aeae7d8ae5f5df1d202
-  data.tar.gz: 7bb82598df6b65ae47fdf45aa0fe91099c1756aa
+  metadata.gz: 84f05a4a6178a02e5798248cd1c67eadcb6235e2
+  data.tar.gz: fa409bbe0762c858f885127cb29633e397a57ca4
 SHA512:
-  metadata.gz: 9fd0746371815af81bcbb2b31540e81642d2d341b5f33459d6724f1e94bea3771e48d230f0a3040fcdf7a5d91d5698c2a5c5bbb1d2d7529c7dbb81a214e81171
-  data.tar.gz: 7dab0601b071ad0ed8abe2edbefc4775e24b580096b2f8be4e0af14a1ce43a111752c6e2d272bc91808aeb52a1ea5e1fd8065b6534621b10407f33b9bb676792
+  metadata.gz: e66515d72f04a69716714af53fae709d47ad377f35f7fc2ebec35d8ce5d86f3602fc064f3a973e582374c1dc31323fcf04dbec6be7072c37cfe459c6702b90c0
+  data.tar.gz: 6170411f699673da8e69ca097cd3df92224fedd8b76e68ce4b56fdb2572994ae15ffcf64e87e4e1fe575cbf305c78ee21bbc71d909c26f596b9bb7ed51e70fa5

data/CHANGELOG.md

@@ -4,6 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.1.0] - 2017-05-04
+### Changed
+- check-disk-usage.rb: show the decimals for disk usage figures
+- check-disk-usage.rb: dont do utilization check of devfs filesystems
+- bump sys-filesystem to 1.1.7
+
+### Fixed
+- check-fstab-mounts.rb: support swap mounts defined using UUID or LABEL
+- check-fstab-mounts.rb: support swap mounts defined using LVM /dev/mapper/*
 
 ## [2.0.1] - 2016-06-15
 ### Fixed
@@ -110,7 +119,8 @@ https://mathias-kettner.de/checkmk_filesystems.html
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.0.1...2.1.0
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.0.0...2.0.1
 [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

data/README.md

@@ -40,7 +40,7 @@ Acquire disk capacity metrics from `df` and convert them to a form usable by gra
 
 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.
 
-**metrics-disk-uasage**
+**metrics-disk-usage**
 
 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.
 
@@ -97,4 +97,4 @@ This is a sample input file used by check-smart-status, see the script for furth
 ### 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).
+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

@@ -149,6 +149,9 @@ class CheckDisk < Sensu::Plugin::Check::CLI
       @warn_fs << "#{line.mount_point} Unable to read."
       return
     end
+    if line.mount_type == 'devfs'
+      return
+    end
     if fs_info.respond_to?(:inodes) && !fs_info.inodes.nil? # needed for windows
       percent_i = percent_inodes(fs_info)
       if percent_i >= config[:icrit]
@@ -179,7 +182,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 >= 1024 ? s / unit[0] : s} #{unit[1]}"
+    format("%.2f #{unit[1]}", (s >= 1024 ? s.to_f / unit[0] : s))
   end
 
   # Determine the percent inode usage

data/bin/check-fstab-mounts.rb

@@ -51,6 +51,32 @@ class CheckFstabMounts < Sensu::Plugin::Check::CLI
     @missing_mounts = []
   end
 
+  def resolve_device(d)
+    if d.start_with?('UUID=')
+      uuid = d.split('=')[1]
+      path = File.join('/', 'dev', 'disk', 'by-uuid', uuid)
+      if File.exist?(path) && File.symlink?(path)
+        return File.realpath(path)
+      end
+    end
+
+    if d.start_with?('LABEL=')
+      label = d.split('=')[1]
+      path  = File.join('/', 'dev', 'disk', 'by-label', label)
+      if File.exist?(path) && File.symlink?(path)
+        return File.realpath(path)
+      end
+    end
+
+    if d.start_with?('/dev/mapper')
+      if File.symlink?(d)
+        d = File.realpath(d, '/')
+      end
+    end
+
+    d
+  end
+
   # Check by mount destination (col 2 in fstab and proc/mounts)
   #
   def check_mounts
@@ -60,10 +86,11 @@ class CheckFstabMounts < Sensu::Plugin::Check::CLI
       fields = line.split(/\s+/)
       next if fields[1] == 'none' || (fields[3].include? 'noauto')
       next if config[:fstypes] && !config[:fstypes].include?(fields[2])
+
       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? # rubocop:disable Style/IfInsideElse
+        @missing_mounts << fields[1] if @swap_mounts.select { |m| m.split(/\s+/)[0] == resolve_device(fields[0]) }.empty? # rubocop:disable Style/IfInsideElse
       end
     end
   end

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

@@ -1,8 +1,8 @@
 module SensuPluginsDiskChecks
   module Version
     MAJOR = 2
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    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.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,9 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for disk checks
 test_files: []
-has_rdoc: