sensu-plugins-haproxy 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 977f24700c561ec67eceac0e6be8d40e73983a7e
-  data.tar.gz: 35b56c3e766fb1a0766ecf28299cbc637dbea9ee
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjBkMWU0ZTg2NDliZWYwMjBmOGRhNzg1ZDNhMzcyOTMyYTc3NTk4ZQ==
+  data.tar.gz: !binary |-
+    YjM3ZTFhZDNlZjJmMGQ2N2U3NWYwMGQzZDg4YTVlYzU1Y2MyZGU2OQ==
 SHA512:
-  metadata.gz: c347bba6013e3b205e62259685fc5e27077b789232e7a8cdb4a268552c1a6536474a4c52c13f2037155d82059852571c90d328604f4b65d16b6f61c624de4e39
-  data.tar.gz: 5d4a63847381d55d79a75c60946d0731da4a875a5834975cad75ad12be93f6bdb6ec4488ba5b9307859ed42acf924b1a9b13880add9d777cdf4058cfd4504bbd
+  metadata.gz: !binary |-
+    ZDA4ZDk4N2ViMjk0ZDRkNjFiZDlmYWFjOWU5NzNlZWNlODM2ZTZkNjI0N2M0
+    YzE3ZGU0NTc0NDkzZGI0NTM3OGU2NzQ5NzlkMTY5OTA0MDYzZWZmYTcxZTJi
+    NDQ5ZjhlZDY3NTk4NzBmY2U2MDdiNTlmOGQ5MDllZTg5MzllOWM=
+  data.tar.gz: !binary |-
+    M2JhMzgwOTE5MWRiNGU1Y2EzMmNjNzk2ODBhMTg5MDI5MTM2MmM1ZjRlMWY1
+    M2EwYmE5NDBjYTY4YWQ4MWVmYjNkZWIyYWFhOWY1OTM0OThhZGU5MWIzODRh
+    ZWNlYjQyM2FiZTkxM2VlMzY4ZTMzOTNjZWMxMjY2MjRiYzk2YTk=

data/CHANGELOG.md

@@ -3,7 +3,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [0.1.0] - 2016-03-04
+### Added
+- added `num_up` metric for each backend set showing the number of available backends
+- added flags to check session availability per backend
+
+### Changed
+- update rubocop rules and fix errors
 
 ## [0.0.5] - 2015-11-26
 ### Changed
@@ -19,14 +27,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.2] - 2015-06-02
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
 
-## [0.0.1] - 2015-05-21
-
+## 0.0.1 - 2015-05-21
 ### Added
 - initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.1.0...HEAD
+[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.5...0.1.0
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-haproxy/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-haproxy/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-haproxy)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-haproxy/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-haproxy)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-haproxy.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-haproxy)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-haproxy](https://codeship.com/projects/f196a180-d1e5-0132-1723-16c1124d299d/status?branch=master)](https://codeship.com/projects/77420)
 
 ## Functionality
 

data/bin/check-haproxy.rb

@@ -80,6 +80,14 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
          default: 90,
          proc: proc(&:to_i),
          description: 'Session Limit Critical Percent, default: 90'
+  option :backend_session_warn_percent,
+         short: '-b PERCENT',
+         proc: proc(&:to_i),
+         description: 'Per Backend Session Limit Warning Percent'
+  option :backend_session_crit_percent,
+         short: '-B PERCENT',
+         proc: proc(&:to_i),
+         description: 'Per Backend Session Limit Critical Percent'
   option :min_warn_count,
          short: '-M COUNT',
          default: 0,
@@ -126,19 +134,39 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
       critical_sessions = services.select { |svc| svc[:slim].to_i > 0 && (100 * svc[:scur].to_f / svc[:slim].to_f) > config[:session_crit_percent] }
       warning_sessions = services.select { |svc| svc[:slim].to_i > 0 && (100 * svc[:scur].to_f / svc[:slim].to_f) > config[:session_warn_percent] }
 
+      critical_backends = services.select do |svc|
+        config[:backend_session_crit_percent] &&
+          svc[:svname] == 'BACKEND' &&
+          svc[:smax].to_i > 0 &&
+          (100 * svc[:scur].to_f / svc[:smax].to_f) > config[:backend_session_crit_percent]
+      end
+
+      warning_backends = services.select do |svc|
+        config[:backend_session_warn_percent] &&
+          svc[:svname] == 'BACKEND' &&
+          svc[:smax].to_i > 0 &&
+          (100 * svc[:scur].to_f / svc[:smax].to_f) > config[:backend_session_warn_percent]
+      end
+
       status = "UP: #{percent_up}% of #{services.size} /#{config[:service]}/ services" + (failed_names.empty? ? '' : ", DOWN: #{failed_names.join(', ')}")
       if services.size < config[:min_crit_count]
         critical status
       elsif percent_up < config[:crit_percent]
         critical status
-      elsif !critical_sessions.empty?
+      elsif !critical_sessions.empty? && config[:backend_session_crit_percent].nil?
         critical status + '; Active sessions critical: ' + critical_sessions.map { |s| "#{s[:scur]} #{s[:pxname]}.#{s[:svname]}" }.join(', ')
+      elsif config[:backend_session_crit_percent] && !critical_backends.empty?
+        critical status + '; Active backends critical: ' +
+                 critical_backends.map { |s| "current sessions: #{s[:scur]}, maximum sessions: #{s[:smax]} for #{s[:pxname]} backend." }.join(', ')
       elsif services.size < config[:min_warn_count]
         warning status
       elsif percent_up < config[:warn_percent]
         warning status
-      elsif !warning_sessions.empty?
+      elsif !warning_sessions.empty? && config[:backend_session_warn_percent].nil?
         warning status + '; Active sessions warning: ' + warning_sessions.map { |s| "#{s[:scur]} #{s[:pxname]}.#{s[:svname]}" }.join(', ')
+      elsif config[:backend_session_warn_percent] && !warning_backends.empty?
+        critical status + '; Active backends warning: ' +
+                 warning_backends.map { |s| "current sessions: #{s[:scur]}, maximum sessions: #{s[:smax]} for #{s[:pxname]} backend." }.join(', ')
       else
         ok status
       end
@@ -175,7 +203,7 @@ class CheckHAProxy < Sensu::Plugin::Check::CLI
     if config[:all_services]
       haproxy_stats
     else
-      regexp = config[:exact_match] ? Regexp.new("^#{config[:service]}$") : Regexp.new("#{config[:service]}")
+      regexp = config[:exact_match] ? Regexp.new("^#{config[:service]}$") : Regexp.new(config[:service].to_s)
       haproxy_stats.select do |svc|
         svc[:pxname] =~ regexp
         # #YELLOW

data/bin/metrics-haproxy.rb

@@ -80,7 +80,7 @@ class HAProxyMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-f BACKEND1[,BACKEND2]',
          long: '--backends BACKEND1[,BACKEND2]',
          proc: proc { |l| l.split(',') },
-         default: []  # an empty list means show all backends
+         default: [] # an empty list means show all backends
 
   option :server_metrics,
          description: 'Add metrics for backend servers',
@@ -141,6 +141,7 @@ class HAProxyMetrics < Sensu::Plugin::Metric::CLI::Graphite
       warning "Unable to fetch stats from haproxy after #{config[:retries]} attempts"
     end
 
+    up_by_backend = {}
     parsed = CSV.parse(out)
     parsed.shift
     parsed.each do |line|
@@ -175,7 +176,17 @@ class HAProxyMetrics < Sensu::Plugin::Metric::CLI::Graphite
       elsif config[:server_metrics]
         output "#{config[:scheme]}.#{line[0]}.#{line[1]}.session_total", line[7]
       end
+
+      if line[1] != 'BACKEND' && !line[1].nil?
+        up_by_backend[line[0]] ||= 0
+        up_by_backend[line[0]] += (line[17] == 'UP') ? 1 : 0
+      end
     end
+
+    up_by_backend.each_pair do |backend, count|
+      output "#{config[:scheme]}.#{backend}.num_up", count
+    end
+
     ok
   end
 end

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

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

metadata

@@ -1,185 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-haproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-11-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: |-
-  This plugin provides native HAProxy instrumentation
-                                for monitoring and metrics collection, including:
-                                service health and backend server metrics.
-email: "<sensu-users@googlegroups.com>"
+description: ! "This plugin provides native HAProxy instrumentation\n                              for
+  monitoring and metrics collection, including:\n                              service
+  health and backend server metrics."
+email: <sensu-users@googlegroups.com>
 executables:
-- metrics-haproxy.rb
 - check-haproxy.rb
+- metrics-haproxy.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -206,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for haproxy

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-���W�')X�z
-�
+���׼��iY;1F�����w���D��(W8?H�⡖w�t����g[��(B�3�����">�[����ȍ0n3<�/��~