sensu-plugins-http 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392f38a532bd780ca05f4ba075e4841ced0b9a1c4fac30fcd1c2f7f4273e8750
-  data.tar.gz: f86e70a385942944fc43417256a1d9e62bfe04ee508b108f6280db9e8fab15ba
+  metadata.gz: 2fc8810ca0cb4a83430c6fec61fe2a3566deecce4ccc33171db3d97fcd6bf34b
+  data.tar.gz: b3d8e96a8fc4343291b48597685da546b838ea351815a1b2e953b69346d5d420
 SHA512:
-  metadata.gz: e388a8756c7f593ac7a5a2b32bb2386676ed3e33065e9700578bc147af8d68244b192370fb136d82b905f4beeebba7c890826879421ada2fd064c73ff17f5f22
-  data.tar.gz: 5e16b3a73fb256d5e56f75dd2ca119b5303a82112f4abf92b1e2d2a1269a050fa9b5635082d809f23278fbbf6d150da5ad8eb1aebe5a1164f5a4bfe8ac4ced1c
+  metadata.gz: 29198029e8d5a9f6d7242ed1433336fa134489f403b9eaba0000e9df132ac8e9beebbc1a74098938d783a0a2bafe735ef5996fe8c127025dbb29dd9edcb4c441
+  data.tar.gz: 94b0200a10ab99d668c98491f8f0517001e4c0c672d2ec011712298c59ea3d95ed8e5af00073d7207bf7dac74af6532aacb6f53fde615aeab96e9ead5e115b4a

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [4.1.0] - 2019-02-17
+### Added
+- `check-http.rb`: Add options to set `--open-timeout` and `--read-timeout` for Net:HTTP. Additionally rescue `Net::OpenTimeout` and `Net::ReadTimeout` exception classes (@johanek)
+- `check-http.rb`: exposed `--dns-timeout` for Ruby DNS Resolver. (@johanek)
+
+### Changed
+- `check-http.rb`: switched to using rubies DNS resolver to allow catching DNS failures when Net::HTTP establishes connection. (@johanek)
+
+### Removed
+- removed codeclimate (@tmonk42)
+
 ## [4.0.0] - 2018-12-17
 ### Breaking Changes
 - bumped dependency of `sensu-plugin` to `~> 3.0` (@dependabot) @majormoses
@@ -214,7 +225,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/4.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/4.1.0...HEAD
+[4.1.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/4.0.0...4.1.0
 [4.0.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/3.0.1...4.0.0
 [3.0.1]: https://github.com/sensu-plugins/sensu-plugins-http/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.11.0...3.0.0

data/README.md

@@ -2,8 +2,6 @@
 
 [![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)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-http.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-http)
 
 ## Functionality

data/bin/check-http.rb

@@ -59,6 +59,7 @@ require 'sensu-plugin/check/cli'
 require 'net/http'
 require 'net/https'
 require 'digest'
+require 'resolv-replace'
 
 #
 # Check HTTP
@@ -165,9 +166,27 @@ class CheckHttp < Sensu::Plugin::Check::CLI
          short: '-t SECS',
          long: '--timeout SECS',
          proc: proc(&:to_i),
-         description: 'Set the timeout',
+         description: 'Set the total execution timeout in seconds',
          default: 15
 
+  option :open_timeout,
+         long: '--open-timeout SECS',
+         proc: proc(&:to_i),
+         description: 'Number of seconds to wait for the connection to open',
+         default: 15
+
+  option :read_timeout,
+         long: '--read-timeout SECS',
+         proc: proc(&:to_i),
+         description: 'Number of seconds to wait for one block to be read',
+         default: 15
+
+  option :dns_timeout,
+         long: '--dns-timeout SECS',
+         proc: proc(&:to_f),
+         description: 'Number of seconds to allow for DNS resolution. Accepts decimal number.',
+         default: 0.8
+
   option :redirectok,
          short: '-r',
          boolean: true,
@@ -250,10 +269,20 @@ class CheckHttp < Sensu::Plugin::Check::CLI
       config[:port] ||= config[:ssl] ? 443 : 80
     end
 
+    # Use Ruby DNS Resolver and set DNS resolution timeout to dns_timeout value
+    hosts_resolver = Resolv::Hosts.new
+    dns_resolver = Resolv::DNS.new
+    dns_resolver.timeouts = config[:dns_timeout]
+    Resolv::DefaultResolver.replace_resolvers([hosts_resolver, dns_resolver])
+
     begin
       Timeout.timeout(config[:timeout]) do
         acquire_resource
       end
+    rescue Net::OpenTimeout
+      critical 'Request timed out opening connection'
+    rescue Net::ReadTimeout
+      critical 'Request timed out reading data'
     rescue Timeout::Error
       critical 'Request timed out'
     rescue StandardError => e
@@ -279,8 +308,8 @@ 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.read_timeout = config[:read_timeout]
+    http.open_timeout = config[:open_timeout]
     http.ssl_timeout = config[:timeout]
     http.continue_timeout = config[:timeout]
     http.keep_alive_timeout = config[:timeout]

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

@@ -3,7 +3,7 @@
 module SensuPluginsHttp
   module Version
     MAJOR = 4
-    MINOR = 0
+    MINOR = 1
     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: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -72,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for various http monitors and metrics