Adding option -j to allow configuration scope to be defined on command

line

Author: dalesit

CHANGELOG.md

@@ -6,6 +6,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ## [Unreleased]
 ### Added
 - example in readme for using the handlers (@scosist)
+### Changed
+- Added option -j to handler-graphite-notify.rb and handler-graphite-status.rb to allow configuration scope to be defined on command line.
 
 ## [2.2.1] - 2017-06-13
 ### Fixed

README.md

@@ -16,6 +16,7 @@
  * bin/extension-graphite
  * bin/handler-graphite-event
  * bin/handler-graphite-notify
+ * bin/handler-graphite-status
  * bin/handler-graphite-occurrences
  * bin/mutator-graphite
 

bin/handler-graphite-notify.rb

@@ -5,24 +5,35 @@
 #
 # 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/
+#
+# Config by default is graphite_notify, but can be called with a specific json config
+# using the -j option. This allows multiple graphite handlers to be configured.
 
 require 'sensu-handler'
 require 'simple-graphite'
 
 class Resolve < Sensu::Handler
+  option :json_config,
+         description: 'Config Name',
+         short: '-j JsonConfig',
+         long: '--json_config JsonConfig',
+         required: false,
+         default: 'graphite_notify'
+
   def handle
-    port = settings['graphite_notify']['port'] ? settings['graphite_notify']['port'].to_s : '2003'
-    graphite = Graphite.new(host: settings['graphite_notify']['host'], port: port)
+    json_config = config[:json_config]
+    port = settings[json_config]['port'] ? settings[json_config]['port'].to_s : '2003'
+    graphite = Graphite.new(host: settings[json_config]['host'], port: port)
     return unless graphite
     prop = @event['action'] == 'create' ? 1 : 0
-    message = "#{settings['graphite_notify']['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
+    message = "#{settings[json_config]['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
     message += " #{prop} #{graphite.time_now + rand(100)}"
     begin
       graphite.push_to_graphite do |graphite_socket|
         graphite_socket.puts message
       end
-    rescue => e
-      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}: #{e}'"
+    rescue ETIMEDOUT
+      error_msg = "Can't connect to #{settings[json_config]['host']}:#{port} and send message #{message}'"
       raise error_msg
     end
   end

bin/handler-graphite-status.rb

@@ -4,29 +4,37 @@
 # for details
 #
 # This will send the check status (0,1,2,3) to a graphite metric when a check event state changes
-# Based on handler-graphite-notify.rb
-# See http://imansson.wordpress.com/2012/11/26/why-sensu-is-a-monitoring-router-some-cool-handlers/
+# Based on handler-graphite-notify.rb.
+# Config by default is graphite_status but can be called with a specific json config
+# using the -j option. This allows multiple graphite handlers to be configured.
 
 require 'sensu-handler'
 require 'simple-graphite'
 
 class Resolve < Sensu::Handler
+  option :json_config,
+         description: 'Config Name',
+         short: '-j JsonConfig',
+         long: '--json_config JsonConfig',
+         required: false,
+         default: 'graphite_status'
   # 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)
+    json_config = config[:json_config]
+    port = settings[json_config]['port'] ? settings[json_config]['port'].to_s : '2003'
+    graphite = Graphite.new(host: settings[json_config]['host'], port: port)
     return unless graphite
     prop = @event['check']['status']
-    message = "#{settings['graphite_notify']['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
+    message = "#{settings[json_config]['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
     message += " #{prop} #{graphite.time_now + rand(100)}"
     begin
       graphite.push_to_graphite do |graphite_socket|
         graphite_socket.puts message
       end
-    rescue => e
-      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}: #{e}'"
+    rescue ETIMEDOUT
+      error_msg = "Can't connect to #{settings[json_config]['host']}:#{port} and send message #{message}'"
       raise error_msg
     end
   end