sensu-plugins-graphite 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7efb937f12618e44c6e26727cb375e1a6b8e03
-  data.tar.gz: 2788478ba370507eedb8d162dfc54e11dc43bdcf
+  metadata.gz: 8331eec9eb6a5f9cf9247c209a05cbd4735c67c4
+  data.tar.gz: a0add0a78abe919a5c43f8df3241f1123ce09ffa
 SHA512:
-  metadata.gz: 37266b0ff1aecee96edad07b21765cb66198ba2166220622658c21ac605f5be2ec25b0c4c3983f18897d095667ed70181d68dc2fb9ae9576f0e59f36d9aed679
-  data.tar.gz: 6db3acba2e2794d4c87dedfec5499f11625638716652b68bc57bfe029d3a0a031a58e76bac98cf7e44410dcc7b1a29859435177d9b7d0533909506472bc8d5e5
+  metadata.gz: 7e0ada3c1be5f354b91f03955036e15efbc79a180dfcece3135d743a148eac9fd5ae9c5698d6c5050ff9a82fdbe92cf86a759bb5b59b5805a448aae012c3a9d7
+  data.tar.gz: 928b1e29800fe91a4f951a4059786179a19b8954f37f244c6cd74dae05a0982ec2f25b67f3abe36e86fd73a98a4f1e3d405a60a81e920e90ecdbdd365850337e

data/CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.1.0]
+### Changed
+- Disable filtering for handler-graphite-status.rb
+### Fixed
+- Error handling in graphite handlers
+- Duplicate short option in check-graphite.rb
 
 ## [2.0.0] - 2016-06-21
 ### Added
@@ -62,7 +68,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.7...1.0.0

data/README.md

@@ -16,7 +16,7 @@
  * bin/extension-graphite
  * bin/handler-graphite-event
  * bin/handler-graphite-notify
- * bin/handler-graphite-occurances
+ * bin/handler-graphite-occurrences
  * bin/mutator-graphite
 
 ## Usage

data/bin/check-graphite-stats.rb

@@ -142,7 +142,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
     data.each do |metric|
       s, msg = danger(metric)
 
-      message += "#{msg} " unless s == 0
+      message += "#{msg} " unless s.zero?
       status = s unless s < status
     end
 

data/bin/check-graphite.rb

@@ -67,14 +67,14 @@ class Graphite < Sensu::Plugin::Check::CLI
 
   option :acceptable_diff_percentage,
          description: 'The acceptable diff from max values in percentage, used in check_function_increasing',
-         short: '-d ACCEPTABLE_DIFF_PERCENTAGE',
+         short: '-D ACCEPTABLE_DIFF_PERCENTAGE',
          long: '--acceptable_diff_percentage ACCEPTABLE_DIFF_PERCENTAGE',
          default: 0
 
   option :check_function_increasing,
          description: 'Check that value is increasing or equal over time (use acceptable_diff_percentage if it should allow to be lower)',
          short: '-i',
-         long: '--check_function_decreasing',
+         long: '--check_function_increasing',
          default: false,
          boolean: true
 

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 = uri.scheme == 'https' ? true : false
+    sock.use_ssl = uri.scheme == 'https'
     req.body     = body
 
     req.basic_auth(uri.user, uri.password) if uri.user

data/bin/handler-graphite-notify.rb

@@ -21,8 +21,8 @@ class Resolve < Sensu::Handler
       graphite.push_to_graphite do |graphite_socket|
         graphite_socket.puts message
       end
-    rescue ETIMEDOUT
-      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}'"
+    rescue => e
+      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}: #{e}'"
       raise error_msg
     end
   end

data/bin/handler-graphite-status.rb

@@ -11,6 +11,9 @@ require 'sensu-handler'
 require 'simple-graphite'
 
 class Resolve < Sensu::Handler
+  # override filters from Sensu::Handler. not appropriate for metric handlers
+  def filter; end
+
   def handle
     port = settings['graphite_notify']['port'] ? settings['graphite_notify']['port'].to_s : '2003'
     graphite = Graphite.new(host: settings['graphite_notify']['host'], port: port)
@@ -22,8 +25,8 @@ class Resolve < Sensu::Handler
       graphite.push_to_graphite do |graphite_socket|
         graphite_socket.puts message
       end
-    rescue ETIMEDOUT
-      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}'"
+    rescue => e
+      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}: #{e}'"
       raise error_msg
     end
   end

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

@@ -3,10 +3,7 @@ require 'open-uri'
 module SensuPluginsGraphite
   module GraphiteProxy
     class ProxyError < StandardError
-      attr_accessor :exception
-
-      def initialize(msg, args)
-        self.exception = args[:exception]
+      def initialize(msg)
         super msg
       end
     end
@@ -87,24 +84,20 @@ module SensuPluginsGraphite
             handle = open(url, request_auth_options(config))
 
             @raw_data = handle.gets
-            if @raw_data == '[]'
-              unknown 'Empty data received from Graphite - metric probably doesn\'t exists'
-            else
-              json_data = JSON.parse(@raw_data)
-              format_output(json_data)
-            end
-          rescue OpenURI::HTTPError => e
-            raise ProxyError.new('Failed to connect to Graphite server', exception: e)
-          rescue NoMethodError => e
-            raise ProxyError.new('No data for time period and/or target', exception: e)
-          rescue Errno::ECONNREFUSED => e
-            raise ProxyError.new('Connection refused when connecting to Graphite server', exception: e)
-          rescue Errno::ECONNRESET => e
-            raise ProxyError.new('Connection reset by peer when connecting to Graphite server', exception: e)
-          rescue EOFError => e
-            raise ProxyError.new('End of file error when reading from Graphite server', exception: e)
+            json_data = JSON.parse(@raw_data)
+            format_output(json_data)
+          rescue OpenURI::HTTPError
+            raise ProxyError, 'Failed to connect to Graphite server'
+          rescue NoMethodError, JSON::ParserError
+            raise ProxyError, 'No data for time period and/or target'
+          rescue Errno::ECONNREFUSED
+            raise ProxyError, 'Connection refused when connecting to Graphite server'
+          rescue Errno::ECONNRESET
+            raise ProxyError, 'Connection reset by peer when connecting to Graphite server'
+          rescue EOFError
+            raise ProxyError, 'End of file error when reading from Graphite server'
           rescue => e
-            raise ProxyError.new("An unknown error occurred: #{e.inspect}", exception: e)
+            raise ProxyError, "An unknown error occurred: #{e.inspect}"
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module SensuPluginsGraphite
   module Version
     MAJOR = 2
-    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-graphite
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats
@@ -268,9 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for graphite
 test_files: []
-has_rdoc: