sensu-plugins-disk-checks 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0e99fb96d8f5c4535e80a8997cbdaaea748cb856d6c4c4531175d6ecb160b2
-  data.tar.gz: 1fc9a89b7caa658ce283d1767be07d663bca422f25c6a2da3a8fa770eb017cb6
+  metadata.gz: 8b76a845add6f2cd9d29b9053f3e928f1e8cf86c133bc30571537535da43c92f
+  data.tar.gz: c41d56c55ca84d4b79644051ed4dae6eb3f515ed1c8ceb0912855128d23e81bb
 SHA512:
-  metadata.gz: dea1c510c87658d1ca0ba9794003c92911405a89fd6b17f04f39d2cf37ec4ce5f39969f66a86c170fca819ce663f2be6c24ef6afed0e480fe2fffe2c1d3635e6
-  data.tar.gz: 8691673fd0e84ce7d59af24861c4ae984aabc0129452e4d7bc99167c824ee9f3031258b0814336ab23211fb9e8fc836a8e0660367492124ba9dbb32c710c5e4f
+  metadata.gz: feb2b7020690df95756c9ea6466a696f6e371410b278e807989a78808067e3a2076d86b7c3c3f88dfa3205f7d3dbf7cc2f654958ea068766f58e8ba24aabc150
+  data.tar.gz: da4fe12cbbe5a8da2850c91b4fa01e8233808d6a7883dc9cc69c6a56d89008239803a351ca77a16aaa34d40312106caa1ba52b8e731c1347d084aa3e4edf9df8

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.1.0] - 2018-05-02
+### Added
+- metrics-disk-capacity.rb, added `solaris` compatibility. Does not support inodes on `solaris` (@makaveli0129).
+- metrics-disk-usage.rb: added `solaris` compatibility. Does not support block_size for config (@makaveli0129)
+
 ## [3.0.1] - 2018-03-27
 ### Security
 - updated yard dependency to `~> 0.9.11` per: https://nvd.nist.gov/vuln/detail/CVE-2017-17042 (@majormoses)
@@ -175,7 +180,8 @@ https://mathias-kettner.de/checkmk_filesystems.html
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/3.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/3.0.1...3.1.0
 [3.0.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.5.1...3.0.0
 [2.5.1]: https://github.com/sensu-plugins/sensu-plugins-disk-checks/compare/2.5.0...2.5.1

data/bin/metrics-disk-capacity.rb

@@ -57,13 +57,18 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
   #
   def run
     # Get capacity metrics from DF as they don't appear in /proc
-    `df -PT`.split("\n").drop(1).each do |line|
+    command = if Gem::Platform.local.os == 'solaris'
+                'df -k'
+              else
+                'df -PT'
+              end
+    `#{command}`.split("\n").drop(1).each do |line|
       begin
         fs, _type, _blocks, used, avail, capacity, _mnt = line.split
 
         timestamp = Time.now.to_i
         if fs =~ /\/dev/
-          fs = fs.gsub('/dev/', '')
+          fs = fs.tr('/dev/', '')
           metrics = {
             disk: {
               "#{fs}.used" => used,
@@ -83,28 +88,30 @@ class DiskCapacity < Sensu::Plugin::Metric::CLI::Graphite
     end
 
     # Get inode capacity metrics
-    `df -Pi`.split("\n").drop(1).each do |line|
-      begin
-        fs, _inodes, used, avail, capacity, _mnt = line.split
+    if Gem::Platform.local.os != 'solaris'
+      `df -Pi`.split("\n").drop(1).each do |line|
+        begin
+          fs, _inodes, used, avail, capacity, _mnt = line.split
 
-        timestamp = Time.now.to_i
-        if fs =~ /\/dev/
-          fs = fs.gsub('/dev/', '')
-          metrics = {
-            disk: {
-              "#{fs}.iused" => used,
-              "#{fs}.iavail" => avail,
-              "#{fs}.icapacity" => capacity.delete('%')
+          timestamp = Time.now.to_i
+          if fs =~ /\/dev/
+            fs = fs.tr('/dev/', '')
+            metrics = {
+              disk: {
+                "#{fs}.iused" => used,
+                "#{fs}.iavail" => avail,
+                "#{fs}.icapacity" => capacity.delete('%')
+              }
             }
-          }
-          metrics.each do |parent, children|
-            children.each do |child, value|
-              output [config[:scheme], parent, child].join('.'), value, timestamp
+            metrics.each do |parent, children|
+              children.each do |child, value|
+                output [config[:scheme], parent, child].join('.'), value, timestamp
+              end
             end
           end
+        rescue StandardError
+          unknown "malformed line from df: #{line}"
         end
-      rescue StandardError
-        unknown "malformed line from df: #{line}"
       end
     end
     ok

data/bin/metrics-disk-usage.rb

@@ -95,7 +95,13 @@ class DiskUsageMetrics < Sensu::Plugin::Metric::CLI::Graphite
     delim = config[:flatten] == true ? '_' : '.'
     # Get disk usage from df with used and avail in megabytes
     # #YELLOW
-    `df -PB#{config[:block_size]} #{config[:local] ? '-l' : ''}`.split("\n").drop(1).each do |line|
+    command = if Gem::Platform.local.os == 'solaris'
+                "df -k #{config[:local] ? '-l' : ''}"
+              else
+                "df -PB#{config[:block_size]} #{config[:local] ? '-l' : ''}"
+              end
+
+    `#{command}`.split("\n").drop(1).each do |line|
       _, _, used, avail, used_p, mnt = line.split
 
       unless %r{/sys[/|$]|/dev[/|$]|/run[/|$]} =~ mnt

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

@@ -1,8 +1,8 @@
 module SensuPluginsDiskChecks
   module Version
     MAJOR = 3
-    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: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin