sensu-plugins-storm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b87c6eddd1a19b6b85786b8c5e51947590ae63
-  data.tar.gz: d3573bd025d139712f9ca6256fe589bb0c827670
+  metadata.gz: 6c0fdcb0a9c62f171a02f5895fd3d9137e9b143f
+  data.tar.gz: 96e7ba98a36b6ddfbcf2f10f650206a2a414f298
 SHA512:
-  metadata.gz: 296978b96f0e1959b6d9ade1be38db5c57d671c9123a85b8e344e7445a6f7a4d4ce4b7b32f5493731747c1ea50d285c917c7a2fce1f342a70b9c55e17a77eeb5
-  data.tar.gz: 495830c6b61fdb3d47b27195882ba3308b9ff49b517f6135097236b107d3346874c1c839cf84afc99d43e8e52ceafd1fa8f3761ff4421c1064c6ecdbb81552a0
+  metadata.gz: 0eaf3b3e760a7a0638cfb3634e3fafa2246d34af19174ce01e344cbebc11f0981de3558a336f15d087fcebd865d060f24cebe5e7941b82faa832994ddd7d49fa
+  data.tar.gz: dc9d4206cfadebf124e19b669552f95b6e66c52081f18aa2d012eb973b5af6c134911a0549b06ec074e3cbc50bd0b65969215fdc38533ec96c2c90557517d64f

data/CHANGELOG.md

@@ -1,8 +1,12 @@
-hange Log
+Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
+# 0.2.1 - 2016-09-01
+### changed
+- fix bug in timeout parsing
+
 # 0.2.0 - 2016-09-01
 ### Added
 - check-storm-capacity script
@@ -11,5 +15,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[0.2.0]: https://github.com/andyroyle/sensu-plugins-storm/compare/0.0.2...HEAD
-[0.1.0]: https://github.com/andyroyle/sensu-plugins-storm/compare/0.0.1...0.0.2
+[0.2.1]: https://github.com/andyroyle/sensu-plugins-storm/compare/0.2.1...HEAD
+[0.2.0]: https://github.com/andyroyle/sensu-plugins-storm/compare/0.2.0...0.2.1
+[0.1.0]: https://github.com/andyroyle/sensu-plugins-storm/compare/0.1.0...0.2.0

data/bin/check-storm-capacity.rb

@@ -21,17 +21,20 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
   option :host,
          short: '-h',
          long: '--host=VALUE',
-         description: 'Cluster host'
+         description: 'Cluster host',
+         required: true
 
   option :user,
          short: '-u',
          long: '--username=VALUE',
-         description: 'username'
+         description: 'username',
+         required: true
 
   option :pass,
          short: '-p',
          long: '--password=VALUE',
-         description: 'password'
+         description: 'password',
+         required: true
 
   option :ssl,
          description: 'use HTTPS (default false)',
@@ -40,17 +43,22 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
   option :crit,
          short: '-c',
          long: '--critical=VALUE',
-         description: 'Critical threshold'
+         description: 'Critical threshold',
+         required: true,
+         proc: proc { |l| l.to_f }
 
   option :warn,
          short: '-w',
          long: '--warn=VALUE',
-         description: 'Warn threshold'
+         description: 'Warn threshold',
+         required: true,
+         proc: proc { |l| l.to_f }
 
   option :timeout,
          short: '-t',
          long: '--timeout=VALUE',
          description: 'Timeout in seconds',
+         proc: proc { |l| l.to_f },
          default: 5
 
   def request(path)
@@ -65,13 +73,6 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
   end
 
   def run
-    critical_usage = config[:crit].to_f
-    warn_usage = config[:warn].to_f
-
-    if [config[:host], config[:user], config[:pass]].any?(&:nil?)
-      unknown 'Must specify host, user and password'
-    end
-
     r = request('/stormui/api/v1/topology/summary')
 
     if r.code != 200
@@ -88,10 +89,10 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
       bolts = JSON.parse(t.to_str)['bolts']
       bolts.each do |bolt|
         capacity = bolt['capacity'].to_f
-        if capacity > critical_usage
+        if capacity > config[:crit]
           critical "bolt #{bolt['boltId']} has capacity #{bolt['capacity']}"
-        elsif capacity > warn_usage
-          warn "bolt #{bolt['boltId']} has capacity #{bolt['capacity']}"
+        elsif capacity > config[:warn]
+          warning "bolt #{bolt['boltId']} has capacity #{bolt['capacity']}"
         end
       end
 

data/bin/check-storm-topologies.rb

@@ -21,17 +21,20 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
   option :host,
          short: '-h',
          long: '--host=VALUE',
-         description: 'Cluster host'
+         description: 'Cluster host',
+         required: true
 
   option :user,
          short: '-u',
          long: '--username=VALUE',
-         description: 'username'
+         description: 'username',
+         required: true
 
   option :pass,
          short: '-p',
          long: '--password=VALUE',
-         description: 'password'
+         description: 'password',
+         required: true
 
   option :ssl,
          description: 'use HTTPS (default false)',
@@ -41,18 +44,21 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
          short: '-c',
          long: '--critical=VALUE',
          description: 'Critical threshold',
-         default: '0'
+         default: 0,
+         proc: proc { |l| l.to_f }
 
   option :expect,
          short: '-e',
          long: '--expect=VALUE',
-         description: 'Match exactly the nuber of topologies'
+         description: 'Match exactly the number of topologies',
+         proc: proc { |l| l.to_f }
 
   option :timeout,
          short: '-t',
          long: '--timeout=VALUE',
          description: 'Timeout in seconds',
-         default: 5
+         default: 5,
+         proc: proc { |l| l.to_f }
 
   def request(path)
     protocol = config[:ssl] ? 'https' : 'http'
@@ -66,13 +72,6 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
   end
 
   def run
-    critical_usage = config[:crit].to_f
-    expect = config[:expect].to_f
-
-    if [config[:host], config[:user], config[:pass]].any?(&:nil?)
-      unknown 'Must specify host, user and password'
-    end
-
     r = request('/stormui/api/v1/topology/summary')
 
     if r.code != 200
@@ -80,13 +79,13 @@ class CheckStormTopologies < Sensu::Plugin::Check::CLI
     else
       topologies = JSON.parse(r.to_str)['topologies'].count
 
-      if expect > 0 && topologies == expect
+      if config[:expect] && topologies == config[:expect]
         ok "Topologies: #{topologies}"
-      elsif expect > 0
+      elsif config[:expect]
         critical "Topologies: #{topologies}"
       end
 
-      if topologies <= critical_usage
+      if topologies <= config[:crit]
         critical "Topologies: #{topologies}"
       else
         ok "Topologies: #{topologies}"

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-storm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andy Royle