chef-handler-splunk 1.1.0 → 2.0.0

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+Change Log for Chef Exception & Reporting Handler for Splunk.
+
+## v2.0.0
+
+* Enhance : Changed namespace of handler to `Chef::Handler::SplunkHandler`
+  to avoid conflict with `Splunk` Module from the Splunk Cookbook.

data/README.md

@@ -6,18 +6,24 @@ A Chef Exception & Reporting Handler for [Splunk](http://www.splunk.com).
 Usage
 =====
 
-1. Download and Install [Splunk](http://www.splunk.com/download).
-2. Download the [chef_handler](http://community.opscode.com/cookbooks/chef_handler)
+Via Cookbook (preferred)
+------------------------
+See the [splunk_handler](https://github.com/ampledata/splunk_handler)
 Cookbook.
-3. Given your Splunk username as USER, Splunk password as PASS, and
-   Splunk host as HOST, create a Recipe similar to the one below:
+
+Via Recipe (old, non-preferred)
+-------------------------------
+1. Add the [chef_handler](http://community.opscode.com/cookbooks/chef_handler)
+Cookbook to a Node's Run List.
+2. Given a Splunk username as USER, password as PASS, and
+   host name as HOST, create a Recipe similar to the one below:
 
 ```ruby
 include_recipe 'chef_handler'
 
 gem_package('chef-handler-splunk'){action :nothing}.run_action(:install)
 
-chef_handler 'Chef::Handler::Splunk' do
+chef_handler 'Chef::Handler::SplunkHandler' do
   action :enable
   arguments ['username', 'password', 'host']
   source File.join(Gem.all_load_paths.grep(/chef-handler-splunk/).first,
@@ -25,12 +31,14 @@ chef_handler 'Chef::Handler::Splunk' do
 end
 ```
 
-See also: [Enable Chef Handler with LWRP](http://wiki.opscode.com/display/chef/Distributing+Chef+Handlers#DistributingChefHandlers-EnabletheChefHandlerwiththe%7B%7Bchefhandler%7D%7DLWRP)
+Source
+======
+* [chef-handler-splunk gem](https://github.com/ampledata/chef-handler-splunk)
+* [handler_splunk Cookbook](https://github.com/ampledata/handler_splunk)
 
 Author
 ======
-Greg Albrecht <gba@splunk.com>
-
+Greg Albrecht <mailto:gba@splunk.com>
 
 Copyright
 =========
@@ -38,4 +46,4 @@ Copyright 2012 Splunk Inc.
 
 License
 =======
-Apache License 2.0. Please see LICENSE.
+Apache License 2.0. See LICENSE.txt

data/lib/chef/handler/splunk.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # Chef Exception & Reporting Handler for Splunk.
 #
-# https://github.com/ampledata/chef-handler-splunk
-#
+# Source:: https://github.com/ampledata/chef-handler-splunk
 # Author:: Greg Albrecht <mailto:gba@splunk.com>
 # Copyright:: Copyright 2012 Splunk, Inc.
 # License:: Apache License 2.0.
@@ -17,8 +16,8 @@ require 'rest-client'
 
 class Chef
   class Handler
-    class Splunk < Chef::Handler
-      VERSION = '1.1.0'
+    class SplunkHandler < Chef::Handler
+      VERSION = '2.0.0'
       API_ENDPOINT = 'services/receivers/simple'
 
       # * *Args*:
@@ -33,7 +32,8 @@ class Chef
                      scheme='https')
         @username = username
         @password = password
-        @splunk_url = "#{scheme}://#{host}:#{port}/"
+        @splunk_url = URI::HTTP.new(
+          scheme, nil, host, port, nil, nil, nil, nil, nil).to_s
         @index = index
       end
 
@@ -43,7 +43,8 @@ class Chef
           :sourcetype => 'json',
           :source => 'chef-handler',
           :host => node.hostname,
-          :index => @index}
+          :index => @index
+        }
 
         # We're creating a new Hash b/c 'node' and 'all_resources' in run_status
         # are just TOO large.
@@ -52,7 +53,8 @@ class Chef
           :start_time => run_status.start_time,
           :end_time => run_status.end_time,
           :elapsed_time => run_status.elapsed_time,
-          :exception => run_status.formatted_exception}.to_json
+          :exception => run_status.formatted_exception
+        }.to_json
 
         splunk_post(event, metadata)
       end
@@ -63,7 +65,8 @@ class Chef
           :sourcetype => 'json_chef-resources',
           :source => 'chef-handler',
           :host => node.hostname,
-          :index => @index}
+          :index => @index
+        }
         event = run_status.updated_resources.to_json
 
         splunk_post(event, metadata)
@@ -75,7 +78,8 @@ class Chef
           :sourcetype => 'chef-handler-backtrace',
           :source => 'chef-handler',
           :host => node.hostname,
-          :index => @index}
+          :index => @index
+        }
         event = Array(run_status.backtrace).join("\n")
 
         splunk_post(event, metadata)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-handler-splunk
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Greg Albrecht
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-07 00:00:00 Z
+date: 2012-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -54,10 +54,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- LICENSE
+- LICENSE.txt
 - README.md
+- CHANGELOG.md
 - lib/chef/handler/splunk.rb
-homepage: http://ampledata.org/splunk_chef_handler.html
+homepage: https://github.com/ampledata/chef-handler-splunk
 licenses: []
 
 post_install_message: