sensu-plugins-graphite 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95919766647d9a11674c461481f6bf721f6dd5c7
-  data.tar.gz: 73c6e2979abaa4ff35f69b510000e96410921e6d
+  metadata.gz: 1c9b47b908225a034886cf53e05210d7364b74ad
+  data.tar.gz: 8519202e2e3a17afb71976483c3b828f67debd8e
 SHA512:
-  metadata.gz: efcbdf877c3405cd8a7b98756581945f6d547b3c41942d61c1ea78dfe7deed82de5eb6dd1ade93d1745b371d981c69cba262ea4cf194a464870a74ebf769b227
-  data.tar.gz: a75f1d56bb46334dcd4a32147f1644311b0ea78c43b832ac015eb86d76259c08b2a2587eac3f38a038c4959544f214a8eec27a2c0b4522247339c5ef112e0c65
+  metadata.gz: d62bfe5b3e8ef036e99441179c2791e85be02decfe1101424a6aec46cc7a0f26b80ab8808150e19a9d84686a0f170e56ff8df33b0babc909519a76a53e195d3e
+  data.tar.gz: 10875b3238b6744885485df857d6d137378e9a0adb5f96c0cc241af54dd22143215919d4a604e85889677754d0e19c45e4922bd8caa272753502ee7acfe7fbc6

data/CHANGELOG.md

@@ -4,6 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+- nothing
+
+## [0.0.7] - 2015-09-29
+### Added
+- add -r option (Reverse the warning/crit scale (if value is less than instead of greater than)) to check-graphite-stats.rb
+
+### Changed
+- The short command line option for 'Add an auth token to the HTTP request' is now -A, -a clashed with the proxy support
+- Set socket's SSL mode only if using HTTPS
 
 ## [0.0.6] - 2015-08-27
 ### Added

data/bin/check-graphite-data.rb

@@ -13,7 +13,6 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
-#   gem: openssl
 #
 # USAGE:
 #   #YELLOW

data/bin/check-graphite-hosts.rb

@@ -14,7 +14,6 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
-#   gem: openssl
 #
 # USAGE:
 #   #YELLOW

data/bin/check-graphite-stats.rb

@@ -79,6 +79,13 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :reverse_scale,
+         short: '-r',
+         long: '--reverse-scale',
+         description: 'Reverse the warning/crit scale (if value is less than instead of greater than)',
+         boolean: true,
+         default: false
+
   def average(a)
     total = 0
     a.to_a.each { |i| total += i.to_f }
@@ -92,11 +99,18 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
     # #YELLOW
     unless datapoints.empty? # rubocop:disable UnlessElse
       avg = average(datapoints)
-
-      if !config[:crit].nil? && avg > config[:crit]
-        return [2, "#{metric['target']} is #{avg}"]
-      elsif !config[:warn].nil? && avg > config[:warn]
-        return [1, "#{metric['target']} is #{avg}"]
+      if config[:reverse_scale] == false
+        if !config[:crit].nil? && avg > config[:crit]
+          return [2, "#{metric['target']} is #{avg}"]
+        elsif !config[:warn].nil? && avg > config[:warn]
+          return [1, "#{metric['target']} is #{avg}"]
+        end
+      else
+        if !config[:crit].nil? && avg < config[:crit]
+          return [2, "#{metric['target']} is #{avg}"]
+        elsif !config[:warn].nil? && avg < config[:warn]
+          return [1, "#{metric['target']} is #{avg}"]
+        end
       end
     else
       return [3, "#{metric['target']} has no datapoints"] unless config[:unknown_ignore]
@@ -107,7 +121,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
   def run
     body =
       begin
-        uri = URI("http://#{config[:host]}/render?format=json&target=#{config[:target]}&from=#{config[:period]}")
+        uri = URI.parse(URI.encode("http://#{config[:host]}/render?format=json&target=#{config[:target]}&from=#{config[:period]}"))
         res = Net::HTTP.get_response(uri)
         res.body
       rescue => e

data/bin/handler-graphite-event.rb

@@ -26,7 +26,7 @@ class GraphiteEvent < Sensu::Handler
     uri          = URI.parse(uri)
     req          = Net::HTTP::Post.new(uri.path)
     sock         = Net::HTTP.new(uri.host, uri.port)
-    sock.use_ssl = true
+    sock.use_ssl = uri.scheme == 'https' ? true : false
     req.body     = body
 
     req.basic_auth(uri.user, uri.password) if uri.user

data/lib/sensu-plugins-graphite/graphite_proxy/options.rb

@@ -63,7 +63,7 @@ module SensuPluginsGraphite
           auth: {
             description: 'Add an auth token to the HTTP request, in the form of "Name: Value",
                                              e.g. --auth yourapitokenvaluegoeshere',
-            short: '-a TOKEN',
+            short: '-A TOKEN',
             long: '--auth TOKEN'
           },
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 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-27 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats