sensu-plugins-consul 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d5aa1314e22d69453e53644abc0ed3c235323f2
-  data.tar.gz: 9d18f5a04ffd48ad294dfdc4eeabc3ce5288fa8e
+  metadata.gz: c8d9c05c1f82ff1a29ed5ce3e040ee63ce264967
+  data.tar.gz: 78fa769434add3aa795a0e3702d5f55ed818a0a2
 SHA512:
-  metadata.gz: c202145eec748fe6ec3482b2cee75849e61272a799517401f7f188913a97c2ab46b783fc86e542235ad1f03b091cc532a342ffd2473dcbed25143153b7dfa0f2
-  data.tar.gz: a6d9f3c5376a8f7767db50ccaf05a11c5e9411a28b40ce9a69ce2ec53c75648c316aa46795fc0cc261b4b4964bb4adb80ed0a1b54a12fb0f685e12e265c503e9
+  metadata.gz: f8d00d68c1dbe5413f458a78e124baaac682498c2df76ed6833559e5dde730202150b1e2b5e6c2d3ba3689df112efab4f288a4285fc8432015a5c5bbab574665
+  data.tar.gz: f9966a4e39326c0e6b8a6f0d2b9505bd54f18e60cb85c2ede097b87163eefe1c7f0d12cb3bb38996176863a8ceb765aa1b51172617edebfdf5c6b09ebb081d6b

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.0] - 2016-08-03
+### Added
+- check-consul-service-health and check-service-consul now accept a --fail-if-not-found argument @wg-tsuereth
+
 ## [1.0.0] - 2016-06-28
 ### Fixed
 - Fixed check-consul-service-health and check-service-consul --all argument @wg-tsuereth
@@ -60,7 +64,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.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/1.1.0...HEAD
+[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
 [0.1.7]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/0.0.7...0.1.7
 [0.0.7]: https://github.com/sensu-plugins/sensu-plugins-consul/compare/0.0.6...0.0.7

data/README.md

@@ -1,6 +1,6 @@
 ## Sensu-Plugins-consul
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-consul.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-consul)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-consul.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-consul)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-consul.svg)](http://badge.fury.io/rb/sensu-plugins-consul)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-consul/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-consul)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-consul/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-consul)

data/bin/check-consul-service-health.rb

@@ -53,6 +53,11 @@ class CheckConsulServiceHealth < Sensu::Plugin::Check::CLI
          short: '-a',
          long: '--all'
 
+  option :fail_if_not_found,
+         description: 'fail if no service is found',
+         short: '-f',
+         long: '--fail-if-not-found'
+
   # Get the service checks for the given service
   def acquire_service_data
     if config[:all]
@@ -68,12 +73,14 @@ class CheckConsulServiceHealth < Sensu::Plugin::Check::CLI
       dc.url = config[:consul]
     end
 
+    found      = false
     warnings   = false
     criticals  = false
     checks     = {}
 
     # Process all of the nonpassing service checks
     acquire_service_data.each do |d|
+      found       = true
       checkId     = d['CheckID'] # rubocop:disable Style/VariableName
       checkStatus = d['Status'] # rubocop:disable Style/VariableName
 
@@ -86,6 +93,13 @@ class CheckConsulServiceHealth < Sensu::Plugin::Check::CLI
       criticals = true  if %w(critical unknown).include? checkStatus
     end
 
+    if config[:fail_if_not_found] && !found
+      msg = 'Could not find checks for any services'
+      if config[:service]
+        msg = "Could not find checks for service #{config[:service]}"
+      end
+      critical msg
+    end
     critical checks if criticals
     warning checks  if warnings
     ok

data/bin/check-service-consul.rb

@@ -51,6 +51,11 @@ class ServiceStatus < Sensu::Plugin::Check::CLI
          short: '-a',
          long: '--all'
 
+  option :fail_if_not_found,
+         description: 'fail if no service is found',
+         short: '-f',
+         long: '--fail-if-not-found'
+
   # Get the check data for the service from consul
   #
   def acquire_service_data
@@ -89,7 +94,18 @@ class ServiceStatus < Sensu::Plugin::Check::CLI
         'notes' => d['Notes']
       } if d['Status'] == 'failing'
     end
-    unknown 'Could not find service - are there checks defined?' if failing.empty? && passing.empty?
+
+    if failing.empty? && passing.empty?
+      msg = 'Could not find checks for any services'
+      if config[:service]
+        msg = "Could not find checks for service #{config[:service]}"
+      end
+      if config[:fail_if_not_found]
+        critical msg
+      else
+        unknown msg
+      end
+    end
     critical failing unless failing.empty?
     ok passing unless passing.empty?
   end

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

@@ -1,7 +1,7 @@
 module SensuPluginsConsul
   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-consul
 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-06-28 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -237,4 +237,3 @@ signing_key:
 specification_version: 4
 summary: Sensu plugins for Consul
 test_files: []
-has_rdoc: