sensu-plugins-raid-checks 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d439985a3f3eb77e2c6cfc0bb4d3e97bb1c95af
-  data.tar.gz: 432f11999e85966ade57f89f6ac46af10832bc27
+SHA256:
+  metadata.gz: 5a807491188351610c1d92f61ffdf6453c34c51de3bd1d73f68d15a1dcb00a82
+  data.tar.gz: 42e2aa80eb09c459902a41d6c8359666b5a43e37436b44b9759e41a95eec73e2
 SHA512:
-  metadata.gz: 6c9f6d9f7473fad7d92a898a975a51e4ecd29461493806d66a5dea4ec1747a0452ef566f9d63a54cd7fbd98d5776a145be5e6c7bb688775ae3aa9a12922afe64
-  data.tar.gz: 61db581a39d3073ba7a54266576637824c386751123e64c35e75db28858f627bb6e2e2059d11ab23b33a3d4a22573d8e7e7711ebb638778c73eb1fe635c909b5
+  metadata.gz: e63a5f13dcac901435fb91f7a64e72d07caf8eed21f1813c6d579f322050b39f0747eec11e8e64227299306260738c5e7b36fd77fcd5d1a37629f266f36d96f0
+  data.tar.gz: c9d7eed41e4372d708693bf39f6954ba7374642770d9ae973b184c5ad5f103adfac9049f1bcbdd28360753de01b495148300cb83b6dcd6171010828809e4f682

data/CHANGELOG.md

@@ -6,6 +6,13 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [2.0.1] - 2017-01-31
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Changed
+- appeased the cops (@majormoses)
+
 ## [2.0.0] - 2017-12-28
 ### Breaking Change
 - `check-raid.rb`: added option `--log` with a default of `false` to prevent it default creating a log which is frequently being written to and filling up the disk. This does the *opposite* of what the vendor defaults are but due to the nature of those running it through a monitoring solution like sensu the defaults do not make sense in this use case. If you are wanting those logs you can change this to `true` to keep existing behavior. (@dhpowrhost) (@smbambling)
@@ -56,6 +63,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-raid-checks/compare/2.0.0...HEAD
+[2.0.1]: https://github.com/sensu-plugins/sensu-plugins-raid-checks/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-raid-checks/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-raid-checks/compare/0.1.0...1.0.0
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-raid-checks/compare/0.0.4...0.1.0

data/bin/check-3ware-status.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-raid
 #
@@ -82,7 +84,7 @@ class Check3wareStatus < Sensu::Plugin::Check::CLI
     data.lines.each do |line|
       unless line.empty?
         controller = line.split[0]
-        @controllers << controller if /^c[0-9]+$/ =~ controller
+        @controllers << controller if controller.match?(/^c[0-9]+$/)
       end
     end
   end
@@ -97,7 +99,7 @@ class Check3wareStatus < Sensu::Plugin::Check::CLI
     data.lines.each do |line|
       unless line.empty?
         splitted = line.split
-        if /^[p][0-9]+$/ =~ splitted[0]
+        if splitted.first.match?(/^[p][0-9]+$/)
           # '-' means the drive doesn't belong to any array
           # If is NOT PRESENT too, it just means this is an empty port
           status = splitted[1]

data/bin/check-megaraid-sas-status.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-raid
 #
@@ -56,7 +58,7 @@ class CheckMegaRAID < Sensu::Plugin::Check::CLI
     (0..$CHILD_STATUS.exitstatus - 1).each do |i|
       # and check them in turn
       stdout = `#{config[:megaraidcmd]} -LDInfo -L#{i} -a#{config[:controller]} `
-      unless Regexp.new('State\s*:\s*Optimal').match(stdout)
+      unless Regexp.new('State\s*:\s*Optimal').match?(stdout)
         error = sprintf '%svirtual drive %d: %s ', error, i, stdout[/State\s*:\s*.*/].split(':')[1] # rubocop:disable Style/FormatString
         have_error = true
       end

data/bin/check-mpt2sas-status.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-raid
 #

data/bin/check-raid.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-raid
 #
@@ -38,97 +40,92 @@ class CheckRaid < Sensu::Plugin::Check::CLI
          default: false
   # Check software raid
   #
-  def check_software
-    if File.exist?('/proc/mdstat')
-      contents = File.read('/proc/mdstat')
-      mg = contents.lines.grep(/active|blocks/)
-      unless mg.empty?
-        sg = mg.to_s.lines.grep(/\]\(F\)|[\[U]_/)
-        unless sg.empty? # rubocop:disable UnlessElse
-          warning 'Software RAID warning'
-        else
-          ok 'Software RAID OK'
-        end
-      end
+  def check_software_raid
+    return unless File.exist?('/proc/mdstat')
+    contents = File.read('/proc/mdstat')
+    mg = contents.lines.grep(/active|blocks/)
+    return unless mg.empty?
+    sg = mg.to_s.lines.grep(/\]\(F\)|[\[U]_/)
+    if sg.empty?
+      ok 'Software RAID OK'
+    else
+      warning 'Software RAID warning'
     end
   end
 
   # Check HP raid
   #
   def check_hp
-    if File.exist?('/usr/bin/cciss_vol_status')
-      contents = `/usr/bin/cciss_vol_status /dev/sg0`
-      c = contents.lines.grep(/status\: OK\./)
-      # #YELLOW
-      unless c.empty? # rubocop:disable UnlessElse
-        ok 'HP RAID OK'
-      else
-        warning 'HP RAID warning'
-      end
+    return unless File.exist?('/usr/bin/cciss_vol_status')
+    contents = `/usr/bin/cciss_vol_status /dev/sg0`
+    c = contents.lines.grep(/status\: OK\./)
+    # #YELLOW
+    if c.empty?
+      warning 'HP RAID warning'
+    else
+      ok 'HP RAID OK'
     end
   end
 
   # Check Adaptec raid controllers
   #
   def check_adaptec
-    if File.exist?('/usr/StorMan/arcconf')
-      contents = `/usr/StorMan/arcconf GETCONFIG 1 AL`
-
-      mg = contents.lines.grep(/Controller Status/)
-      # #YELLOW
-      unless mg.empty? # rubocop:disable UnlessElse
-        sg = mg.to_s.lines.grep(/Optimal/)
-        warning 'Adaptec Physical RAID Controller Failure' if sg.empty?
-      else
-        warning 'Adaptec Physical RAID Controller Status Read Failure'
-      end
+    return unless File.exist?('/usr/StorMan/arcconf')
+    contents = `/usr/StorMan/arcconf GETCONFIG 1 AL`
 
-      mg = contents.lines.grep(/Status of logical device/)
-      # #YELLOW
-      unless mg.empty? # rubocop:disable UnlessElse
-        sg = mg.to_s.lines.grep(/Optimal/)
-        warning 'Adaptec Logical RAID Controller Failure' if sg.empty?
-      else
-        warning 'Adaptec Logical RAID Controller Status Read Failure'
-      end
+    mg = contents.lines.grep(/Controller Status/)
+    # #YELLOW
+    if mg.empty?
+      warning 'Adaptec Physical RAID Controller Status Read Failure'
+    else
+      sg = mg.to_s.lines.grep(/Optimal/)
+      warning 'Adaptec Physical RAID Controller Failure' if sg.empty?
+    end
 
-      mg = contents.lines.grep(/S\.M\.A\.R\.T\.   /)
-      # #YELLOW
-      unless mg.empty? # rubocop:disable UnlessElse
-        sg = mg.to_s.lines.grep(/No/)
-        warning 'Adaptec S.M.A.R.T. Disk Failed' if sg.empty?
-      else
-        warning 'Adaptec S.M.A.R.T. Status Read Failure'
-      end
+    mg = contents.lines.grep(/Status of logical device/)
+    # #YELLOW
+    if mg.empty?
+      warning 'Adaptec Logical RAID Controller Status Read Failure'
+    else
+      sg = mg.to_s.lines.grep(/Optimal/)
+      warning 'Adaptec Logical RAID Controller Failure' if sg.empty?
+    end
 
-      ok 'Adaptec RAID OK'
+    mg = contents.lines.grep(/S\.M\.A\.R\.T\.   /)
+    # #YELLOW
+    if mg.empty?
+      warning 'Adaptec S.M.A.R.T. Status Read Failure'
+    else
+      sg = mg.to_s.lines.grep(/No/)
+      warning 'Adaptec S.M.A.R.T. Disk Failed' if sg.empty?
     end
+
+    ok 'Adaptec RAID OK'
   end
 
   # Check Megaraid
   #
   def check_mega_raid
-    if File.exist?('/usr/sbin/megacli')
-      contents = if config[:log]
-                   `/usr/sbin/megacli -AdpAllInfo -aALL`
-                 else
-                   `/usr/sbin/megacli -AdpAllInfo -aALL -NoLog`
-                 end
-      failed = contents.lines.grep(/(Critical|Failed) Disks\s+\: 0/)
-      degraded = contents.lines.grep(/Degraded\s+\: 0/)
-      # #YELLOW
-      unless failed.empty? || degraded.empty? # rubocop:disable UnlessElse
-        ok 'MegaRaid RAID OK'
-      else
-        warning 'MegaRaid RAID warning'
-      end
+    return unless File.exist?('/usr/sbin/megacli')
+    contents = if config[:log]
+                 `/usr/sbin/megacli -AdpAllInfo -aALL`
+               else
+                 `/usr/sbin/megacli -AdpAllInfo -aALL -NoLog`
+               end
+    failed = contents.lines.grep(/(Critical|Failed) Disks\s+\: 0/)
+    degraded = contents.lines.grep(/Degraded\s+\: 0/)
+    # #YELLOW
+    if failed.empty? || degraded.empty?
+      warning 'MegaRaid RAID warning'
+    else
+      ok 'MegaRaid RAID OK'
     end
   end
 
   # Main function
   #
   def run
-    check_software
+    check_software_raid
     unless `lspci`.lines.grep(/RAID/).empty?
       check_hp
       check_adaptec

data/bin/check-smart-array-status.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-smart-array-status
 #
@@ -85,7 +87,7 @@ class CheckSmartArrayStatus < Sensu::Plugin::Check::CLI
     data.lines.each do |line|
       unless line.empty?
         splitted = line.split
-        if /^physicaldrive$/ =~ splitted[0]
+        if splitted.first.match?(/^physicaldrive$/)
           status = splitted[-1]
           disk = 'ctrl ' + controller + ' ' + line.strip
           if status == 'OK'

data/lib/sensu-plugins-raid-checks.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-raid-checks/version'

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsRaidChecks
   module Version
     MAJOR = 2
     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-raid-checks
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -170,11 +170,11 @@ description: |-
                                 controller/array health
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-smart-array-status.rb
-- check-mpt2sas-status.rb
-- check-megaraid-sas-status.rb
 - check-3ware-status.rb
+- check-megaraid-sas-status.rb
+- check-mpt2sas-status.rb
 - check-raid.rb
+- check-smart-array-status.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with raid evices