sensu-plugins-consul 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c684c8753b72679288f5c017f6579c90e8d31df
-  data.tar.gz: e207203ce031933276ee65fb76a4f185346bf80c
+  metadata.gz: 2345bb1e6d0c55e1da7e0be24c383c36f175cf63
+  data.tar.gz: 055bf5e5b85fa9842ef806a2efeb071cac89d866
 SHA512:
-  metadata.gz: a0625d30e343c886468256e34ecd8f645e2ed277dc40ff5bc5908feed1dd90ebd2edd58d2f6afa23b673b88d70a0b4ef78fdc3cc473587749ea923d3e94d305c
-  data.tar.gz: 6896136924d366fcce09be182893e172995a31bc974864217217bd8c507467db4f14d3c73dfe6c2788bcb941e042cc45c88fde1dae74f1d97589725c4aa32fac
+  metadata.gz: e4f0af653c55e0bc880121a6d83449f4296e88af56406bc43f7880d61431299cc9ff62eb00227b00bb3258429f71c3abd77bf68ebb34a237cc4eea5cdd66b649
+  data.tar.gz: 77531f5a5c65a17588d939d26bb413cdfacb9b7ed262cc2554f67603c2cb45d4bc1b7bc50f48bbccbed619b00dcaceaead86e888318217fbc447f9a83ecb2699

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.5.0] - 2017-08-09
+### Added
+- `check-consul-failures` now accepts `--keep-failures` and `--critical` arguments (@psyhomb)
+
 ## [1.4.1] 2017-08-06
 ### Fixed
 - Bug fix for `check-consul-service-health` [#26](https://github.com/sensu-plugins/sensu-plugins-consul/pull/26) (@psyhomb)
@@ -87,7 +91,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.4.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.5.0...HEAD
+[1.5.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.4.1...1.5.0
 [1.4.1]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.4.0...1.4.1
 [1.4.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.3.0...1.4.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/2.1.0...1.3.0

data/bin/check-consul-failures.rb

@@ -43,18 +43,38 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
          long: '--scheme SCHEME',
          default: 'http'
 
+  option :keep_failures,
+         description: 'do not remove failing nodes',
+         short: '-k',
+         long: '--keep-failures',
+         boolean: true,
+         default: false
+
+  option :critical,
+         description: 'set state to critical',
+         short: '-c',
+         long: '--critical',
+         boolean: true,
+         default: false
+
   def run
     r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/agent/members", timeout: 5).get
     if r.code == 200
       failing_nodes = JSON.parse(r).find_all { |node| node['Status'] == 4 }
       if !failing_nodes.nil? && !failing_nodes.empty?
+        nodes_names = []
         failing_nodes.each_entry do |node|
-          puts "Name: #{node['Name']}"
+          nodes_names.push(node['Name'])
+          next if config[:keep_failures]
+          puts "Removing failed node: #{node['Name']}"
           RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/agent/force-leave/#{node['Name']}", timeout: 5).get
+          nodes_names.delete(node['Name'])
         end
-        ok 'Removed failed consul nodes'
+        ok 'All clear' if nodes_names.empty?
+        critical "Found failed nodes: #{nodes_names}" if config[:critical]
+        warning "Found failed nodes: #{nodes_names}"
       else
-        ok 'No consul nodes to remove'
+        ok 'All nodes are alive'
       end
     else
       critical 'Consul is not responding'

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

@@ -1,8 +1,8 @@
 module SensuPluginsConsul
   module Version
     MAJOR = 1
-    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-consul
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin