sensu-plugins-disk-checks 5.0.1 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d37ef9e41773a99e960a7c802bf7c4f95f50983eb641dfa44b971484e312ba
-  data.tar.gz: be708ccaf9d3423c4dfd8c5548922cc5e84e93e300f8c33d11be91593a2830d7
+  metadata.gz: f2c5f3e7cb7dc768ff1903d561a3aaedcd2d2298ca3e7d6ba7782f504fa8d31c
+  data.tar.gz: b728133e6f2082c0a5454f730caa9dee13248f3104ffd8ee1610913f81f7aff5
 SHA512:
-  metadata.gz: 297fef7c160a7fc5be856c932f90a667d7fc445dbb4a6ca23e25af0f0ca3d3dd3267a3f21e334a0ecb0b3ff14ab35d18cd2004d849f4ec216489b976d5c95d13
-  data.tar.gz: bd6238536bf82de618ac8a3de137c7cac5d7150b353b9b109a4cf8a6df6194c4826858665b74a6069e69d486e5556f087688cfb3e1088c9e4af94686438e0f35
+  metadata.gz: 12f3b53ded7a8a036573176976e5e9dceeda4a9886ace306dd88b46bf2dfd54c5bf36523cb6c2976024cd6c2b176a19cdac284c49f8ec57115599055215bfbf8
+  data.tar.gz: 7e17b7dd33bfebf3d6ebd7253036e3982cb17b3a92241dc13248cc72c1f6ec030e1d4d9ca3067d9974614f56402711a065e130237204bba1165ef3491bacc564

data/CHANGELOG.md

@@ -5,6 +5,30 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [5.1.4] - 2020-11-05
+### Fixed
+- change Sensu asset build definition to match ruby-runtime build collection. No change to underlying plugin functionality
+
+## [5.1.3] - 2020-06-02
+### Fixed
+- fix for incorrect Ruby literal string freeze in binaries
+
+## [5.1.2] - 2020-05-20
+### Fixed
+- check-disk-usage.rb: More accurate disk percent usage ignoring privileged bytes (@SaviourSelf)
+
+## [5.1.1] - 2020-04-22
+### Changed
+- Removed centos from .bonsai.yml to make Bonsai happy again
+
+## [5.1.0] - 2020-04-22
+### Changed
+- Updated bundler dependancy to '~> 2.1'
+- Added option to ignore privileged bytes
+- Updated rubocop dependency to '~> 0.81.0'
+- Remediated rubocop issues
+- Updated sys-filesystem gem dependency from 1.3.2 to 1.3.4
+
 ## [5.0.1] - 2019-12-10
 ### Changed
 - Updated readme for compliance with proposed plugins style guide
@@ -212,7 +236,11 @@ https://mathias-kettner.de/checkmk_filesystems.html
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.1.3...HEAD
+[5.1.3]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.1.2...5.1.3
+[5.1.2]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.1.1...5.1.2
+[5.1.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.1.0...5.1.1
+[5.1.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.0.1...5.1.0
 [5.0.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/4.0.1...5.0.0
 [4.0.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/4.0.0...4.0.1

data/README.md

@@ -50,6 +50,7 @@ Usage: check-disk-usage.rb (options)
     -p PATHRE                        Ignore mount point(s) matching regular expression
     -x TYPE[,TYPE]                   Ignore fs type(s)
     -I MNT[,MNT]                     Include only mount point(s)
+    -r                               Ignore bytes reserved for privileged processes only
     -W PERCENT                       Warn if PERCENT or more of inodes used
     -m MAGIC                         Magic factor to adjust warn/crit thresholds. Example: .9
     -l MINIMUM                       Minimum size to adjust (in GB)

data/bin/check-disk-usage.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-disk
 #
@@ -27,12 +29,12 @@
 
 require 'sensu-plugin/check/cli'
 require 'sys/filesystem'
-include Sys
 
 #
 # Check Disk
 #
 class CheckDisk < Sensu::Plugin::Check::CLI
+  include Sys
   option :fstype,
          short: '-t TYPE[,TYPE]',
          description: 'Only check fs type(s)',
@@ -63,6 +65,19 @@ class CheckDisk < Sensu::Plugin::Check::CLI
          description: 'Ignore option(s)',
          proc: proc { |a| a.split('.') }
 
+  option :ignorereadonly,
+         long: '--ignore-readonly',
+         description: 'Ignore read-only filesystems',
+         boolean: true,
+         default: false
+
+  option :ignore_reserved,
+         description: 'Ignore bytes reserved for privileged processes',
+         short: '-r',
+         long: '--ignore-reserved',
+         boolean: true,
+         default: false
+
   option :bwarn,
          short: '-w PERCENT',
          description: 'Warn if PERCENT or more of disk full',
@@ -126,10 +141,11 @@ class CheckDisk < Sensu::Plugin::Check::CLI
     mounts.each do |line|
       begin
         next if config[:fstype] && !config[:fstype].include?(line.mount_type)
-        next if config[:ignoretype] && config[:ignoretype].include?(line.mount_type)
-        next if config[:ignoremnt] && config[:ignoremnt].include?(line.mount_point)
-        next if config[:ignorepathre] && config[:ignorepathre].match(line.mount_point)
-        next if config[:ignoreopt] && config[:ignoreopt].include?(line.options)
+        next if config[:ignoretype]&.include?(line.mount_type)
+        next if config[:ignoremnt]&.include?(line.mount_point)
+        next if config[:ignorepathre]&.match(line.mount_point)
+        next if config[:ignoreopt]&.include?(line.options)
+        next if config[:ignorereadonly] && line.options.split(',').include?('ro')
         next if config[:includemnt] && !config[:includemnt].include?(line.mount_point)
       rescue StandardError
         unknown 'An error occured getting the mount info'
@@ -157,6 +173,7 @@ class CheckDisk < Sensu::Plugin::Check::CLI
     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]
@@ -185,9 +202,18 @@ class CheckDisk < 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] }
-    format("%.2f #{unit[1]}", (s >= 1024 ? s.to_f / unit[0] : s))
+  def to_human(size)
+    unit = [
+      [1_099_511_627_776, 'TiB'],
+      [1_073_741_824, 'GiB'],
+      [1_048_576, 'MiB'],
+      [1024, 'KiB'],
+      [0, 'B']
+    ].detect { |u| size >= u[0] }
+    format(
+      "%.2f #{unit[1]}",
+      (size >= 1024 ? size.to_f / unit[0] : size)
+    )
   end
 
   # Determine the percent inode usage
@@ -199,7 +225,17 @@ class CheckDisk < Sensu::Plugin::Check::CLI
   # Determine the percent byte usage
   #
   def percent_bytes(fs_info)
-    (100.0 - (100.0 * fs_info.bytes_free / fs_info.bytes_total)).round(2)
+    if config[:ignore_reserved]
+      u100 = fs_info.bytes_used * 100.0
+      nonroot_total = fs_info.bytes_used + fs_info.bytes_available
+      if nonroot_total.zero?
+        0
+      else
+        (u100 / nonroot_total + (u100 % nonroot_total != 0 ? 1 : 0)).round(2)
+      end
+    else
+      (100.0 - (100.0 * fs_info.bytes_free / fs_info.bytes_total)).round(2)
+    end
   end
 
   # Generate output

data/bin/check-fstab-mounts.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-fstab-mounts
 #
@@ -51,30 +53,30 @@ class CheckFstabMounts < Sensu::Plugin::Check::CLI
     @missing_mounts = []
   end
 
-  def resolve_device(d)
-    if d.start_with?('UUID=')
-      uuid = d.split('=')[1]
+  def resolve_device(device)
+    if device.start_with?('UUID=')
+      uuid = device.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]
+    if device.start_with?('LABEL=')
+      label = device.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, '/')
+    if device.start_with?('/dev/mapper')
+      if File.symlink?(device)
+        device = File.realpath(device, '/')
       end
     end
 
