sensu-plugins-http 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74cf923574f7d54c3d5e4107d83f559a542462f
-  data.tar.gz: 9b7d3cd3fe681f5111e64d9b7687b0820aee6b77
+  metadata.gz: 4a2fddf58bbc4f5e5bb4ee8cb87fe585adc4bf91
+  data.tar.gz: ae1a525f5078688b79bc1779961467387eed9a8e
 SHA512:
-  metadata.gz: 61bd97f89e22508e3105db509d307811049a714185d498be6883e9a0fc1ce26d8bc2c8c1d2eb5a0e9ef2ca06799fc6fc591e13bb66b214270a517a39c9032abd
-  data.tar.gz: b7f3853e07aaf80b37ed4e4652e3fc4220791ad5e00f82eb31c461f0c5dd01a6d1838ceb3512dd583b523f9e16f972846cb559026f515c78eb0891451e78499f
+  metadata.gz: 98ac5d741959215edc5a1d074f7d7d466e42c5128c6f3b536bb112c592440233ab5bfb80ac40099fee191536cf04f8f4581d2cf4f2f6ea17595cfe0235acc271
+  data.tar.gz: 245a69230dcd50d7c1b566bf9a6349b456c20236b660f569891b3ac38e09a9e8a81bb0dbed8fd5aa9bc1343e707bd97b79e6496f08849f1c5ab9ed253899884c

data.tar.gz.sig

@@ -1 +1,2 @@
-�0���>Ɽ@<ؼ
+F�%$�7��ހ�@����n����.U�?M3�����]W��bN8��}l�N�&��_p�]�ь#^.)����-wM��E�h�YL����I�@
+�7��3���ҫ~�br�JR}�4��yS�6�"I���v�,h�uX�oHWa֣X�Lv���cH�WƐ��	�&`f3�͝��ۘÐ
�D�2�@Z�E���A�!md�F�c��M5���M4���ՙk΂����G肞�s���XM����ѽ�D

data/CHANGELOG.md

@@ -6,7 +6,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ## Unreleased
 - nothing
 
-## 0.2.0 - 2015-07-30
+## 0.2.0 - 2015-11-17
+
+### Fixed
+- check-http.rb will no longer fail if the plugin timeout is longer than the net/http default timeout
+- check-http-json.rb will no longer fail when comparing strings
 
 ### Changed
 - updated Rubocop to `0.32.1`
@@ -15,6 +19,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ### Added
 - Added a check for last modified time in HTTP headers
+- POST mode for check-http-json.rb
+- Output a message when check-https-cert.rb cannot establish a connection
+- insecure option for check-https-cert.rb to skip SSL cert check
 
 ## [0.1.1] - 2015-07-14
 ### Changed

data/README.md

@@ -1,6 +1,6 @@
 ## Sensu-Plugins-http
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-http.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-http)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-http.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-http)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-http.svg)](http://badge.fury.io/rb/sensu-plugins-http)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-http/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-http)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-http/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-http)

data/bin/check-http-json.rb

@@ -43,6 +43,8 @@ class CheckJson < Sensu::Plugin::Check::CLI
   option :path, short: '-p PATH'
   option :query, short: '-q QUERY'
   option :port, short: '-P PORT', proc: proc(&:to_i)
+  option :method, short: '-m GET|POST'
+  option :postbody, short: '-b /file/with/post/body'
   option :header, short: '-H HEADER', long: '--header HEADER'
   option :ssl, short: '-s', boolean: true, default: false
   option :insecure, short: '-k', boolean: true, default: false
@@ -88,7 +90,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
     return false
   end
 
-  def acquire_resource # rubocop:disable all
+  def acquire_resource
     http = Net::HTTP.new(config[:host], config[:port])
 
     if config[:ssl]
@@ -102,7 +104,15 @@ class CheckJson < Sensu::Plugin::Check::CLI
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if config[:insecure]
     end
 
-    req = Net::HTTP::Get.new([config[:path], config[:query]].compact.join('?'))
+    if config[:method] == 'POST'
+      req = Net::HTTP::Post.new([config[:path], config[:query]].compact.join('?'))
+    else
+      req = Net::HTTP::Get.new([config[:path], config[:query]].compact.join('?'))
+    end
+    if config[:postbody]
+      post_body = IO.readlines(config[:postbody])
+      req.body = post_body.join
+    end
     if !config[:user].nil? && !config[:password].nil?
       req.basic_auth config[:user], config[:password]
     end
@@ -128,7 +138,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
         tree[key]
       end
 
-      fail "unexpected value for key: '#{config[:value]}' != '#{leaf}'" unless leaf == config[:value]
+      fail "unexpected value for key: '#{config[:value]}' != '#{leaf}'" unless leaf.to_s == config[:value].to_s
 
       ok "key has expected value: '#{config[:key]}' = '#{config[:value]}'"
     rescue => e

data/bin/check-http.rb

@@ -190,7 +190,7 @@ class CheckHttp < Sensu::Plugin::Check::CLI
     end
   end
 
-  def acquire_resource # rubocop:disable all
+  def acquire_resource
     http = nil
 
     if config[:no_proxy]
@@ -201,6 +201,9 @@ class CheckHttp < Sensu::Plugin::Check::CLI
     else
       http = Net::HTTP.new(config[:host], config[:port])
     end
+    http.read_timeout = config[:timeout]
+    http.open_timeout = config[:timeout]
+    http.ssl_timeout = config[:timeout]
 
     warn_cert_expire = nil
     if config[:ssl]

data/bin/check-https-cert.rb

@@ -14,7 +14,7 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
-#   gem: nrt-https
+#   gem: net-https
 #
 # USAGE:
 #   #YELLOW
@@ -52,11 +52,21 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          description: 'Critical EXPIRE days before cert expires'
 
+  option :insecure,
+         short: '-k',
+         boolean: true,
+         description: 'Enabling insecure connections',
+         default: false
+
   def run
     uri = URI.parse(config[:url])
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    if config[:insecure]
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    else
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
 
     http.start do |h|
       @cert = h.peer_cert
@@ -74,7 +84,6 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
     end
 
   rescue
-    message "Could not connect to #{config[:url]}"
-    exit 1
+    critical "Could not connect to #{config[:url]}"
   end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-http
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -172,7 +172,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Sensu plugins for various http monitors and metrics
+description: |-
+  This plugin provides native HTTP instrumentation
+                                for monitoring and metrics collection, including:
+                                response code, JSON response, HTTP last modified,
+                                SSL expiry, and metrics via `curl`.
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-curl.rb
@@ -219,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for various http monitors and metrics