chef-handler-riemann 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a66d3b1ce9b0176e8a14b881c13ada35abf952a
-  data.tar.gz: 8fddfd25866add5d7da3e3266c93bab034014829
+  metadata.gz: fc3804398913092c87c0c48205ce742f2e46f09b
+  data.tar.gz: ca10b6bb28095a395871eaca3dfd6ce1bd49a8b5
 SHA512:
-  metadata.gz: 3f0115a248733f7723b07451b71e0103f052f9d11edd3a49de8b57492720fd268e15b962dafb660257aaf4a5fab7837ffb7e344b7bc8e1f43bb1e2c798916d8d
-  data.tar.gz: cf3293717e608225f18683771a0f4a35a7cf113c6543c9a1b475ff3dc06b8d32649ddadec2eb921fbe2b5ff65cd04fa9a97cdf387eb6c6c99842b3c2345353c1
+  metadata.gz: e01c327d8232ddee3816cd73946b05540f015aff9ff29d43fc43d1f36c5e2cd101a7dffd5177b1c34971e44a8bf66c3dff988121def6abb58ef9b13f69fb6ed3
+  data.tar.gz: cf80b8a484711e6218be5896a96a5497bc3ae547c73b25a36915545b8277944b0cd72c5504a46866a9544136e419f83748f426a8ac976ecb7fa60a48af7d2ac0

data/README.md

@@ -1,20 +1,25 @@
 # chef-handler-riemann
+
 Chef Handler that reports to Riemann.
 
 It reports when the Chef run starts and finishes, and outputs associated events depending on outcome.
 
 # Usage
 
-TODO: Need to integrate into `chef_handler` cookbook for installation. It will need to install `riemann-client` via `chef_gem`
+This is available as a [gem](https://rubygems.org/gems/chef-handler-riemann)
 
-Editing client.rb works though:
+Because this handler has support for start events, you can't use the `chef_handler` cookbook. Instead, it needs to be added to `client.rb`. The community [chef-client](https://github.com/opscode-cookbooks/chef-client) cookbook can help with this, as it provides easy methods for making `client.rb` load the gem and add the handler. Example usage:
 
 ```
-require '/var/chef/handlers/riemann.rb'
-
-riemann = DataSift::RiemannHandler.new host: '192.168.122.1', port: 5555, timeout: 5, ttl: 120
+# Riemann handler
+node.default['chef_client']['load_gems']['chef-handler-riemann'] = {}
 
-start_handlers << riemann
-report_handlers << riemann
-exception_handlers << rieman
+[ 'start', 'report', 'exception' ].each do |type|
+  node.default['chef_client']['config']["#{type}_handlers"] = [
+    {
+      :class => "Chef::Handler::Riemann",
+      :arguments => [ { :host => "localhost" } ]
+    }
+  ]
+end
 ```

data/lib/chef/handler/riemann.rb

@@ -4,12 +4,13 @@ require 'riemann/client'
 class Chef
   class Handler
     class Riemann < ::Chef::Handler
-      attr_writer :host, :port, :ttl, :timeout
+      attr_writer :host, :port, :ttl_running, :ttl_finished, :timeout
 
       def initialize(options={})
         @host = options[:host] || 'localhost'
         @port = options[:port] || 5555
-        @ttl = options[:ttl] || 3600 # seems reasonable given chef runs every 30 mins by default
+        @ttl_running = options[:ttl] || 600
+        @ttl_finished = options[:ttl] || 3600 # seems reasonable given chef runs every 30 mins by default
         @timeout = options[:timeout] || 5
       end
 
@@ -23,7 +24,8 @@ class Chef
             riemann << {
               :service => 'process:chef-client:state',
               :state => 'running',
-              :description => "Chef run has started at #{start_time}"
+              :description => "Chef run has started at #{start_time}",
+              :ttl => @ttl_running
             }
           else
             # chef run has completed
@@ -35,19 +37,19 @@ class Chef
                 state: 'ok',
                 description: "Chef succeeded at #{end_time}",
                 metric: elapsed_time,
-                ttl: @ttl
+                ttl: @ttl_finished
               }
 
               riemann << {
                 service: "process:chef-client:updated_resources",
                 metric:  run_status.updated_resources.length,
-                ttl: @ttl
+                ttl: @ttl_finished
               }
 
               riemann << {
                 service: "process:chef-client:all_resources",
                 metric: run_status.all_resources.length,
-                ttl: @ttl
+                ttl: @ttl_finished
               }
             else
               riemann << {
@@ -55,7 +57,7 @@ class Chef
                 state: 'critical',
                 description: "Chef failed at #{end_time}: " + run_status.formatted_exception,
                 metric: elapsed_time,
-                ttl: @ttl
+                ttl: @ttl_finished
               }
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-riemann
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alex Forrow