sensu-plugins-lvm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bafedab39b4390863ae90f422b4a86d3d8aa172f
-  data.tar.gz: a64692f0bdc68620ed98c1c140b625f15d4d98a2
+SHA256:
+  metadata.gz: e9655a6231ee5e15854cef010f678fc75a22a1f27a29367f0db6c4eb9a37f513
+  data.tar.gz: 03e2f8852f9372abab489de6f1aa03079b9e7133d2647b4b3a0722a055d13ce8
 SHA512:
-  metadata.gz: 234e7ac42f1745ae6290a3e588a8cb4bda22e6af002496af1cc6ca469eb73a7a90ad5ded2cec285eb026d7cba79483f5c00a155df7b4f707494b7fed98980cea
-  data.tar.gz: 1db3c9a7d282196540b8e6ef04a9e20197543329acfc1fb2a1cba988a5ee931d7517a4d9f41f2d6f0a3988ac301bae8ca4e4c61fe0273c6544a91b0780091b5f
+  metadata.gz: a5d5d21db1b39e7eb6a308b2645e640b404cba51d608f9b292eddd5452a5bf49ae03517e7fe97503420140005a846029078c9894bc80cd7520fb88dcdecdc8e6
+  data.tar.gz: 5ae95c7c7f265f567844d9921e530e12b7ed685b1263e44e0bd19f4018a74ba35a36c4d1d04a65589a9be1c7a891d7e3448f213e12e2b8476d770c304dbd93cc

data/CHANGELOG.md

@@ -1,10 +1,17 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.0.1] - 2018-07-06
+### Fixed
+- check-lv-usage.rb: emit an `unknown` with a useful message rather than a false `ok` when no volumes are found (@sys-ops)
+
+### Changed
+- general readability improvements and appeasing the cops (@majormoses)
+
 ## [1.0.0] - 2017-07-12
 ### Added
 - ruby 2.4 testing (@majormoses)
@@ -30,6 +37,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - Initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-lvm/compare/1.0.0...HEAD
+[1.0.1]: https://github.com/sensu-plugins/sensu-plugins-lvm/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-lvm/compare/0.0.4...1.0.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-lvm/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-lvm/compare/0.0.2...0.0.3

data/bin/check-lv-usage.rb

@@ -79,33 +79,44 @@ class CheckLVUsage < Sensu::Plugin::Check::CLI
   end
 
   def logical_volumes
-    @lv ||= LVM::LVM.new.logical_volumes.list
+    @logical_volumes ||= LVM::LVM.new.logical_volumes.list
+  end
+
+  def empty_volumes_msg
+    # NOTE: when we drop ruby < 2.3 support switch to <<~ and indent sanely
+    string = <<-HEREDOC
+    An error occured getting the LVM info: got empty list of volumes.
+    Check to ensure sensu has been configured with appropriate permissions.
+    On linux systems it will generally need to allow executing
+    HEREDOC
+    string.squeeze(' ')
   end
 
   def filter_volumes(list)
+    unknown empty_volumes_msg if list.empty?
     begin
       return list.select { |l| config[:lv].include?(l.name) } if config[:lv]
       return list.select { |l| config[:full_name].include?(l.full_name) } if config[:full_name]
-    rescue
+    rescue StandardError
       unknown 'An error occured getting the LVM info'
     end
     list
   end
 
-  def check_usage(v)
-    d_percent = v.data_percent.to_i
-    m_percent = v.metadata_percent.to_i
+  def check_usage(volume)
+    d_percent = volume.data_percent.to_i
+    m_percent = volume.metadata_percent.to_i
 
     if d_percent >= config[:dcrit]
-      @crit_lv << "#{v.full_name} data volume is #{d_percent}% used"
+      @crit_lv << "#{volume.full_name} data volume is #{d_percent}% used"
     elsif d_percent >= config[:dwarn]
-      @warn_lv << "#{v.full_name} data volume is #{d_percent}% used"
+      @warn_lv << "#{volume.full_name} data volume is #{d_percent}% used"
     end
 
     if m_percent >= config[:mcrit]
-      @crit_lv << "#{v.full_name} metadata volume is #{m_percent}% used"
+      @crit_lv << "#{volume.full_name} metadata volume is #{m_percent}% used"
     elsif m_percent >= config[:mwarn]
-      @warn_lv << "#{v.full_name} metadata volume is #{m_percent}% used"
+      @warn_lv << "#{volume.full_name} metadata volume is #{m_percent}% used"
     end
   end
 
@@ -119,7 +130,7 @@ class CheckLVUsage < Sensu::Plugin::Check::CLI
   #
   def run
     volumes = filter_volumes(logical_volumes)
-    volumes.each { |v| check_usage(v) }
+    volumes.each { |volume| check_usage(volume) }
     critical check_output unless @crit_lv.empty?
     warning check_output unless @warn_lv.empty?
     ok "All logical volume data usage under #{config[:dwarn]}% and metadata usage under #{config[:mwarn]}%"

data/bin/check-vg-usage.rb

@@ -75,7 +75,7 @@ class CheckVg < Sensu::Plugin::Check::CLI
         next if config[:ignorevg] && config[:ignorevg].include?(line.name)
         next if config[:ignorevgre] && config[:ignorevgre].match(line.name)
         next if config[:includevg] && !config[:includevg].include?(line.name)
-      rescue
+      rescue StandardError
         unknown 'An error occured getting the LVM info'
       end
       check_volume_group(line)
@@ -99,9 +99,19 @@ class CheckVg < Sensu::Plugin::Check::CLI
     end
   end
 
-  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]}"
+  def to_human(bytes)
+    units = [
+      [1_099_511_627_776, 'TiB'],
+      [1_073_741_824, 'GiB'],
+      [1_048_576, 'MiB'],
+      [1024, 'KiB'],
+      [0, 'B']
+    ].detect { |unit| bytes >= unit[0] }
+    if bytes > 0
+      bytes / units[0]
+    else
+      units[1]
+    end
   end
 
   # Generate output

data/bin/metrics-vg-usage.rb

@@ -1,6 +1,4 @@
 #! /usr/bin/env ruby
-#  encoding: UTF-8
-
 #
 #   metrics-vg-usage
 #
@@ -64,7 +62,7 @@ class VgUsageMetrics < Sensu::Plugin::Metric::CLI::Graphite
         next if config[:ignorevg] && config[:ignorevg].include?(line.name)
         next if config[:ignorevgre] && config[:ignorevgre].match(line.name)
         next if config[:includevg] && !config[:includevg].include?(line.name)
-      rescue
+      rescue StandardError
         unknown 'An error occured getting the LVM info'
       end
       volume_group_metrics(line)

data/lib/sensu-plugins-lvm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-lvm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for lvm