sensu-plugins-consul 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7756d3660b34f273f747362826658fecdbc6dfab
-  data.tar.gz: c47c6af671557229f903a45c1aa3d3e30dfc2538
+  metadata.gz: 870e22095ff80e366b05399e1b81077b6777d6f6
+  data.tar.gz: 651dc79e9d5863b4f64ff4f4060cda87a292c64d
 SHA512:
-  metadata.gz: dbbda6260ae94b48b547f9ac7e5147753433541e6b6822efc147afff31b691ad3fadd763f1174ddb218033d673f41b7b8a2ab9986fdabf0fa9935988f63409e2
-  data.tar.gz: 853551656ca6f4fd6cc37dc2a3f4bdcf5136df89d87a364c35252cbe88875727648b2133caf50d1a513938c6d660364acbb2b8bf4b2464e3c0c2f441c2c624d7
+  metadata.gz: 5e9595c8e3af5afbdb7924adb958ddf574d8341bc42f692061b5db1599e596a97579eec7c04ad3f182d71af966f7ce83eeba1ccc6867d624567a27116b341380
+  data.tar.gz: 194f2b1cd975584efbc87ec7e218717245e861b3810f6bc00bd7fabf0b6e13a48dfc5506014a5f72fe9e29bc7e4674c0c4c2e3dbb350c398bf32296b16a29984

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.3.0] 2017-05-05
+### Added
+- `check-consul-failures`, `check-consul-leader`, `check-consul-members`, and `check-consul-servers` now accept a --scheme parameter (@akatch)
+- Add consul maintenance check @okushchenko
 
 ## [1.2.0] - 2017-01-26
 ### Added
@@ -71,7 +75,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.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/2.1.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/0.1.7...1.0.0

data/README.md

@@ -16,6 +16,7 @@
  * bin/check-consul-servers.rb
  * bin/check-consul-members.rb
  * bin/check-service-consul.rb
+ * bin/check-consul-maintenance.rb
 
 ## Usage
 

data/bin/check-consul-failures.rb

@@ -37,14 +37,20 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
          long: '--port PORT',
          default: '8500'
 
+  option :scheme,
+         description: 'consul listener scheme',
+         short: '-S SCHEME',
+         long: '--scheme SCHEME',
+         default: 'http'
+
   def run
-    r = RestClient::Resource.new("http://#{config[:server]}:#{config[:port]}/v1/agent/members", timeout: 5).get
+    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?
         failing_nodes.each_entry do |node|
           puts "Name: #{node['Name']}"
-          RestClient::Resource.new("http://#{config[:server]}:#{config[:port]}/v1/agent/force-leave/#{node['Name']}", timeout: 5).get
+          RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/agent/force-leave/#{node['Name']}", timeout: 5).get
         end
         ok 'Removed failed consul nodes'
       else

data/bin/check-consul-leader.rb

@@ -47,6 +47,12 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
          long: '--port PORT',
          default: '8500'
 
+  option :scheme,
+         description: 'consul listener scheme',
+         short: '-S SCHEME',
+         long: '--scheme SCHEME',
+         default: 'http'
+
   def valid_ip(ip)
     case ip.to_s
     when Resolv::IPv4::Regex
@@ -71,7 +77,7 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
   end
 
   def run
-    r = RestClient::Resource.new("http://#{config[:server]}:#{config[:port]}/v1/status/leader", timeout: 5).get
+    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/status/leader", timeout: 5).get
     if r.code == 200
       if valid_ip(strip_ip(r.body))
         ok 'Consul is UP and has a leader'

data/bin/check-consul-maintenance.rb

@@ -0,0 +1,80 @@
+#! /usr/bin/env ruby
+#
+#   check-consul-maintenance
+#
+# DESCRIPTION:
+#   This plugin checks if maintenance mode is enabled
+#   for the node in Consul
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: diplomat
+#
+# USAGE:
+#   ./check-consul-maintenance -n localhost
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2016 Oleksandr Kushchenko <gearok@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'diplomat'
+
+#
+# Maintenance Status
+#
+class MaintenanceStatus < Sensu::Plugin::Check::CLI
+  option :consul,
+         description: 'consul server',
+         long: '--consul SERVER',
+         default: 'http://localhost:8500'
+
+  option :node,
+         description: 'consul node name',
+         short: '-n NODE',
+         long: '--node NODE',
+         default: 'localhost'
+
+  # Get the maintenance data for the node from consul
+  #
+  def acquire_maintenance_data
+    result = Diplomat::Health.node(config[:node]).select do |check|
+      check['CheckID'] == '_node_maintenance'
+    end
+    if !result.empty?
+      { enabled: true, reason: result.first['Notes'] }
+    else
+      { enabled: false, reason: nil }
+    end
+  rescue Faraday::ConnectionFailed => e
+    warning "Connection error occurred: #{e}"
+  rescue StandardError => e
+    unknown "Exception occurred when checking consul node maintenace: #{e}"
+  end
+
+  # Main function
+  #
+  def run
+    Diplomat.configure do |dc|
+      dc.url = config[:consul]
+    end
+
+    data = acquire_maintenance_data
+
+    if data[:enabled]
+      critical "Maintenance enabled for node #{config[:node]}: #{data[:reason]}"
+    else
+      ok "Maintenance disabled for node #{config[:node]}"
+    end
+  end
+end

data/bin/check-consul-members.rb

@@ -68,8 +68,14 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
          long: '--wan',
          boolean: false
 
+  option :scheme,
+         description: 'consul listener scheme',
+         short: '-S SCHEME',
+         long: '--scheme SCHEME',
+         default: 'http'
+
   def run
-    url = "http://#{config[:server]}:#{config[:port]}/v1/agent/members"
+    url = "#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/agent/members"
     if config[:wan]
       url += '?wan=1'
     end

data/bin/check-consul-servers.rb

@@ -59,8 +59,14 @@ class ConsulStatus < Sensu::Plugin::Check::CLI
          long: '--expect EXPECT',
          default: 5
 
+  option :scheme,
+         description: 'consul listener scheme',
+         short: '-S SCHEME',
+         long: '--scheme SCHEME',
+         default: 'http'
+
   def run
-    json = RestClient::Resource.new("http://#{config[:server]}:#{config[:port]}/v1/status/peers", timeout: 5).get
+    json = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/v1/status/peers", timeout: 5).get
     peers = JSON.parse(json).length.to_i
     if peers < config[:min].to_i
       critical "[#{peers}] peers is below critical threshold of [#{config[:min]}]"

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

@@ -1,7 +1,7 @@
 module SensuPluginsConsul
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-consul
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -187,6 +187,7 @@ executables:
 - check-consul-failures.rb
 - check-consul-kv-ttl.rb
 - check-consul-leader.rb
+- check-consul-maintenance.rb
 - check-consul-members.rb
 - check-consul-servers.rb
 - check-consul-service-health.rb
@@ -200,6 +201,7 @@ files:
 - bin/check-consul-failures.rb
 - bin/check-consul-kv-ttl.rb
 - bin/check-consul-leader.rb
+- bin/check-consul-maintenance.rb
 - bin/check-consul-members.rb
 - bin/check-consul-servers.rb
 - bin/check-consul-service-health.rb