sensu-plugins-graphite 0.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1c9b47b908225a034886cf53e05210d7364b74ad
-  data.tar.gz: 8519202e2e3a17afb71976483c3b828f67debd8e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWFmMjk2MzYxMGVkZmVlYTNjNzZiZmUyMmU3MDUzOTAwODU1NWFlYQ==
+  data.tar.gz: !binary |-
+    NzJjY2JlYjBkMDc1ZDY2MDgzNGRmMGYyNDMwMzQzYTJjMTNlNWJhYQ==
 SHA512:
-  metadata.gz: d62bfe5b3e8ef036e99441179c2791e85be02decfe1101424a6aec46cc7a0f26b80ab8808150e19a9d84686a0f170e56ff8df33b0babc909519a76a53e195d3e
-  data.tar.gz: 10875b3238b6744885485df857d6d137378e9a0adb5f96c0cc241af54dd22143215919d4a604e85889677754d0e19c45e4922bd8caa272753502ee7acfe7fbc6
+  metadata.gz: !binary |-
+    OGE3OGJkYmEwMTBiZjI4N2Q5M2UxOWM2YzBmMWM4ZmY4YmZjZDNiMTI1NjU4
+    ZjJkMzZkZWQ5NzI4ZTUyNTMxZmZhZDZjNmYwNjFiZmY2ZjRiNWM1YmE0NTY0
+    NTY0MjU1ZGFmZjhmNmIyMDMxNjY1MDhiMTlkZjQwMGVhZjQxOWQ=
+  data.tar.gz: !binary |-
+    ZGNlZjQ5OThmNjNkMjYwMDkyMWVmYTE3MTIyMDQxNmVlZjg3NjgzYTNlMDE0
+    Nzg5MTNiNjM1MzQ1ODhlODJlMjQxOGNmM2NjNWE4YTIzYzMyMGY5YTUzYjcw
+    YzkyNDcxZThkYzA3MzE1YjU4MDUzZjhhYTI1MjY0NWQ1MjE2MWE=

data/CHANGELOG.md

@@ -4,7 +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
+
+## [1.1.0] - 2016-04-26
+### Fixed
+- fix comparison of number against array in --last.
+- improve wording of --last help text.
+
+## [1.0.0] - 2016-01-20
+### Changed
+- Use the whole client name as hostname for graphite measurement
 
 ## [0.0.7] - 2015-09-29
 ### Added
