sensu-plugins-haproxy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974706aeae73f0f2bfb8bdd14ed0d71f1dcad496
-  data.tar.gz: 5044fc7788204c89de57e68ef2ec8dca8040f7be
+  metadata.gz: 977f24700c561ec67eceac0e6be8d40e73983a7e
+  data.tar.gz: 35b56c3e766fb1a0766ecf28299cbc637dbea9ee
 SHA512:
-  metadata.gz: a6b459752ee440074a2c7bcf7df5a8aff5325db74175676b8da454c12a0053d47c3756a641da8afd8cca92119b49c48a3237ffd07281997c171f4c1b6efaa15f
-  data.tar.gz: af7b93176532c3c7241d8d0efd3c8e32d32a69b750f31d631ea2dd6eea79bb5e1ddcc2319543aad474b67788a9ecab902b7e5eb15387b903a7b30ca63a461cbd
+  metadata.gz: c347bba6013e3b205e62259685fc5e27077b789232e7a8cdb4a268552c1a6536474a4c52c13f2037155d82059852571c90d328604f4b65d16b6f61c624de4e39
+  data.tar.gz: 5d4a63847381d55d79a75c60946d0731da4a875a5834975cad75ad12be93f6bdb6ec4488ba5b9307859ed42acf924b1a9b13880add9d777cdf4058cfd4504bbd

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-Ik�m�p�x������PG��G�U���N�g|-��f����ht�J�ϕw'F���7f����Ʋ�W�-"{�&�����1ِ�|%��&"o�3Omؐ�-/�����`ʾ��zQ�?���|����ݸ��&Ϝ,_��L"�$'��+��dD��i8`:���iP�1��М\��98��%�I<��s��:9���>�s�����$�Rx�r;+�)告^OZ5�5�>I���`I�Ę��J�%O
+���W�')X�z
+���׼��iY;1F�����w���D��(W8?H�⡖w�t����g[��(B�3�����">�[����ȍ0n3<�/��~�
+�

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.0.5] - 2015-11-26
+### Changed
+- alert on min server count
+- fixed reporting of empty values
+
 ## [0.0.4] - 2015-08-04
 ### Changed
 - general cleanup

data/bin/check-haproxy.rb

@@ -80,6 +80,16 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
          default: 90,
          proc: proc(&:to_i),
          description: 'Session Limit Critical Percent, default: 90'
+  option :min_warn_count,
+         short: '-M COUNT',
+         default: 0,
+         proc: proc(&:to_i),
+         description: 'Minimum Server Warn Count, default: 0'
+  option :min_crit_count,
+         short: '-X COUNT',
+         default: 0,
+         proc: proc(&:to_i),
+         description: 'Minimum Server Critical Count, default: 0'
   option :all_services,
          short: '-A',
          boolean: true,
@@ -117,10 +127,14 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
       warning_sessions = services.select { |svc| svc[:slim].to_i > 0 && (100 * svc[:scur].to_f / svc[:slim].to_f) > config[:session_warn_percent] }
 
       status = "UP: #{percent_up}% of #{services.size} /#{config[:service]}/ services" + (failed_names.empty? ? '' : ", DOWN: #{failed_names.join(', ')}")
-      if percent_up < config[:crit_percent]
+      if services.size < config[:min_crit_count]
+        critical status
+      elsif percent_up < config[:crit_percent]
         critical status
       elsif !critical_sessions.empty?
         critical status + '; Active sessions critical: ' + critical_sessions.map { |s| "#{s[:scur]} #{s[:pxname]}.#{s[:svname]}" }.join(', ')
+      elsif services.size < config[:min_warn_count]
+        warning status
       elsif percent_up < config[:warn_percent]
         warning status
       elsif !warning_sessions.empty?

data/bin/metrics-haproxy.rb

@@ -125,6 +125,10 @@ class HAProxyMetrics < Sensu::Plugin::Metric::CLI::Graphite
     return nil
   end
 
+  def output(*args)
+    super(*args) unless args[1].nil?
+  end
+
   def run #rubocop:disable all
     out = nil
     1.upto(config[:retries]) do |_i|

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-haproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin