sensu-plugins-http 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a80fe427bc654ad938c9ef9dd0aac9485778a35
-  data.tar.gz: caf691caa222f28a009329a82a437dd44077d8e0
+  metadata.gz: 6e3afdef217237a86469b5b3c02d9fbea9174cca
+  data.tar.gz: 4af732af7c2f5d722d10f4a8cfff8a23d128c34c
 SHA512:
-  metadata.gz: 67c642ac68ae94fa2e5a322ba53c02f5bc6989fac0dfbfc912ebb587729a193665366270a5437afb059b4728e26c1b06b4e5a98018b0bca0b110cc8c65192f84
-  data.tar.gz: 09446024c1bfaeb932b4c79a72c46fffc6a11af39cb62b99e8f3d7167190c6f42623edab6ad98e2b042a3aee468cd01bc9192482dbbe59e7f887a8bf317f4be5
+  metadata.gz: 0e9d6e5ddf2b72eaf499cc355b536d4913f9e3b4fbb44227553c31c837875afc497b10de1013ebdfdebf398ead1a50e98bf59b5b9499921e73cac0f2688e613c
+  data.tar.gz: 21e5cacdb6206226f04e91027eecd5e0413a04ba1eb9225a83e3e108fcc3caf5d93bdd9d07f5e9daa9d9ffb01c594292e5ef94d561214d9f504e0106268801c4

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.2.0] - 2017-05-31
+### Added
+- `check-http-json`: add --value-greater-than and --value-less-than options (@dave-handy)
+
 ## [2.1.0]
 ### Fixed
 - `check-http-json`: fix error when check fails and --whole-response is enabled (@ushis)
@@ -124,7 +128,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.2.0...HEAD
+[2.2.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.2...2.1.0
 [2.0.2]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.0...2.0.1

data/bin/check-http-json.rb

@@ -5,7 +5,8 @@
 # DESCRIPTION:
 #   Takes either a URL or a combination of host/path/query/port/ssl, and checks
 #   for valid JSON output in the response. Can also optionally validate simple
-#   string key/value pairs.
+#   string key/value pairs, and optionally check if a specified value is within
+#   bounds.
 #
 # OUTPUT:
 #   plain text
@@ -18,7 +19,12 @@
 #   gem: json
 #
 # USAGE:
-#   #YELLOW
+#   Check that will verify http status and JSON validity
+#      ./check-http-json.rb -u http://my.site.com/health.json
+#
+#   Check that will verify http status, JSON validity, and that page.totalElements value is
+#   greater than 10
+#      ./check-http-json.rb -u http://my.site.com/metric.json --key page.totalElements --value-greater-than 10
 #
 # NOTES:
 #   Based on Check HTTP by Sonian Inc.
@@ -56,6 +62,8 @@ class CheckJson < Sensu::Plugin::Check::CLI
   option :timeout, short: '-t SECS', proc: proc(&:to_i), default: 15
   option :key, short: '-K KEY', long: '--key KEY'
   option :value, short: '-v VALUE', long: '--value VALUE'
+  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
 
   def run
@@ -176,9 +184,22 @@ class CheckJson < Sensu::Plugin::Check::CLI
       leaf = deep_value(json, config[:key])
 
       raise "could not find key: #{config[:key]}" if leaf.nil?
-      raise "unexpected value for key: '#{config[:value]}' != '#{leaf}'" unless leaf.to_s == config[:value].to_s
 
-      ok "key has expected value: '#{config[:key]}' = '#{config[:value]}'"
+      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]}'"
+      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]}'"
+      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]}'"
+      end
+
+      ok message
     rescue => e
       critical "key check failed: #{e}"
     end

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

@@ -1,7 +1,7 @@
 module SensuPluginsHttp
   module Version
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin