sensu-plugins-sensu 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a6f59e123f564d0fa00fd5b58a3c8e3a559e33f229a7e1d67acf7385bbe0fa
-  data.tar.gz: a1ea1deef5b7202d7f14e2ed1f27184dffba0a45ddf9112dc3b13451cc7f651d
+  metadata.gz: 9aa75ea723585cc7af3f900c4e22ee869a96e6200469ab098c40a5d8e7eeafa9
+  data.tar.gz: 2dd6b40d04e074df31497dce630d0a74bef06fc848782decefc0a59a73945802
 SHA512:
-  metadata.gz: 2e5df05bc2315148cf07e5e561a91d0c910aaf3d764f6208e8d663aa2248b3271678866e5da478a6187d3e8857c250092bb4095f2c022bf283e389ecc5d49f19
-  data.tar.gz: abcd67c206dc5cb1dd3c7aa544a525378c240f663c55e23b5e089b937d23430facf147d5f5db8c3267a3c875509090e0f13dcb152edc155f6cc2d3a67f74f624
+  metadata.gz: bd8a4fd76eb42ca0efbeab04a7bb73af2f9578ce8ac2af490d8ebb8eecae60b64535299389ee261ca77cf66c5532a06a8b0a126d74f92f4debc2413e30104cd3
+  data.tar.gz: 5ce1de20012311c1eac79c174f636e769ef1e3b43504ed9fecf2e4e1f83cf5288c4732550615555f1457fc5be201c135383bb6e5d5e62825fe00f0a702cf262b

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [2.5.0] - 2018-03-06
+### Changed
+- check-stale-results.rb: support https protocol via api/host declaration
+
 ## [2.4.1] - 2018-01-23
 ### Fixed
 - Removed brackets that were added around `subscribers` in the `trigger_remediation` method in #15. This resulted in a successful submission with an HTTP 202, however as this resulted in the subscribers key being an array of arrays which meant that the remediation never was actually scheduled. This fixes it by doing a couple of things, first we remove the extra brackets therefore solving the problem. That being said I decided to add some additional validation of the data to ensure that minimally what is being passed in is an array and the first element is a string, if that is not the case we either error out when unable to determine a fix with a helpful message or in the case of nested arrays attempt to flatten them. (@drhey) (@majormoses)
@@ -113,6 +117,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.1...HEAD
+[2.5.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.1...2.5.0
 [2.4.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.0...2.4.1
 [2.4.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.1...2.4.0
 [2.3.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.0...2.3.1

data/bin/check-stale-results.rb

@@ -6,6 +6,7 @@
 #
 
 require 'net/http'
+require 'uri'
 require 'sensu-plugin/utils'
 require 'sensu-plugin/check/cli'
 require 'json'
@@ -60,17 +61,25 @@ class CheckStaleResults < Sensu::Plugin::Check::CLI
     end.compact.reverse.join(' ')
   end
 
+  def get_uri(path)
+    protocol = (settings['api']['host'] =~ /^https:\/\// ? 'https' : 'http')
+    host = (protocol == 'https' ? settings['api']['host'][8..-1] : settings['api']['host'])
+    URI("#{protocol}://#{host}:#{settings['api']['port']}#{path}")
+  end
+
   def api_request(method, path)
     unless settings.key?('api')
       raise 'api.json settings not found.'
     end
-    http = Net::HTTP.new(settings['api']['host'], settings['api']['port'])
-    req = net_http_req_class(method).new(path)
-    if settings['api']['user'] && settings['api']['password']
-      req.basic_auth(settings['api']['user'], settings['api']['password'])
+    uri = get_uri(path)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      request = net_http_req_class(method).new(path)
+      if settings['api']['user'] && settings['api']['password']
+        request.basic_auth(settings['api']['user'], settings['api']['password'])
+      end
+      yield(request) if block_given?
+      http.request request # Net::HTTPResponse object
     end
-    yield(req) if block_given?
-    http.request(req)
   end
 
   def results

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

@@ -2,8 +2,8 @@ module SensuPluginsSensu
   # This defines the version of the gem
   module Version
     MAJOR = 2
-    MINOR = 4
-    PATCH = 1
+    MINOR = 5
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-sensu
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for sensu