@@ -41,7 +49,10 @@ 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/0.0.6...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.1.0...HEAD
+[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
+[0.0.7]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.6...0.0.7
 [0.0.6]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.5...0.0.6
 [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.4...0.0.5
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.3...0.0.4

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-graphite/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-graphite)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-graphite/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-graphite)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-graphite.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-graphite)
-[![Codeship Status for sensu-plugins/sensu-plugins-graphite](https://codeship.com/projects/c6f4f5a0-db95-0132-445b-5ad94843e341/status?branch=master)](https://codeship.com/projects/79664)
 
 ## Functionality
 
@@ -35,7 +34,7 @@
 }
 ```
 
-**handler-graphite-occurances**
+**handler-graphite-occurrences**
 ```
 {
  "graphite": {

data/bin/check-graphite-data.rb

@@ -65,7 +65,7 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
         check_age || check(:critical) || check(:warning)
       end
 
-      ok("#{name} value okay")
+      ok("#{name} value OK")
     rescue SensuPluginsGraphite::GraphiteProxy::ProxyError => e
       unknown e.message
     end
@@ -92,7 +92,7 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
           config[:server].prepend('http://')
         end
 
-        url = "#{config[:server]}/render?format=json&target=#{formatted_target}&from=#{config[:from]}"
+        url = "#{config[:server]}/render?format=json&target=#{formatted_target}&from=#{config[:from]}&until=#{config[:until]}"
 
         url_opts = {}
 
@@ -114,7 +114,7 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
 
         @raw_data = handle.gets
         if @raw_data == '[]'
-          unknown 'Empty data received from Graphite - metric probably doesn\'t exists'
+          unknown 'Empty data received from Graphite - metric probably doesn\'t exist'
         else
           @json_data = JSON.parse(@raw_data)
           output = {}
@@ -131,17 +131,17 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
           output
         end
       rescue OpenURI::HTTPError
-        unknown 'Failed to connect to graphite server'
+        unknown 'Failed to connect to Graphite server'
       rescue NoMethodError
         unknown 'No data for time period and/or target'
       rescue Errno::ECONNREFUSED
-        unknown 'Connection refused when connecting to graphite server'
+        unknown 'Connection refused when connecting to Graphite server'
       rescue Errno::ECONNRESET
-        unknown 'Connection reset by peer when connecting to graphite server'
+        unknown 'Connection reset by peer when connecting to Graphite server'
       rescue EOFError
-        unknown 'End of file error when reading from graphite server'
+        unknown 'End of file error when reading from Graphite server'
       rescue => e
-        unknown "An unknown error occured: #{e.inspect}"
+        unknown "An unknown error occurred: #{e.inspect}"
       end
     end
   end
@@ -161,7 +161,7 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
 
   # Check is value is above defined threshold
   def above?(type)
-    (!config[:below]) && (@data.last > config[type]) && (!decreased?)
+    !config[:below] && (@data.last > config[type]) && !decreased?
   end
 
   # Check if values have decreased within interval if given

data/bin/check-graphite-hosts.rb

@@ -3,7 +3,7 @@
 #   check-graphite-hosts
 #
 # DESCRIPTION:
-#   This plugin checks the number of hosts within graphite that are sending
+#   This plugin checks the number of hosts within Graphite that are sending
 #   data, and alerts if it is below a given threshold
 #
 # OUTPUT:
@@ -49,7 +49,7 @@ class CheckGraphiteHosts < Sensu::Plugin::Check::CLI
       results = proxy.retrieve_data!
 
       check(:critical, results) || check(:warning, results)
-      ok("#{name} value (#{hosts_with_data(results)}) okay")
+      ok("#{name} value (#{hosts_with_data(results)}) OK")
     rescue SensuPluginsGraphite::GraphiteProxy::ProxyError => e
       unknown e.message
     end
@@ -92,6 +92,6 @@ class CheckGraphiteHosts < Sensu::Plugin::Check::CLI
 
   # Check is value is above defined threshold
   def above?(type, val)
-    (!config[:below]) && (val > config[type])
+    !config[:below] && (val > config[type])
   end
 end

data/bin/check-graphite-replication.rb

@@ -3,7 +3,7 @@
 #   check-replication
 #
 # DESCRIPTION:
-#   Check to ensure data gets posted and is retrievable by graphite.
+#   Check to ensure data gets posted and is retrievable by Graphite.
 #   We post to each server in config[:relays] then sleep config[:sleep]
 #   seconds then check each of config[:graphites] to see if the data made it
 #   to each one. OK if all servers have the data we expected, WARN if
@@ -11,10 +11,10 @@
 #   or fewer have it. config[:check_id] allows you to have many of these
 #   checks running in different places without any conflicts. Customize it
 #   if you are going to run this check from multiple servers. Otherwise
-#   it defaults to default. (can be a descriptive string, used as a graphite key)
+#   it defaults to default. (can be a descriptive string, used as a Graphite key)
 #
 #   This check is most useful when you have a cluster of carbon-relays configured
-#   with REPLICATION_FACTOR > 1 and more than one graphite server those
+#   with REPLICATION_FACTOR > 1 and more than one Graphite server those
 #   carbon-relays are configured to post to. This check ensures that replication
 #   is actually happening in a timely manner.
 
@@ -56,12 +56,12 @@ class CheckGraphiteReplication < Sensu::Plugin::Check::CLI
   option :relays,
          short: '-r RELAYS',
          long: '--relays RELAYS',
-         description: 'Comma separated list of carbon relay servers to post to.',
+         description: 'Comma separated list of Carbon relay servers to post to.',
          required: true
   option :servers,
          short: '-g SERVERS',
          long: '--graphite SERVERS',
-         description: 'Comma separated list of all graphite servers to check.',
+         description: 'Comma separated list of all Graphite servers to check.',
          required: true
   option :sleep,
          short: '-s SECONDS',
@@ -147,13 +147,13 @@ class CheckGraphiteReplication < Sensu::Plugin::Check::CLI
 
     relay_ips = {}
 
-    time_out('resolving dns') do
+    time_out('resolving DNS') do
       relays.each do |r|
-        if IPAddress.valid? r
-          relay_ips[r] = [r]
-        else
-          relay_ips[r] = Resolv.getaddresses(r)
-        end
+        relay_ips[r] = if IPAddress.valid? r
+                         [r]
+                       else
+                         Resolv.getaddresses(r)
+                       end
       end
     end
 
@@ -190,7 +190,7 @@ class CheckGraphiteReplication < Sensu::Plugin::Check::CLI
     graphite_data = nil
 
     begin
-      time_out("querying graphite api on #{server}") do
+      time_out("querying Graphite API on #{server}") do
         graphite_data = RestClient.get url
         graphite_data = JSON.parse(graphite_data)
       end
@@ -210,7 +210,7 @@ class CheckGraphiteReplication < Sensu::Plugin::Check::CLI
   end
 
   def graphite_key(key)
-    key.gsub(',', '_').gsub(' ', '_').gsub('.', '_').gsub('-', '_')
+    key.tr(',', '_').tr(' ', '_').tr('.', '_').tr('-', '_')
   end
 
   def time_out(activity, &block)

data/bin/check-graphite-stats.rb

@@ -3,9 +3,9 @@
 #   check-stats
 #
 # DESCRIPTION:
-#   Checks metrics in graphite, averaged over a period of time.
+#   Checks metrics in Graphite, averaged over a period of time.
 #
-#   The fired sensu event will only be critical if a stat is
+#   The fired Sensu event will only be critical if a stat is
 #   above the critical threshold. Otherwise, the event will be warning,
 #   if a stat is above the warning threshold.
 #
@@ -40,7 +40,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
   option :host,
          short: '-h HOST',
          long: '--host HOST',
-         description: 'graphite hostname',
+         description: 'Graphite hostname',
          proc: proc(&:to_s),
          default: 'graphite'
 
@@ -54,7 +54,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
   option :target,
          short: '-t TARGET',
          long: '--target TARGET',
-         description: 'The graphite metric name. Can include * to query multiple metrics',
+         description: 'The Graphite metric name. Can include * to query multiple metrics',
          proc: proc(&:to_s),
          required: true
 
@@ -66,7 +66,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
          required: false
 
   option :crit,
-         short: '-c Crit',
+         short: '-c CRIT',
          long: '--crit CRIT',
          description: 'Critical level',
          proc: proc(&:to_f),
@@ -75,14 +75,14 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
   option :unknown_ignore,
          short: '-u',
          long: '--unknown-ignore',
-         description: "Do nothing for UNKNOWN status (when you wildcard-match a ton of metrics at once and you don't care for a few missing data)",
+         description: "Do nothing for UNKNOWN status (when you wildcard-match a ton of metrics at once and you don't care about a few missing data)",
          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)',
+         description: 'Reverse the warn/crit scale (if value is less than instead of greater than)',
          boolean: true,
          default: false
 
@@ -106,7 +106,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
           return [1, "#{metric['target']} is #{avg}"]
         end
       else
-        if !config[:crit].nil? && avg < config[:crit]
+        if !config[:crit].nil? && avg < config[:crit] # rubocop:disable Style/IfInsideElse
           return [2, "#{metric['target']} is #{avg}"]
         elsif !config[:warn].nil? && avg < config[:warn]
           return [1, "#{metric['target']} is #{avg}"]
@@ -125,7 +125,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
         res = Net::HTTP.get_response(uri)
         res.body
       rescue => e
-        warning "Failed to query graphite: #{e.inspect}"
+        warning "Failed to query Graphite: #{e.inspect}"
       end
 
     status = 0
@@ -137,7 +137,7 @@ class CheckGraphiteStat < Sensu::Plugin::Check::CLI
         []
       end
 
-    unknown 'No data from graphite' if data.empty?
+    unknown 'No data from Graphite' if data.empty?
 
     data.each do |metric|
       s, msg = danger(metric)

data/bin/check-graphite.rb

@@ -30,6 +30,7 @@
 require 'sensu-plugin/check/cli'
 require 'json'
 require 'net/http'
+require 'net/https'
 require 'socket'
 require 'array_stats'
 
@@ -46,6 +47,12 @@ class Graphite < Sensu::Plugin::Check::CLI
          long: '--target TARGET',
          required: true
 
+  option :complex_target,
+         description: 'Allows complex targets which contain functions. Disables splitting on comma.',
+         short: '-x',
+         long: '--complex_target',
+         default: false
+
   option :period,
          description: 'The period back in time to extract from Graphite and compare with. Use 24hours,2days etc, same format as in Graphite',
          short: '-p PERIOD',
@@ -193,7 +200,12 @@ class Graphite < Sensu::Plugin::Check::CLI
     end
 
     req.set_form_data(params)
-    resp = Net::HTTP.new(graphite_url.host, graphite_url.port).start { |http| http.request(req) }
+    nethttp = Net::HTTP.new(graphite_url.host, graphite_url.port)
+    if graphite_url.scheme == 'https'
+      nethttp.use_ssl = true
+    end
+    resp = nethttp.start { |http| http.request(req) }
+
     data = JSON.parse(resp.body)
     @graphite_cache[target] = []
     if data.size > 0
@@ -335,7 +347,7 @@ class Graphite < Sensu::Plugin::Check::CLI
           when 'fatal'
             fatal << text
           else
-            fail "Unknown type #{type}"
+            raise "Unknown type #{type}"
           end
           break if config[:short_output]
         end
@@ -372,7 +384,7 @@ class Graphite < Sensu::Plugin::Check::CLI
           when 'fatal'
             fatal << text
           else
-            fail "Unknown type #{type}"
+            raise "Unknown type #{type}"
           end
           break if config[:short_output]
         end
@@ -412,7 +424,7 @@ class Graphite < Sensu::Plugin::Check::CLI
           when 'fatal'
             fatal << text
           else
-            fail "Unknown type #{type}"
+            raise "Unknown type #{type}"
           end
           break if config[:short_output]
         end
@@ -422,14 +434,13 @@ class Graphite < Sensu::Plugin::Check::CLI
   end
 
   def check_last(target, max_values)
-    last_targets = last_graphite_metric target
+    last_targets = last_graphite_value target
     return [[], [], []] unless last_targets
     warnings = []
     criticals = []
     fatal = []
     # #YELLOW
-    last_targets.each do |target_name, last|
-      last_value = last.first
+    last_targets.each do |target_name, last_value|
       unless last_value.nil?
         # #YELLOW
         %w(fatal error warning).each do |type|
@@ -438,7 +449,7 @@ class Graphite < Sensu::Plugin::Check::CLI
           var1 = config[:greater_than] ? last_value : max_value.to_f
           var2 = config[:greater_than] ? max_value.to_f : last_value
           if var1 > var2
-            text = "The metric #{target_name} is #{last_value} that is #{greater_less} than max allowed #{max_value}"
+            text = "The metric #{target_name} is #{last_value} that is #{greater_less} than last allowed #{max_value}"
             case type
             when 'warning'
               warnings << text
@@ -447,7 +458,7 @@ class Graphite < Sensu::Plugin::Check::CLI
             when 'fatal'
               fatal << text
             else
-              fail "Unknown type #{type}"
+              raise "Unknown type #{type}"
             end
             break if config[:short_output]
           end
@@ -457,8 +468,8 @@ class Graphite < Sensu::Plugin::Check::CLI
     [warnings, criticals, fatal]
   end
 
-  def run
-    targets = config[:target].split(',')
+  def run # rubocop:disable AbcSize
+    targets = config[:complex_target] ? [config[:target]] : config[:target].split(',')
     @period = config[:period]
     critical_errors = []
     warnings = []
@@ -510,11 +521,11 @@ class Graphite < Sensu::Plugin::Check::CLI
       criticals_string = criticals_string + "\nGraphite WARNING: " + warnings_string if warnings.size > 0
       critical fatals_string if fatals.size > 0
       critical criticals_string if critical_errors.size > 0
-      warning warnings_string if warnings.size > 0
+      warning warnings_string if warnings.size > 0 # rubocop:disable Style/IdenticalConditionalBranches
     else
       critical fatals_string if fatals.size > 0
       critical criticals_string if critical_errors.size > 0
-      warning warnings_string if warnings.size > 0
+      warning warnings_string if warnings.size > 0 # rubocop:disable Style/IdenticalConditionalBranches
     end
     ok
   end

data/bin/handler-graphite-event.rb

@@ -2,7 +2,7 @@
 #
 # Sensu - Graphite Event Handler
 #
-# This handler takes events and POSTs them to a graphite events URI.
+# This handler takes events and POSTs them to a Graphite events URI.
 #
 # For configuration see: graphite_event.json
 #
@@ -73,6 +73,6 @@ class GraphiteEvent < Sensu::Handler
       bail "failed to send event to #{uri}: #{e}"
     end
 
-    puts "sent event to graphite: #{body.to_json}"
+    puts "sent event to Graphite: #{body.to_json}"
   end
 end

data/bin/handler-graphite-notify.rb

@@ -3,7 +3,7 @@
 # Released under the same terms as Sensu (the MIT license); see LICENSE
 # for details
 #
-# This will send a 1 to a graphite metric when an event is created and 0 when it's resolved
+# This will send a 1 to a Graphite metric when an event is created and 0 when it's resolved
 # See http://imansson.wordpress.com/2012/11/26/why-sensu-is-a-monitoring-router-some-cool-handlers/
 
 require 'sensu-handler'
@@ -15,7 +15,7 @@ class Resolve < Sensu::Handler
     graphite = Graphite.new(host: settings['graphite_notify']['host'], port: port)
     return unless graphite
     prop = @event['action'] == 'create' ? 1 : 0
-    message = "#{settings['graphite_notify']['prefix']}.#{@event['client']['name'].gsub('.', '_')}.#{@event['check']['name']}"
+    message = "#{settings['graphite_notify']['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
     message += " #{prop} #{graphite.time_now + rand(100)}"
     begin
       graphite.push_to_graphite do |graphite_socket|

data/bin/handler-graphite-occurrences.rb

@@ -12,14 +12,14 @@ class GraphiteOccurrences < Sensu::Handler
   def filter; end
 
   def handle
-    hostname = @event['client']['name'].split('.').first
+    hostname = @event['client']['name']
     # #YELLOW
     check_name = @event['check']['name'].gsub(%r{[ \.]}, '_')
     value = @event['action'] == 'create' ? @event['occurrences'] : 0
     now = Time.now.to_i
 
-    # Get graphite-like format for sensu events here
-    check_occurences = "sensu.#{hostname}.#{check_name} #{value} #{now}"
+    # Get Graphite-like format for Sensu events here
+    check_occurrences = "sensu.#{hostname}.#{check_name} #{value} #{now}"
 
     graphite_server = settings['graphite']['server']
     graphite_port = settings['graphite']['port']
@@ -27,13 +27,13 @@ class GraphiteOccurrences < Sensu::Handler
     begin
       timeout(3) do
         sock = TCPSocket.new(graphite_server, graphite_port)
-        sock.puts check_occurences
+        sock.puts check_occurrences
         sock.close
       end
     rescue Timeout::Error
-      puts 'graphite -- timed out while sending check occurrence'
+      puts 'Graphite -- timed out while sending check occurrence'
     rescue => error
-      puts "graphite -- failed to send check occurrence: #{error}"
+      puts "Graphite -- failed to send check occurrence: #{error}"
     end
   end
 end

data/bin/mutator-graphite.rb

@@ -9,10 +9,18 @@
 #   (so you don't need to use OnlyCheckOutput) and it also modifies
 #   the format of the hostname in the output if present.
 #
+#   Note however that using this mutator as a mutator command can be very
+#   expensive, as Sensu has to spawn a new Ruby process to launch this script
+#   for each result of a metrics check. Consider instead producing the correct
+#   metric names from your plugin and sending them directly to Graphite via the
+#   socket handler.
+#   See https://groups.google.com/d/msg/sensu-users/1hkRSvL48ck/8Dhl98lR24kJ
+#   for more information.
+#
 # OUTPUT:
 #   Sensu event output with all dots changed to underlines in host name
 #   If -r or --reverse parameter given script put hostname in reverse order
-#   for better graphite tree view
+#   for better Graphite tree view
 #
 # PLATFORM:
 #   all
@@ -32,5 +40,5 @@ event = JSON.parse(STDIN.read, symbolize_names: true)
 if ARGV[0] == '-r' || ARGV[0] == '--reverse'
   puts event[:check][:output].gsub(event[:client][:name], event[:client][:name].split('.').reverse.join('.'))
 else
-  puts event[:check][:output].gsub(event[:client][:name], event[:client][:name].gsub('.', '_'))
+  puts event[:check][:output].gsub(event[:client][:name], event[:client][:name].tr('.', '_'))
 end

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

@@ -28,21 +28,21 @@ module SensuPluginsGraphite
           },
 
           username: {
-            description: 'username for basic http authentication',
+            description: 'Username for basic HTTP authentication',
             short: '-u USERNAME',
             long: '--user USERNAME',
             required: false
           },
 
           password: {
-            description: 'user password for basic http authentication',
+            description: 'User password for basic HTTP authentication',
             short: '-p PASSWORD',
             long: '--pass PASSWORD',
             required: false
           },
 
           passfile: {
-            description: 'password file path for basic http authentication',
+            description: 'Password file path for basic HTTP authentication',
             short: '-P PASSWORDFILE',
             long: '--passfile PASSWORDFILE',
             required: false
@@ -87,6 +87,13 @@ module SensuPluginsGraphite
             default: '-10mins'
           },
 
+          until: {
+            description: 'Get samples ending at UNTIL (default: now)',
+            short: '-l UNTIL',
+            long: '--until UNTIL',
+            default: 'now'
+          },
+
           warning: {
             description: 'Generate warning if number of hosts is below received value',
             short: '-w VALUE',
@@ -102,7 +109,7 @@ module SensuPluginsGraphite
           },
 
           below: {
-            description: 'alert if number of hosts below specified thresholds',
+            description: 'Alert if number of hosts is below specified thresholds',
             short: '-b',
             long: '--below'
           }

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

@@ -94,17 +94,17 @@ module SensuPluginsGraphite
               format_output(json_data)
             end
           rescue OpenURI::HTTPError => e
-            raise ProxyError.new('Failed to connect to graphite server', exception: 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)
+            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)
+            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)
+            raise ProxyError.new('End of file error when reading from Graphite server', exception: e)
           rescue => e
