sensu-plugins-http 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576cbe4ae1e4dcc1a7864d575ec1172c03623b16aae6921a6f0943a78604bf1e
-  data.tar.gz: a13b3c64d956fde1b9282eb7e2a8e0836f0d76b29d7946148e66ac38872f0cc4
+  metadata.gz: 88ff01536d3762c191dbaa90aebc957dc204a196cb09426e906f3b3382217e13
+  data.tar.gz: c4dfe411edd79a341a79db744ce95473d82fdb9b831690b165553ec9e0586cf0
 SHA512:
-  metadata.gz: bc086183391592a1076abc83971c8e7f115b51228452c8b7e85619301bf4dc41e67b84f7001a66d2c039623865cd782c7b5e4e9ff4a9817612ddfda19a707631
-  data.tar.gz: 2310241cd60b8586ec0c4857a244fa1cd34dbbb8883f661c69746b592f7c4b708e31ee6e122001f41d6652d352228cdd2a0c721c48e49535f49c6a8f7c900be3
+  metadata.gz: ea9038170f563bf80d25dda0ee53e59a8daf143e73147d523b74f3f64858d1474fdbeea64f8f6a423e5e865d3dc749f8b6b5a382e954c3b29c60d7ae6b8cbe22
+  data.tar.gz: da62f1a6be047b11e8bed39366b649439a99d8152e7b786ec9cd9b512277a1389ae67df552453858eb545f0f1ee15261220c85cd46b01f8239f5a0833a57d26c

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.8.0] 2018-02-17
+### Added
+- Add new options `--dump-json` to dump json response on failure when enable. default: false (@jplindquist)
+- Add new `--pretty` option for pretty format json response when `--dump-json` is enabled. default: false (@jplindquist)
+
 ## [2.7.0] - 2018-02-15
 ### Added
 - `check-http`: Added ability to use username and password in proxy url (@mclarkson)
@@ -158,7 +163,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.7.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.8.0...HEAD
+[2.8.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.7.0...2.8.0
 [2.7.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.6.0...2.7.0
 [2.6.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.5.0...2.6.0
 [2.5.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.4.0...2.5.0

data/bin/check-http-json.rb

@@ -65,6 +65,8 @@ class CheckJson < Sensu::Plugin::Check::CLI
   option :valueGt, long: '--value-greater-than VALUE'
   option :valueLt, long: '--value-less-than VALUE'
   option :whole_response, short: '-w', long: '--whole-response', boolean: true, default: false
+  option :dump_json, short: '-d', long: '--dump-json', boolean: true, default: false
+  option :pretty, long: '--pretty', boolean: true, default: false
 
   def run
     if config[:url]
@@ -188,20 +190,26 @@ class CheckJson < Sensu::Plugin::Check::CLI
       message = "key has expected value: '#{config[:key]}' "
       if config[:value]
         raise "unexpected value for key: '#{leaf}' != '#{config[:value]}'" unless leaf.to_s == config[:value].to_s
-        message += " equals '#{config[:value]}'"
+        message += "equals '#{config[:value]}'"
       end
       if config[:valueGt]
         raise "unexpected value for key: '#{leaf}' not > '#{config[:valueGt]}'" unless leaf.to_f > config[:valueGt].to_f
-        message += " greater than '#{config[:valueGt]}'"
+        message += "greater than '#{config[:valueGt]}'"
       end
       if config[:valueLt]
         raise "unexpected value for key: '#{leaf}' not < '#{config[:valueLt]}'" unless leaf.to_f < config[:valueLt].to_f
-        message += " less than '#{config[:valueLt]}'"
+        message += "less than '#{config[:valueLt]}'"
       end
 
       ok message
     rescue => e
-      critical "key check failed: #{e}"
+      if config[:dump_json]
+        json_response = config[:pretty] ? JSON.pretty_generate(json) : json
+        message = "key check failed: #{e}. Response: #{json_response}"
+      else
+        message = "key check failed: #{e}"
+      end
+      critical message
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsHttp
   module Version
     MAJOR = 2
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-http
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -94,6 +94,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: kitchen-vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +240,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for various http monitors and metrics