sensu-plugins-sensu 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea6a3cda96f3ff8e4b8e6cccc24f93acfff7386
-  data.tar.gz: 29398cd8f33ec212f1e3b348e94994a238d8adde
+  metadata.gz: c0f7c7aa6934af44de715311900e9ab3663ca102
+  data.tar.gz: 2d8836d088e11c69a0ebd9cd319f8ed3960c9a93
 SHA512:
-  metadata.gz: 72af635c76e791b051c415b32d7e87923bcf4a66110cd6b0e8305e4e0b3751faf90caf0143d880a1bf75853ec152e0afb55c05eb177676637173c0f5010b01af
-  data.tar.gz: 3be770e376eac98af320e75dd66ddd82bff48ea1a5b2ed612f456609620e07c784170bdc55c993c487e08e2211a60444a70d4076148c80b47c72db9e365f46f8
+  metadata.gz: 6873fec7d2ad254a5a087f2703d22bd8c3a526acfb6f1ba475ac244b45296af5a648beb5a6ad62941b94daef82ac98301b2599aa127e7fb834e79126a7279f59
+  data.tar.gz: f9dbe703320e5b1550fed23abbb810971a09a6906dfa9a042614f7a866dfc8cc39557a9658160f2ed9fc3ca8c523186964a2a32569c7d01b84a3790b70f92354

data/CHANGELOG.md

@@ -6,6 +6,12 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [2.4.0] - 2017-10-12
+### Added
+- `--debug` Option to display results hash at end of output message.
+### Changed
+- Previously the results hash were always displayed before the message, now they are displayed at the end of the message and only if the `--debug` option is used.
+
 ## [2.3.1] - 2017-10-06
 ### Changed
 - check-stale-results.rb: update the require order for json so that it comes after sensu_plugin (@barryorourke)
@@ -100,6 +106,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.1...HEAD
+[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.1...2.4.0
 [2.3.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.2.2...2.3.0
 [2.2.2]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.2.1...2.2.2

data/bin/check-aggregate.rb

@@ -130,6 +130,13 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :debug,
+         short: '-D',
+         long: '--debug',
+         description: 'Display results hash at end of output message',
+         boolean: true,
+         default: false
+
   option :stale_percentage,
          long: '--stale-percentage PERCENT',
          description: 'PERCENT stale before warning',
@@ -228,7 +235,9 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
     message = config[:message] || 'Number of non-zero results exceeds threshold'
     message += ' (%d%% %s)'
     message += "\n" + aggregate[:outputs] if aggregate[:outputs]
-
+    if config[:debug]
+      message += "\n" + aggregate.to_s
+    end
     if config[:ignore_severity]
       percent_non_zero = (100 - (aggregate[:ok].to_f / aggregate[:total].to_f) * 100).to_i
       if config[:critical] && percent_non_zero >= config[:critical]
@@ -251,6 +260,9 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
     regex = Regexp.new(config[:pattern])
     mappings = {}
     message = config[:message] || 'One of these is not like the others!'
+    if config[:debug]
+      message += "\n" + aggregate.to_s
+    end
     aggregate[:outputs].each do |output, _count|
       matched = regex.match(output.to_s)
       unless matched.nil?
@@ -270,7 +282,9 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
     message = config[:message] || 'Number of nodes down exceeds threshold'
     message += " (%s out of #{aggregate[:total]} nodes reporting %s)"
     message += "\n" + aggregate[:outputs] if aggregate[:outputs]
-
+    if config[:debug]
+      message += "\n" + aggregate.to_s
+    end
     if config[:ignore_severity]
       number_of_nodes_reporting_down = aggregate[:total].to_i - aggregate[:ok].to_i
       if config[:critical_count] && number_of_nodes_reporting_down >= config[:critical_count]
@@ -315,13 +329,16 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
 
     aggregate = acquire_aggregate
     aggregate = honor_stash(aggregate) if config[:honor_stash]
-    puts aggregate
     aggregate = collect_output(aggregate) if config[:collect_output]
     compare_thresholds(aggregate) if threshold
     compare_pattern(aggregate) if pattern
     compare_thresholds_count(aggregate) if threshold_count
     compare_stale(aggregate) if config[:stale_percentage] || config[:stale_count]
 
-    ok 'Aggregate looks GOOD'
+    if config[:debug]
+      ok "Aggregate looks GOOD\n" + aggregate.to_s
+    else
+      ok 'Aggregate looks Good'
+    end
   end
 end

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

@@ -2,8 +2,8 @@ module SensuPluginsSensu
   # This defines the version of the gem
   module Version
     MAJOR = 2
-    MINOR = 3
-    PATCH = 1
+    MINOR = 4
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-sensu
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: english
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for sensu