-            raise ProxyError.new("An unknown error occured: #{e.inspect}", exception: e)
+            raise ProxyError.new("An unknown error occurred: #{e.inspect}", exception: e)
           end
         end
       end

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

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

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-09-29 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats
@@ -106,143 +84,142 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: |-
-  This plugin provides native Graphite instrumentation
-                                for monitoring, including: replication status,
-                                various Graphite data queries, mutators, and handlers
-email: "<sensu-users@googlegroups.com>"
+description: ! "This plugin provides native Graphite instrumentation\n                              for
+  monitoring, including: replication status,\n                              various
+  Graphite data queries, mutators, and handlers"
+email: <sensu-users@googlegroups.com>
 executables:
-- mutator-graphite.rb
-- handler-graphite-occurrences.rb
-- handler-graphite-notify.rb
-- handler-graphite-event.rb
-- check-graphite.rb
-- check-graphite-stats.rb
-- check-graphite-replication.rb
-- check-graphite-hosts.rb
 - check-graphite-data.rb
+- check-graphite-hosts.rb
+- check-graphite-replication.rb
+- check-graphite-stats.rb
+- check-graphite.rb
+- handler-graphite-event.rb
+- handler-graphite-notify.rb
+- handler-graphite-occurrences.rb
+- mutator-graphite.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -266,7 +243,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-graphite
 licenses:
 - MIT
 metadata:
-  maintainer: "@mattyjones"
+  maintainer: ! '@mattyjones'
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -278,17 +255,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for graphite

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-�s��l�
-���!4��~�2!�~�4�c���?�����4?�������G�t$�,?�6�c�G�ܘ�n-�P��_�k㗃�:3?�
-�qű���,�oe?�t#6�b��Y��!^f�����$P��HB�Bb2�s�-5l):�&�e��D?�l�+}�ἯD�ڠ�^	_�F�q�� ���

metadata.gz.sig

@@ -1,3 +0,0 @@
-V��0r3k�������	壐(�ۙy
-��%��m�g���ae�Ӥ���U�ń��ذ�z�h��\2 	�9�a�Wܓg�c;I�TYN�|�8x��"}�浮���
-�0�����5�t�2%�i{"}+gh.��P8&6F�`�ۭQyI��hW���}��y+�Q�Ņ�w�T��'�𓋝x����㾀@@ŘP�o�{׈��W���j'����L�x!�ëO�Bcɽ�t�)���Y1�56�l�RVI