sensu-plugins-graphite 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652a431ad40e8910a4a2a006cce0d85577c7904a
-  data.tar.gz: 47002818adf4e226e4b69a0d0ea470d1cee0f456
+  metadata.gz: c8723bd63f1daa64ac49473016cf5163521a3f5c
+  data.tar.gz: 213141cd8365208987bd97c04ee9b6be16079385
 SHA512:
-  metadata.gz: e3145d2716aef707c3f20b545db71f698cb2c4026bb46165a77dc857fc5498f3d5d7a1887d6ffa63997bcf5db67a2abf9d280f2e7bd53df0e46802905be7977f
-  data.tar.gz: 69cb43e03d65f78e047505912443b46a13b626aab6b17e2f3643ac78863bf78878ad05b270f253bd20d3d79119d708781f1b757c5d5a8818430e79030fdfc59f
+  metadata.gz: 2da33de6c6be603ade77bca6e452e3ddbacf96901d7a20401ed7289e1ebc256d7bb15aec4f33d3dd02cd73379a52932d0232f4d32dd87cc3029de65d675e830a
+  data.tar.gz: 04207e317401a8ce9363d5a9eaa63d26265a18ef97b4108860e54f65031dae05284b6d2a356e40db1a29007d14348d1ff1f14d4f4cdc5bb44ef0af3eebf9c6c4

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.3.0] - 2017-10-19
+### 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
 - Remove short options -s on hostname_sub, it was unusable. This affects check-graphite-data and check check-graphite-hosts
@@ -78,6 +84,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.2.1...HEAD
+[2.3.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.0.0...2.1.0

data/README.md

@@ -16,12 +16,13 @@
  * bin/extension-graphite
  * bin/handler-graphite-event
  * bin/handler-graphite-notify
+ * bin/handler-graphite-status
  * bin/handler-graphite-occurrences
  * bin/mutator-graphite
 
 ## Usage
 
-**handler-graphite-event**
+### handler-graphite-event
 ```
 {
   "graphite_event": {
@@ -34,7 +35,7 @@
 }
 ```
 
-**handler-graphite-occurrences**
+### handler-graphite-occurrences
 ```
 {
  "graphite": {
@@ -44,7 +45,7 @@
 }
 ```
 
-**handler-graphite-notify**
+### handler-graphite-notify
 ```
 {
  "graphite_notify": {
@@ -55,10 +56,10 @@
 }
 ```
 
-**handler-graphite-status**
+### handler-graphite-status
 ```
 {
- "graphite_notify": {
+ "graphite_status": {
     "host":"graphite.example.com",
     "port":"2003",
     "prefix":"sensu.events"
@@ -66,6 +67,59 @@
 }
 ```
 
+## Full Configuration Example
++**Note that TCP Handler is preferred**
+```
+{
+  "graphite_event": {
+    "server_uri": "https://graphite.example.com:443/events/",
+    "tags": [
+      "custom_tag_a",
+      "custom_tag_b"
+    ]
+  },
+  "handlers":
+  {
+    "default": {
+      "type": "set",
+      "handlers": [
+        "graphite_event"
+      ]
+    },
+    "graphite_tcp": {
+      "type": "tcp",
+      "socket": {
+        "host":"graphite.example.com",
+        "port":2003
+      },
+      "mutator": "only_check_output"
+    },
+    "graphite_event": {
+      "type": "pipe",
+      "filters": [
+        "custom_filter_a",
+        "custom_filter_b"
+      ],
+      "command": "handler-graphite-event.rb"
+    }
+  },
+  "checks": {
+    "metrics_uptime": {
+      "standalone": true,
+      "type": "metric",
+      "handlers": [
+        "graphite_tcp"
+      ],
+      "interval": 60,
+      "command": "metrics-uptime.rb --scheme sensu.host.$(hostname).uptime",
+      "subscribers": [
+        "core"
+      ]
+    }
+  }
+}
+```
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/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

data/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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-graphite
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for graphite