sensu-plugins-haproxy 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e283eb95bb91b28de4bb02fcd2e3cdbc53f4f4
-  data.tar.gz: 2efdac47dbea6af71901735fa908aeb350f76a21
+  metadata.gz: f4c4b50a4503825cb6fdb4b8901ee5e5cfa76c91
+  data.tar.gz: 861303a859aab6effdd97d0c9b33f73dd295ea57
 SHA512:
-  metadata.gz: 43a8723a40b97903c908b8b5e8bede02baa6c40bd4b0706666c61189181a72370fe7e30d2f12cf27c94b2918edb10d9c2453d7292201603d5fc2ce1360ccc703
-  data.tar.gz: 7547cf619ee498119d55ffaef3d1f5caaf9e337b47af0e6af62286e0ca28fc2b407c938ba9a6619e46ff44592aeaad8aa1deb423b41aa9d8b5e456d4171e8bb1
+  metadata.gz: 25a2e3536955ebc09009987cacaa7fb96d144807c98c9b02d5ef94a7aab51f20a272e4e6993d4c46a6b11cdaa7ec25d4e5f5bd15191dc3c1939f7058209b22f5
+  data.tar.gz: 739f898956be7f9abeb0bfb6784b688d65fa42f71fe18cc5b42c358311e6fb17298f4f51d35d4f06f57c8a21fd52a7babf0969f946490e7f2aa77b46599726be

data/CHANGELOG.md

@@ -3,8 +3,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
+
 ## [Unreleased]
 
+## [1.1.0] - 2017-01-30
+### Added
+- `check-haproxy.rb`: added fail on missing service flag (@obazoud)
+- Consider backends in DRAIN status as UP and add flag to include backends in MAINT status (@modax)
+
 ## [1.0.0] - 2016-12-08
 ### Added
 - added names of the failed backends to check-haproxy.rb status
@@ -54,7 +60,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.1.1...1.0.0
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.1.0...0.1.1
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.5...0.1.0

data/bin/check-haproxy.rb

@@ -102,6 +102,10 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
          short: '-A',
          boolean: true,
          description: 'Check ALL Services, flag enables'
+  option :include_maint,
+         long: '--include-maint',
+         boolean: false,
+         description: 'Include servers in maintanance mode while checking (as DOWN)'
   option :missing_ok,
          short: '-m',
          boolean: true,
@@ -113,6 +117,17 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
          short: '-e',
          boolean: false,
          description: 'Whether service name specified with -s should be exact match or not'
+  option :missing_fail,
+         short: '-f',
+         boolean: false,
+         description: 'fail on missing service'
+
+  def service_up?(svc)
+    svc[:status].start_with?('UP') ||
+      svc[:status] == 'OPEN' ||
+      svc[:status] == 'no check' ||
+      svc[:status].start_with?('DRAIN')
+  end
 
   def run #rubocop:disable all
     if config[:service] || config[:all_services]
@@ -123,14 +138,16 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
 
     if services.empty?
       message "No services matching /#{config[:service]}/"
-      if config[:missing_ok]
+      if config[:missing_fail]
+        critical
+      elsif config[:missing_ok]
         ok
       else
         warning
       end
     else
-      percent_up = 100 * services.count { |svc| svc[:status] == 'UP' || svc[:status] == 'OPEN' || svc[:status] == 'no check' } / services.size
-      failed_names = services.reject { |svc| svc[:status] == 'UP' || svc[:status] == 'OPEN' || svc[:status] == 'no check' }.map do |svc|
+      percent_up = 100 * services.count { |svc| service_up? svc } / services.size
+      failed_names = services.reject { |svc| service_up? svc }.map do |svc|
         "#{svc[:pxname]}/#{svc[:svname]}#{svc[:check_status].to_s.empty? ? '' : '[' + svc[:check_status] + ']'}"
       end
       critical_sessions = services.select { |svc| svc[:slim].to_i > 0 && (100 * svc[:scur].to_f / svc[:slim].to_f) > config[:session_crit_percent] }
@@ -212,6 +229,8 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
       end.reject do |svc| # rubocop: disable MultilineBlockChain
         %w(FRONTEND BACKEND).include?(svc[:svname])
       end
+    end.select do |svc|
+      config[:include_maint] || !svc[:status].start_with?('MAINT')
     end
   end
 end

data/bin/metrics-haproxy.rb

@@ -180,7 +180,7 @@ class HAProxyMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
       if line[1] != 'BACKEND' && !line[1].nil?
         up_by_backend[line[0]] ||= 0
-        up_by_backend[line[0]] += (line[17] == 'UP') ? 1 : 0
+        up_by_backend[line[0]] += line[17].start_with?('UP') ? 1 : 0
       end
     end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-haproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin