sensu-plugins-elasticsearch 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bac51cd8c7087847206136cf0c775a995ae95be
-  data.tar.gz: d8968b335e2cfbfda858281ebee5b30bb9d72374
+  metadata.gz: 9b4b7956d75fed10e2ec31b024102d037cb8e43f
+  data.tar.gz: 11881f4536d042ec379c0fb92f641cf370628da7
 SHA512:
-  metadata.gz: 714b0b5e018601d25a90909aab4530a476691ac24d549b6aaab17496841487c55ef5514b292bfb06ce6b0d49e999b0a975a2f5ccd1c43d2187716867e0223658
-  data.tar.gz: 50e843b6bb4479014f4ac9d3f6259eea4c3f149262e262e63022e21ee27c45ba96ab12ddcc6d129f73d1071830a6bde0bd0f434bdd72329e856536abb63d94a1
+  metadata.gz: 91e3c7d70b0794c9cb27ec934ccaf8e9428ef816f3deb790acb148f30f0c7da0ac0f2f2f410d23ffbc7f15eebf0249f1130ae67329663a2172d6cf16c2ae9f74
+  data.tar.gz: b961e207fcb45f66ac6bbceb5a29054c988c620b9d8e9939dae7a63348fe31038545170a0e2d68e24fa19e805eaf9651781f272b0fbb11d37e77929eb5d76db0

data/CHANGELOG.md

@@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.4.0] - 2017-07-04
+### Added
+- added ruby 2.4 testing (@majormoses)
+- check-es-shard-allocation-status.rb: HTTP Basic Auth support added  (@cihangirbesiktas)
+- check-es-shard-allocation-status.rb: timeout option for rest calls (@cihangirbesiktas)
+
+
+### Fixed
+- PR template spell "compatibility" correctly. (@majormoses)
+
 ## [1.3.1] - 2017-05-22
 ### Fixed
 - Conversion of previous_months option to Seconds (@guptaishabh)
@@ -149,7 +159,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.3.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.4.0...HEAD
+[1.4.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.3...1.2.0

data/bin/check-es-shard-allocation-status.rb

@@ -30,6 +30,7 @@
 require 'sensu-plugin/check/cli'
 require 'rest-client'
 require 'json'
+require 'base64'
 
 #
 # == Elastic Search Shard Allocation Status
@@ -58,13 +59,40 @@ class ESShardAllocationStatus < Sensu::Plugin::Check::CLI
          long: '--allow-non-master',
          default: false
 
+  option :timeout,
+         description: 'Sets the connection timeout for REST client',
+         short: '-t SECS',
+         long: '--timeout SECS',
+         proc: proc(&:to_i),
+         default: 45
+
+  option :user,
+         description: 'Elasticsearch User',
+         short: '-u USER',
+         long: '--user USER'
+
+  option :password,
+         description: 'Elasticsearch Password',
+         short: '-P PASS',
+         long: '--password PASS'
+
   def get_es_resource(resource)
-    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}#{resource}", timeout: 45)
+    headers = {}
+    if config[:user] && config[:password]
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
+      headers = { 'Authorization' => auth }
+    end
+
+    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'
   rescue RestClient::RequestTimeout
-    warning 'Connection timed out'
+    critical 'Connection timed out'
+  rescue RestClient::ServiceUnavailable
+    critical 'Service is unavailable'
+  rescue Errno::ECONNRESET
+    critical 'Connection reset by peer'
   end
 
   def master?

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client