sensu-plugins-io-checks 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3e88914bb25d46148ff8b2f959a98ab256d9d0
-  data.tar.gz: 7dbe5146b7c3b39bd4a9e69049a3bd30b1057475
+  metadata.gz: f4beb0429e8b5d472a8c56d3fd65890d03f559ce
+  data.tar.gz: 79ddae3142604f5317d6aa461f63f58ae0c96263
 SHA512:
-  metadata.gz: 98129521cd6a9a7397c7eb4690be4f676450221298018efb881f327de5b4f7627ecdcb828518e58bf1250e46cbc790fc808c3559645e8e7b18d16a313173b5d3
-  data.tar.gz: 30aade1441f6b38d273bf4a8535e48612c8d4de79ab3c70f03bc5c14e54bf959baf4e46d76949ab4db77fd9ead35fe1f32195a86610b7644453c3adb4ecb84f3
+  metadata.gz: b75f2129c79d3ba96c8fe0baabd30ef830f8195dfc6e702a3405cd20621bbb2757ff27db7dab045bb42d90961eb847a61f0369d22bab3d230b1f4d56043baaf2
+  data.tar.gz: b265784fafa66432e6c502eee5cea7fcec9031d146c1359292d63b3f46f3117550bccca824952ff55e890a744c661f392240721360fd4977ee4e02d205d9cef8

data/CHANGELOG.md

@@ -3,7 +3,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased][unreleased]
+## [Unreleased]
+
+## [1.0.0] - 2016-06-20
+### Added
+- rspec test cases for metrics-iostat-extended
+- add proper device node handling for exclude-disk filtering
+
+### Fixed
+- fix an ordering issue on exclude-disk filtering
+- fix locale bug when calling iostat on non en_us systems
+
+### Changed
+- use open3 instead of backticks for proper call to iostat
+- filter exclude-disk in ruby code instead of shell grepping
+- do not pass any environment vars from sensu to iostat call
+- Update to Rubocop 0.40, apply auto-correct
+- Remove Ruby 1.9.3 support; add Ruby 2.3.0 support to test matrix
 
 ## [0.0.3] - 2015-10-15
 ### Changed
@@ -13,6 +29,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
-## [0.0.1] - 2015-06-04
+## 0.0.1 - 2015-06-04
 ### Added
 - initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-io-checks/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-io-checks/compare/0.0.3...1.0.0
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-io-checks/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-io-checks/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-io-checks/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-io-checks)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-io-checks/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-io-checks)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-io-checks.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-io-checks)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-io-checks](https://codeship.com/projects/8fa21ce0-edc4-0132-2240-5a51cb58650a/status?branch=master)](https://codeship.com/projects/84113)
 
 ## Functionality
 

data/bin/metrics-ioping.rb

@@ -102,7 +102,7 @@ class IOPingMetrics < Sensu::Plugin::Metric::CLI::Graphite
     'min' => 60,
     'hour' => 60 * 60,
     'day' => 24 * 60 * 60
-  }
+  }.freeze
   # #YELLOW
   STATS_HEADER = /min\/avg\/max\/mdev/
 

data/bin/metrics-iostat-extended.rb

@@ -29,6 +29,7 @@
 #
 
 require 'sensu-plugin/metric/cli'
+require 'open3'
 require 'socket'
 
 class IOStatExtended < Sensu::Plugin::Metric::CLI::Graphite
@@ -95,20 +96,27 @@ class IOStatExtended < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def run
-    cmd = "iostat -x #{config[:interval]} 2"
+    cmd = 'iostat'
+    args = ['-x', config[:interval].to_s, '2']
+    args.push('-N') if config[:mappernames]
+    args.push(File.basename(config[:disk])) if config[:disk]
 
-    cmd += " #{File.basename(config[:disk])}" if config[:disk]
-    if config[:excludedisk]
-      config[:excludedisk].each do |disk|
-        cmd += " | grep -v #{disk}"
-      end
-    end
-    cmd += ' -N' if config[:mappernames]
-    stats = parse_results(`#{cmd}`)
+    exclude_disk = if config[:excludedisk]
+                     config[:excludedisk].map { |d| File.basename(d) }
+                   else
+                     []
+                   end
+
+    stdin, stdout, stderr = Open3.popen3(cmd, *args, unsetenv_others: true)
+    stdin.close
+    stderr.close
+    stats = parse_results(stdout.gets(nil))
+    stdout.close
 
     timestamp = Time.now.to_i
 
     stats.each do |disk, metrics|
+      next if exclude_disk.include? disk
       metrics.each do |metric, value|
         output [config[:scheme], disk, metric].join('.'), value, timestamp
       end

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

@@ -1,8 +1,8 @@
 module SensuPluginsIOChecks
   module Version
-    MAJOR = 0
+    MAJOR = 1
     MINOR = 0
-    PATCH = 3
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-io-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-10-16 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,16 +126,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -172,11 +150,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Sensu io checks plugins
+description: |-
+  This plugin provides native system I/O
+                                instrumentation for metrics collection via the
+                                system `ioping` utility.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-iostat-extended.rb
 - metrics-ioping.rb
+- metrics-iostat-extended.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -205,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,8 +194,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for io checks
 test_files: []
+has_rdoc: 

metadata.gz.sig

@@ -1 +0,0 @@
-/�w�}�6�k%����S�L��s�/�}�\2�.4��