sensu-plugins-elasticsearch 1.6.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccac27672694127e79e44c35ae89993cb3fd2d8c
-  data.tar.gz: 3ced80ebfa6e4cf4ffbc7511fbfe1f016a592914
+  metadata.gz: 9b5d19c687717bb77c715fe191176912e2b4eeb0
+  data.tar.gz: ba45b265535b3a4829e2ffbde77994a9f0c8367a
 SHA512:
-  metadata.gz: cbed78893141f38b9021029317d2e244c909d5561f2bf8142dfba347a0da762a55c4c1666c41c754ed664c7486aa613b32e63f5af1e88c165ec20d1c56ff8016
-  data.tar.gz: 9f82647ee3f664b850bdde81e780161433365801b8d843ab7ee5d117a289a3631edc353d8674e97544ff73f4ddb4ff30e994e557df0be0bc25c9ef13a5b58993
+  metadata.gz: 9ccf40f6c0612d23fe4f46215497f68c61109243dca77ca4da7f47808242f7371b20083f5c239d94a662e3f6fd3eb1467e26d1cee8975abb9bb1570bd7aaa374
+  data.tar.gz: 659d435cabed3488b826d6f1a4b8947e86bbe43655b3f6fd761f0414be487e75242cdd8fffb0c70be764cb22aea617d98c3b75eb116a7711945fac08e9981e82

data/CHANGELOG.md

@@ -5,6 +5,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.7.1] - 2017-09-18
+### Fixed
+- bin/check-es-cluster-health.rb and bin/check-es-cluster-status.rb fixed --alert-status failing to alert and allow absent value to alert on any status (@rwky)
+
+## [1.7.0] - 2017-09-16
+### Changed
+- check-es-cluster-health.rb: changed `--alert_status` to `--alert-status` to be more consistent with conventions, restrict `--alert-status` to the actual acceptable options. (@majormoses)
+- check-es-cluster-status.rb: changed `--alert_status` to `--alert-status` to be more consistent with conventions, restrict `--alert-status` to the actual acceptable options. (@majormoses)
+
+### Added
+- bin/check-es-cluster-health.rb: added option to alert only during a yellow state or only during a red state (@barrebre)
+- bin/check-es-cluster-status.rb: added option to alert only during a yellow state or only during a red state (@barrebre)
+
 ## [1.6.1] - 2017-08-24
 ### Fixed
 - bin/check-es-query-ratio.rb: added support to define float thresholds (@cgarciaarano)
@@ -187,7 +200,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.6.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.7.1...HEAD
+[1.7.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.7.0...1.7.1
+[1.7.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.6.1...1.7.0
 [1.6.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.6.0...1.6.1
 [1.6.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.5.3...1.6.0
 [1.5.3]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.5.2...1.5.3

data/bin/check-es-cluster-health.rb

@@ -92,6 +92,12 @@ class ESClusterHealth < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 30
 
+  option :alert_status,
+         description: 'Only alert when status matches given RED/YELLOW/GREEN or if blank all statuses',
+         long: '--alert-status STATUS',
+         default: '',
+         in: ['RED', 'YELLOW', 'GREEN', '']
+
   def run
     options = {}
     unless config[:level].nil?
@@ -106,9 +112,17 @@ class ESClusterHealth < Sensu::Plugin::Check::CLI
     health = client.cluster.health options
     case health['status']
     when 'yellow'
-      warning 'Cluster state is Yellow'
+      if ['YELLOW', ''].include? config[:alert_status]
+        warning 'Cluster state is Yellow'
+      else
+        ok 'Not alerting on yellow'
+      end
     when 'red'
-      critical 'Cluster state is Red'
+      if ['RED', ''].include? config[:alert_status]
+        critical 'Cluster state is Red'
+      else
+        ok 'Not alerting on red'
+      end
     when 'green'
       ok
     else

data/bin/check-es-cluster-status.rb

@@ -83,6 +83,12 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
          short: '-e',
          long: '--https'
 
+  option :alert_status,
+         description: 'Only alert when status matches given RED/YELLOW/GREEN or if blank all statuses',
+         long: '--alert-status STATUS',
+         default: '',
+         in: ['RED', 'YELLOW', 'GREEN', '']
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
@@ -139,9 +145,17 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
       when 'green'
         ok 'Cluster is green'
       when 'yellow'
-        warning 'Cluster is yellow'
+        if ['YELLOW', ''].include? config[:alert_status]
+          warning 'Cluster state is Yellow'
+        else
+          ok 'Not alerting on yellow'
+        end
       when 'red'
-        critical 'Cluster is red'
+        if ['RED', ''].include? config[:alert_status]
+          critical 'Cluster state is Red'
+        else
+          ok 'Not alerting on red'
+        end
       end
     else
       ok 'Not the master'

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for elasticsearch