-    d
+    device
   end
 
   # Check by mount destination (col 2 in fstab and proc/mounts)
@@ -83,6 +85,7 @@ class CheckFstabMounts < Sensu::Plugin::Check::CLI
     @fstab.each do |line|
       next if line =~ /^\s*#/
       next if line =~ /^\s*$/
+
       fields = line.split(/\s+/)
       next if fields[1] == 'none' || (fields[3].include? 'noauto')
       next if config[:fstypes] && !config[:fstypes].include?(fields[2])

data/bin/check-smart-status.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-smart
 #
@@ -82,6 +84,7 @@ class Disk
 
   def smart_ignore?(num)
     return if @att_ignore.nil?
+
     @att_ignore.include? num
   end
 
@@ -163,6 +166,7 @@ class SmartCheckStatus < Sensu::Plugin::Check::CLI
     # Set default threshold
     default_threshold = config[:defaults].split(',')
     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?

data/bin/check-smart-tests.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-smart-tests.rb
 #
@@ -78,7 +80,7 @@ end
 
 class CheckSMARTTests < Sensu::Plugin::Check::CLI
   option :executable,
-         long:  '--executable EXECUTABLE',
+         long: '--executable EXECUTABLE',
          short: '-e EXECUTABLE',
          default: '/usr/sbin/smartctl',
          description: 'Path to smartctl executable'

data/bin/check-smart.rb

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

data/bin/metrics-disk-capacity.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   disk-capacity-metrics
 #
@@ -47,7 +49,7 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
       begin
         converted = Integer(value)
         values[index] = converted
-      rescue ArgumentError # rubocop:disable HandleExceptions
+      rescue ArgumentError # rubocop:disable Lint/SuppressedException
       end
     end
     values

data/bin/metrics-disk-usage.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   disk-usage-metrics
 #
@@ -105,8 +107,9 @@ class DiskUsageMetrics < Sensu::Plugin::Metric::CLI::Graphite
       _, _, used, avail, used_p, mnt = line.split
 
       unless %r{/sys[/|$]|/dev[/|$]|/run[/|$]} =~ mnt
-        next if config[:ignore_mnt] && config[:ignore_mnt].find { |x| mnt.match(x) }
+        next if config[:ignore_mnt]&.find { |x| mnt.match(x) }
         next if config[:include_mnt] && !config[:include_mnt].find { |x| mnt.match(x) }
+
         mnt = if config[:flatten]
                 mnt.eql?('/') ? 'root' : mnt.gsub(/^\//, '')
               else

data/bin/metrics-disk.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   disk-metrics
 #
@@ -75,7 +77,7 @@ class DiskGraphite < Sensu::Plugin::Metric::CLI::Graphite
       end
       next if stats == ['0'].cycle.take(stats.size)
 
-      next if config[:ignore_device] && config[:ignore_device].find { |x| dev.match(x) }
+      next if config[:ignore_device]&.find { |x| dev.match(x) }
       next if config[:include_device] && !config[:include_device].find { |x| dev.match(x) }
 
       metrics.size.times { |i| output "#{config[:scheme]}.#{dev}.#{metrics[i]}", stats[i] }

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

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

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsDiskChecks
   module Version
     MAJOR = 5
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 4
 
     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: 5.0.1
+  version: 5.1.4
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -219,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for disk checks