sensu-plugins-http 0.4.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGFlZjZlODVjOGQxY2QxZDE5MGU3ZDg2Y2EzZTIwMDA4MDc0MDE1NQ==
+    YmE4MDg5NjNjNGJlYzEyZDgxNDJhNTc1NjM0YjAxYWViMzEyYTEzZQ==
   data.tar.gz: !binary |-
-    NDZiNWRiOWM5YjM0MWQ4MzJmMzQ5OTVlODA5MDU4NTczMTE0MzM1ZQ==
+    ODFhOTk2M2JmYTdlZmIzNWViNDY4ZmViNDM3ZTQxNzE4ZDM4OGM2MA==
 SHA512:
   metadata.gz: !binary |-
-    NGQzZTIyNDY2Zjg1MDcxNTFhYTBjZjc1NzIyNzFjMGZiMzg1ZTYzN2YzODI5
-    NzBiZDBkZDAzMzFiMjc0ZjMwYWYxYmNmZDAzZWVlOTMyNWI4MTViNjUyNjdl
-    OWIyZTNhNDIzYTY0OTk4MWZkNmJhY2RhY2IyZjBhM2Y2MjQ1ODQ=
+    NDEzYjgzNDJhNTYxMDhjMDMzZThmNjllZGY2ZWZiNTUxNGE4YzZjYmZiMWUy
+    MjE5OWMwMGI1M2IwZGQxYTM5MzIyYWFhNzQ4OTdjMzc3YWRhMjY0NDlmOTQ3
+    YmY3MGY3YzkyZGNjZDk0ZmU5ZTNiNTE3Yjc1MjEwOGQ3NWIyZGQ=
   data.tar.gz: !binary |-
-    ZTgxOGViMTYzZmNiOTcyMGQ1MjIxMjIxZDc3NjhiYzM4OGY3Zjg4NzMwOTJj
-    NTYyN2FmZjQ5MWVjY2ZiMDZjYzg5OGM2MDdjMDg4NTcyMzliOWM0NTNkNmY5
-    YjI2OWE4NWRlMzBiNGY3NDYyMDgwOGFlMzIxMTEzYWNiNThhMWI=
+    ZTNkZjgwNjcwOTVhNzk2Y2U4YzcwNzU2ZjNhOGEyYmE0M2FjZWI1YjYzNWU0
+    ODc3NDVlYzdjYTIzZTFhNWQ3MDI0MWFjNzdkNGQyMzMyZTljOTk4ZGJmYmU2
+    ZmY1YThjNGI5YWU2NDc4NGM3ODg1NWVlMjY3YjJmMjA1YjA5YjY=

data/CHANGELOG.md

@@ -5,9 +5,29 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.0.0] - 2016-01-27
+### Fixed
+- Don't send basic auth when no password is supplied
+- Add default thresholds to check-https-cert.rb
+- check-http: fix default port selection for https
+
+### Added
+- Add `rest-client` dependency for `metrics-http-json`
+- Add `check-head-redirect` that checks that redirection links can be followed in a set number of requests
+- Add `check-http-cors` that checks CORS headers
+- check-http-json: add `cert-key` parameter to allow specifying a separate cert file
+- Add `--negquery` to `check-http.rb` for query text that should not exist
+
+### Removed
+- Support for Ruby 1.9.3
+
+### Changed
+- Upgrade to Rubocop 0.40 and cleanup
+- Pin to `json < 2.0.0` to workaround test failures on Ruby 2.3.0
+
 ## [0.4.0] - 2016-04-26
 ### Changed
-- Rename http-json-graphite -> metrics-json-graphite 
+- Rename http-json-graphite -> metrics-json-graphite
 
 ## [0.3.0] - 2016-04-08
 ### Added
@@ -68,7 +88,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/0.4.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/0.4.0...1.0.0
 [0.4.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/0.3.0...0.4.0
 [0.3.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/0.2.1...0.3.0
 [0.2.1]: https://github.com/sensu-plugins/sensu-plugins-http/compare/0.2.0...0.2.1

data/README.md

@@ -14,10 +14,17 @@
  * bin/check-https-cert.rb
  * bin/check-last-modified.rb
  * bin/metrics-curl.rb
+ * bin/metrics-http-json.rb
  * bin/metrics-http-json-deep.rb
+ * bin/check-head-redirect.rb
+ * bin/check-http-cors.rb
 
 ## Usage
 
+check-head-redirect.rb and check-last-modified.rb can be used in conjunction with AWS to pull configuration from a specific bucket and file.
+
+This is helpful if you do not want to configure connection information as an argument to the sensu checks. If a bucket and key are specified that the environment the sensu check executes in has access to, or you provide an AWS key and token, the checks will pull the specified JSON file from S3 and merge the JSON config in to the current check configuration.
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/check-head-redirect.rb

@@ -0,0 +1,149 @@
+#!/usr/bin/env ruby
+#
+#   check-head-redirect
+#
+# DESCRIPTION:
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Leon Gibat <brendan.gibat@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+require 'sensu-plugin/check/cli'
+require 'net/https'
+require 'time'
+require 'aws-sdk'
+require 'json'
+require 'sensu-plugins-http'
+
+#
+# Checks that redirection links can be followed in a set number of requests.
+#
+class CheckHeadRedirect < Sensu::Plugin::Check::CLI
+  include Common
+  option :aws_access_key_id,
+         short:       '-a AWS_ACCESS_KEY_ID',
+         long:        '--aws-access-key-id AWS_ACCESS_KEY_ID',
+         description: 'AWS Access Key. Either set ENV["AWS_ACCESS_KEY_ID"] or provide it as an option',
+         default:     ENV['AWS_ACCESS_KEY_ID']
+
+  option :aws_secret_access_key,
+         short:       '-k AWS_SECRET_ACCESS_KEY',
+         long:        '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
+         description: 'AWS Secret Access Key. Either set ENV["AWS_SECRET_ACCESS_KEY"] or provide it as an option',
+         default:     ENV['AWS_SECRET_ACCESS_KEY']
+
+  option :aws_region,
+         short:       '-r AWS_REGION',
+         long:        '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1)',
+         default:     'us-east-1'
+
+  option :s3_config_bucket,
+         short:       '-s S3_CONFIG_BUCKET',
+         long:        '--s3-config-bucket S3_CONFIG_BUCKET',
+         description: 'S3 config bucket'
+
+  option :s3_config_key,
+         short:       '-k S3_CONFIG_KEY',
+         long:        '--s3-config-key S3_CONFIG_KEY',
+         description: 'S3 config key'
+
+  option :url,
+         short: '-u URL',
+         long: '--url URL',
+         description: 'The URL of the file to be checked'
+
+  option :user,
+         short: '-U USER',
+         long: '--username USER',
+         description: 'A username to connect as'
+
+  option :password,
+         short: '-a PASS',
+         long: '--password PASS',
+         description: 'A password to use for the username'
+
+  option :follow_redirects,
+         short: '-R FOLLOW_REDIRECTS',
+         long: '--redirect FOLLOW_REDIRECTS',
+         proc: proc(&:to_i),
+         default: 0,
+         description: 'Follow first <N> redirects'
+
+  option :follow_redirects_with_get,
+         short: '-g GET_REDIRECTS',
+         long: '--get-redirects GET_REDIRECTS',
+         proc: proc(&:to_i),
+         default: 0,
+         description: 'Follow first <N> redirects with GET requests'
+
+  option :auth_first_only,
+         short: '-A',
+         long: '--auth-first-only',
+         default: true,
+         description: 'Use basic auth on first request only'
+
+  def follow_uri(uri, total_redirects, get_redirects, auth_count)
+    location = URI(uri)
+    http = Net::HTTP.new(location.host, location.port)
+
+    if location.port == 443
+      http.use_ssl = true
+    end
+
+    request = if get_redirects > 0
+                Net::HTTP::Get.new(location.request_uri)
+              else
+                Net::HTTP::Head.new(location.request_uri)
+              end
+
+    if auth_count > 0 && config[:user] && config[:password] && total_redirects == config[:follow_redirects]
+      http.use_ssl = true
+      request.basic_auth(config[:user], config[:password])
+      auth_count -= 1
+    end
+
+    response = http.request(request)
+    if total_redirects > 0
+      case response
+      when Net::HTTPSuccess     then ok
+      when Net::HTTPRedirection then follow_uri(response['location'], total_redirects - 1, get_redirects - 1, auth_count)
+      else
+        critical 'Http Error'
+      end
+    else
+      case response
+      when Net::HTTPSuccess then ok
+      else
+        critical 'Http Error'
+      end
+    end
+  end
+
+  def run
+    merge_s3_config
+
+    url = config[:url]
+
+    # Validate arguments
+    unless url
+      unknown 'No URL specified'
+    end
+
+    follow_uri(url, config[:follow_redirects], config[:follow_redirects_with_get], config[:auth_first_only] ? 1 : config[:follow_redirects])
+  end
+end

data/bin/check-http-cors.rb

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+#
+#   check-http-cors
+#
+# 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.
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: json
+#   gem: net/http
+#
+# USAGE:
+#   #YELLOW
+#
+# EXAMPLE:
+#   # simple key access
+#     $ ruby plugins/http/check-http-json.rb -u https://example.com/cors_resource -O "Origin:http://dummy"
+#
+# NOTES:
+#   Based on Check HTTP by Sonian Inc.
+#
+# LICENSE:
+#   Copyright 2015 Alexander Paz <alexjpaz@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'sensu-plugin/check/cli'
+require 'json'
+require 'net/http'
+require 'net/https'
+
+class CheckCORS < Sensu::Plugin::Check::CLI
+  option :url, short: '-u URL'
+  option :host, short: '-h HOST'
+  option :path, short: '-p PATH'
+  option :query, short: '-q QUERY'
+  option :port, short: '-P PORT', proc: proc(&:to_i)
+  option :header, short: '-H HEADER', long: '--header HEADER'
+  option :ssl, short: '-s', boolean: true, default: false
+  option :insecure, short: '-k', boolean: true, default: false
+  option :user, short: '-U', long: '--username USER'
+  option :password, short: '-a', long: '--password PASS'
+  option :cert, short: '-c FILE'
+  option :cacert, short: '-C FILE'
+  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'
+
+  def run
+    if config[:url]
+      uri = URI.parse(config[:url])
+      config[:host] = uri.host
+      config[:path] = uri.path
+      config[:query] = uri.query
+      config[:port] = uri.port
+      config[:ssl] = uri.scheme == 'https'
+    else
+      # #YELLOW
+      unless config[:host] && config[:path]
+        unknown 'No URL specified'
+      end
+      config[:port] ||= config[:ssl] ? 443 : 80
+    end
+
+    begin
+      timeout(config[:timeout]) do
+        acquire_resource
+      end
+    rescue Timeout::Error
+      critical 'Connection timed out'
+    rescue => e
+      critical "Connection error: #{e.message}"
+    end
+  end
+
+  def cors?(res)
+    headers = {}
+
+    if config[:header]
+      config[:header].split(',').each do |header|
+        h, v = header.split(':', 2)
+        headers[h] = v.strip
+      end
+    end
+
+    res['Access-Control-Allow-Origin'] == headers['Origin']
+  end
+
+  def acquire_resource
+    res = request_http
+
+    case res.code
+    when /^2/
+      if cors?(res)
+        ok 'Request has matching CORS headers'
+      else
+        critical 'Response does not have valid CORS headers'
+      end
+    else
+      critical res.code
+    end
+  end
+
+  def request_http
+    http = Net::HTTP.new(config[:host], config[:port])
+
+    if config[:ssl]
+      http.use_ssl = true
+      if config[:cert]
+        cert_data = File.read(config[:cert])
+        http.cert = OpenSSL::X509::Certificate.new(cert_data)
+        http.key = OpenSSL::PKey::RSA.new(cert_data, nil)
+      end
+      http.ca_file = config[:cacert] if config[:cacert]
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if config[:insecure]
+    end
+
+    req = Net::HTTP::Get.new([config[:path], config[:query]].compact.join('?'))
+    unless config[:user].nil? && config[:password].nil?
+      req.basic_auth config[:user], config[:password]
+    end
+
+    if config[:header]
+      config[:header].split(',').each do |header|
+        h, v = header.split(':', 2)
+        req[h] = v.strip
+      end
+    end
+
+    http.request(req)
+  end
+end

data/bin/check-http-json.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 #
 #   check-http-json
 #
@@ -50,8 +50,9 @@ class CheckJson < Sensu::Plugin::Check::CLI
   option :insecure, short: '-k', boolean: true, default: false
   option :user, short: '-U', long: '--username USER'
   option :password, short: '-a', long: '--password PASS'
-  option :cert, short: '-c FILE'
-  option :cacert, short: '-C FILE'
+  option :cert, short: '-c FILE', long: '--cert FILE'
+  option :certkey, long: '--cert-key FILE'
+  option :cacert, short: '-C FILE', long: '--cacert FILE'
   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'
@@ -98,6 +99,9 @@ class CheckJson < Sensu::Plugin::Check::CLI
       if config[:cert]
         cert_data = File.read(config[:cert])
         http.cert = OpenSSL::X509::Certificate.new(cert_data)
+        if config[:certkey]
+          cert_data = File.read(config[:certkey])
+        end
         http.key = OpenSSL::PKey::RSA.new(cert_data, nil)
       end
       http.ca_file = config[:cacert] if config[:cacert]
@@ -113,7 +117,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
       post_body = IO.readlines(config[:postbody])
       req.body = post_body.join
     end
-    if !config[:user].nil? && !config[:password].nil?
+    unless config[:user].nil? && config[:password].nil?
       req.basic_auth config[:user], config[:password]
     end
     if config[:header]

data/bin/check-http.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 #
 #   check-http
 #
@@ -67,8 +67,7 @@ class CheckHttp < Sensu::Plugin::Check::CLI
          short: '-P PORT',
          long: '--port PORT',
          proc: proc(&:to_i),
-         description: 'Select another port',
-         default: 80
+         description: 'Select another port'
 
   option :request_uri,
          short: '-p PATH',
@@ -133,7 +132,12 @@ class CheckHttp < Sensu::Plugin::Check::CLI
   option :pattern,
          short: '-q PAT',
          long: '--query PAT',
-         description: 'Query for a specific pattern'
+         description: 'Query for a specific pattern that must exist'
+
+  option :negpattern,
+         short: '-n PAT',
+         long: '--negquery PAT',
+         description: 'Query for a specific pattern that must be absent'
 
   option :timeout,
          short: '-t SECS',
@@ -229,6 +233,8 @@ class CheckHttp < Sensu::Plugin::Check::CLI
     http.read_timeout = config[:timeout]
     http.open_timeout = config[:timeout]
     http.ssl_timeout = config[:timeout]
+    http.continue_timeout = config[:timeout]
+    http.keep_alive_timeout = config[:timeout]
 
     warn_cert_expire = nil
     if config[:ssl]
@@ -261,7 +267,7 @@ class CheckHttp < Sensu::Plugin::Check::CLI
             Net::HTTP::Post.new(config[:request_uri], 'User-Agent' => config[:ua])
           end
 
-    if !config[:user].nil? && !config[:password].nil?
+    unless config[:user].nil? && config[:password].nil?
       req.basic_auth config[:user], config[:password]
     end
     if config[:header]
@@ -294,6 +300,10 @@ class CheckHttp < Sensu::Plugin::Check::CLI
 
     size = res.body.nil? ? '0' : res.body.size
 
+    handle_response(res, size, body)
+  end
+
+  def handle_response(res, size, body)
     case res.code
     when /^2/
       if config[:redirectto]
@@ -304,6 +314,12 @@ class CheckHttp < Sensu::Plugin::Check::CLI
         else
           critical "#{res.code}, did not find /#{config[:pattern]}/ in #{size} bytes: #{res.body[0...200]}..."
         end
+      elsif config[:negpattern]
+        if res.body =~ /#{config[:negpattern]}/
+          critical "#{res.code}, found /#{config[:negpattern]}/ in #{size} bytes: #{res.body[0...200]}..."
+        else
+          ok "#{res.code}, did not find /#{config[:negpattern]}/ in #{size} bytes" + body
+        end
       else
         ok("#{res.code}, #{size} bytes" + body) unless config[:response_code]
       end

data/bin/check-https-cert.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 #
 #   check-https-cert
 #
@@ -44,12 +44,14 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
          short: '-w',
          long: '--warning DAYS',
          proc: proc(&:to_i),
+         default: 50,
          description: 'Warn EXPIRE days before cert expires'
 
   option :critical,
          short: '-c',
          long: '--critical DAYS',
          proc: proc(&:to_i),
+         default: 25,
          description: 'Critical EXPIRE days before cert expires'
 
   option :insecure,

data/bin/check-last-modified.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 #
 #   check-fleet-units
 #
@@ -25,12 +25,44 @@
 require 'sensu-plugin/check/cli'
 require 'net/https'
 require 'time'
+require 'aws-sdk'
+require 'json'
+require 'sensu-plugins-http'
 
 #
-# Checks the last modified time of a file to verify it has been updated within a
+# Checks the last modified time of a file to verify it has been updated with a
 # specified threshold.
 #
 class CheckLastModified < Sensu::Plugin::Check::CLI
+  include Common
+  option :aws_access_key_id,
+         short:       '-a AWS_ACCESS_KEY_ID',
+         long:        '--aws-access-key-id AWS_ACCESS_KEY_ID',
+         description: 'AWS Access Key. Either set ENV["AWS_ACCESS_KEY_ID"] or provide it as an option',
+         default:     ENV['AWS_ACCESS_KEY_ID']
+
+  option :aws_secret_access_key,
+         short:       '-k AWS_SECRET_KEY',
+         long:        '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
+         description: 'AWS Secret Access Key. Either set ENV["AWS_SECRET_ACCESS_KEY"] or provide it as an option',
+         default:     ENV['AWS_SECRET_ACCESS_KEY']
+
+  option :aws_region,
+         short:       '-r AWS_REGION',
+         long:        '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default:     'us-east-1'
+
+  option :s3_config_bucket,
+         short:       '-s S3_CONFIG_BUCKET',
+         long:        '--s3-config-bucket S3_CONFIG_BUCKET',
+         description: 'S3 config bucket'
+
+  option :s3_config_key,
+         short:       '-k S3_CONFIG_KEY',
+         long:        '--s3-config-key S3_CONFIG_KEY',
+         description: 'S3 config key'
+
   option :url,
          short: '-u URL',
          long: '--url URL',
@@ -51,11 +83,69 @@ class CheckLastModified < Sensu::Plugin::Check::CLI
          long: '--time TIME',
          description: 'The time in seconds the file should be updated by'
 
+  option :follow_redirects,
+         short: '-R FOLLOW_REDIRECTS',
+         long: '--redirect FOLLOW_REDIRECTS',
+         proc: proc(&:to_i),
+         default: 0,
+         description: 'Follow first <N> redirects'
+
+  option :follow_redirects_with_get,
+         short: '-g GET_REDIRECTS',
+         long: '--get-redirects GET_REDIRECTS',
+         proc: proc(&:to_i),
+         default: 0,
+         description: 'Follow first <N> redirects with GET requests'
+
+  option :auth_first_only,
+         short: '-A',
+         long: '--auth-first-only',
+         default: true,
+         description: 'Use basic auth on first request only'
+
+  def follow_uri(uri, total_redirects, get_redirects, auth_count)
+    location = URI(uri)
+    http = Net::HTTP.new(location.host, location.port)
+
+    if location.port == 443
+      http.use_ssl = true
+    end
+
+    request = if get_redirects > 0
+                Net::HTTP::Get.new(location.request_uri)
+              else
+                Net::HTTP::Head.new(location.request_uri)
+              end
+
+    if auth_count > 0 && config[:user] && config[:password] && total_redirects == config[:follow_redirects]
+      http.use_ssl = true
+      request.basic_auth(config[:user], config[:password])
+      auth_count -= 1
+    end
+
+    response = http.request(request)
+
+    if total_redirects > 0
+      case response
+      when Net::HTTPSuccess     then response
+      when Net::HTTPRedirection then follow_uri(response['location'], total_redirects - 1, get_redirects - 1, auth_count)
+      else
+        critical 'Http Error'
+      end
+    else
+      case response
+      when Net::HTTPSuccess then response
+      else
+        critical 'Http Error'
+      end
+    end
+  end
+
   def run
-    cli = CheckLastModified.new
-    cli.parse_options
-    url = cli.config[:url]
-    threshold = cli.config[:threshold]
+    merge_s3_config
+
+    url = config[:url]
+    threshold = config[:threshold]
 
     # Validate arguments
     unless url
@@ -66,18 +156,9 @@ class CheckLastModified < Sensu::Plugin::Check::CLI
       unknown 'No threshold specified'
     end
 
-    # Build a request from user options and then request it
-    uri = URI(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Head.new(uri.request_uri)
-
-    if cli.config[:user] && cli.config[:password]
-      http.use_ssl = true
-      request.basic_auth(cli.config[:user], cli.config[:password])
-    end
-
-    response = http.request(request)
+    response = follow_uri(url, config[:follow_redirects], config[:follow_redirects_with_get], config[:auth_first_only] ? 1 : config[:follow_redirects])
 
+    # Build a request from user options and then request it
     if response.header['last-modified'].nil?
       critical 'Http Error'
     end

data/bin/metrics-curl.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 #
 #   metrics-curl
 #

data/lib/sensu-plugins-http.rb

@@ -1 +1,2 @@
 require 'sensu-plugins-http/version'
+require 'sensu-plugins-http/common'

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

@@ -0,0 +1,32 @@
+
+module Common
+  def initialize
+    super()
+    aws_config
+  end
+
+  def aws_config
+    Aws.config.update(
+      credentials: Aws::Credentials.new(config[:aws_access_key_id], config[:aws_secret_access_key])
+    ) if config[:aws_access_key_id] && config[:aws_secret_access_key]
+
+    Aws.config.update(
+      region: config[:aws_region]
+    )
+  end
+
+  def merge_s3_config
+    return if config[:s3_config_bucket].nil? || config[:s3_config_key].nil?
+
+    aws_config
+
+    s3 = Aws::S3::Client.new
+    begin
+      resp = s3.get_object(bucket: config[:s3_config_bucket], key: config[:s3_config_key])
+      s3_config = JSON.parse(resp.body.read, symbolize_names: true)
+      config.merge!(s3_config)
+    rescue
+      critical 'Error getting config file from s3'
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module SensuPluginsHttp
   module Version
-    MAJOR = 0
-    MINOR = 4
+    MAJOR = 1
+    MINOR = 0
     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: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -24,6 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +234,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: ! "This plugin provides native HTTP instrumentation\n                              for
   monitoring and metrics collection, including:\n                              response
   code, JSON response, HTTP last modified,\n                              SSL expiry,
@@ -217,6 +259,8 @@ executables:
 - metrics-curl.rb
 - check-last-modified.rb
 - check-https-cert.rb
+- check-http-cors.rb
+- check-head-redirect.rb
 - metrics-http-json.rb
 - check-http.rb
 extensions: []
@@ -225,6 +269,8 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/check-head-redirect.rb
+- bin/check-http-cors.rb
 - bin/check-http-json.rb
 - bin/check-http.rb
 - bin/check-https-cert.rb
@@ -233,6 +279,7 @@ files:
 - bin/metrics-http-json-deep.rb
 - bin/metrics-http-json.rb
 - lib/sensu-plugins-http.rb
+- lib/sensu-plugins-http/common.rb
 - lib/sensu-plugins-http/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-http
 licenses:
@@ -252,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='