chef-handler-datadog 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 345202254b0a6790a4ee591adfeceb1b6fe4987b
-  data.tar.gz: 95b4da8f05b6179952e61a984ad683e83c11eae0
+  metadata.gz: 8c54065be2df326d6779153aaecf8bfaa3e078d6
+  data.tar.gz: 92eb9edaf6c4d5bcf82d0e4ee0f5bafcf9ffcf2c
 SHA512:
-  metadata.gz: 672bc2ade623d4afda862b27b66d7301ea05ce1efe0404811bd9c99a36ce69c900e9cdd233165317c946f9891c23d313328c7effd8bb95185236b3043368ea00
-  data.tar.gz: 1565a34fa7063abe4db33ee64b724c1a7189b2d8a5478bdb46e18d00ebf8ad07497f6862f772e3b97bb2859bae4f4ccd2847b36093565263c47f22456b69321f
+  metadata.gz: d76b01f151c3d3e4e20784ab2713f952621b83f5097ea1298dfe4f69e8ba318315298c090bc300915570b56afad4f13981bfc193b37133977e8d97ce2379e62b
+  data.tar.gz: e915c78a1b3689edb2691267b01288ee032494cce9d69143d7518c1aca8626ba8cced4ca7f954133e733e2ada8ede3326a85e7f9edf8dffb3fb408a06218be50

data/.env.example

@@ -0,0 +1,2 @@
+API_KEY: myapikey
+APPLICATION_KEY: chefhandlerspecificapplicationkey

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changes
 =======
 
+# 0.8.0 / 2016-03-01
+
+* [FEATURE] Add success/failure metric [#75][] [@jhulten][]
+* [FEATURE] Retry tags submission when host is not yet present on DD [#80][] [@olivielpeau][]
+* [OPTIMIZE] Ensure tags always returns an array [#78][] [@rlaveycal][]
+* [OPTIMIZE] More robust failed chef run checking [#69][] [@bigbam505][]
+
 # 0.7.0 / 2015-10-22
 
 * [FEATURE] Support passing `DATADOG_PROXY` env var to control `dogapi` behavior, [#65][] [@datwiz][]
@@ -73,9 +80,17 @@ And all other versions were prior to this. See git history for more.
 [#60]: https://github.com/DataDog/chef-handler-datadog/issues/60
 [#65]: https://github.com/DataDog/chef-handler-datadog/issues/65
 [#66]: https://github.com/DataDog/chef-handler-datadog/issues/66
+[#69]: https://github.com/DataDog/chef-handler-datadog/issues/69
+[#75]: https://github.com/DataDog/chef-handler-datadog/issues/75
+[#78]: https://github.com/DataDog/chef-handler-datadog/issues/78
+[#80]: https://github.com/DataDog/chef-handler-datadog/issues/80
 [@alq]: https://github.com/alq
+[@bigbam505]: https://github.com/bigbam505
 [@datwiz]: https://github.com/datwiz
 [@dwradcliffe]: https://github.com/dwradcliffe
+[@jhulten]: https://github.com/jhulten
 [@miketheman]: https://github.com/miketheman
+[@olivielpeau]: https://github.com/olivielpeau
 [@owen]: https://github.com/owen
 [@remh]: https://github.com/remh
+[@rlaveycal]: https://github.com/rlaveycal

data/Rakefile

@@ -14,3 +14,10 @@ CLEAN.include(['coverage/', 'doc/', 'pkg/'])
 RSpec::Core::RakeTask.new(:spec)
 
 RuboCop::RakeTask.new(:cops)
+
+namespace :dev do
+  task :setup do
+    cp '.env.example', '.env'
+    Rake::Task[:default].invoke
+  end
+end

data/lib/chef/handler/datadog.rb

@@ -55,6 +55,7 @@ class Chef
             .with_hostname(hostname)
             .with_run_status(run_status)
             .with_application_key(config[:application_key])
+            .with_retries(@config[:tags_submission_retries])
 
         # Build the chef event information
         @event =

data/lib/chef/handler/datadog_chef_metrics.rb

@@ -38,10 +38,13 @@ class DatadogChefMetrics
 
   # Emit Chef metrics to Datadog
   def emit_to_datadog
+    # Send base success/failure metric
+    @dog.emit_point(@run_status.success? ? 'chef.run.success' : 'chef.run.failure', 1, host: @hostname, type: 'counter')
+
     # If there is a failure during compile phase, a large portion of
     # run_status may be unavailable. Bail out here
     warn_msg = 'Error during compile phase, no Datadog metrics available.'
-    return Chef::Log.warn(warn_msg) if @run_status.elapsed_time.nil?
+    return Chef::Log.warn(warn_msg) if compile_error?
 
     @dog.emit_point('chef.resources.total', @run_status.all_resources.length, host: @hostname)
     @dog.emit_point('chef.resources.updated', @run_status.updated_resources.length, host: @hostname)
@@ -50,4 +53,10 @@ class DatadogChefMetrics
   rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
     Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
   end
+
+  private
+
+  def compile_error?
+    @run_status.all_resources.nil? || @run_status.elapsed_time.nil? || @run_status.updated_resources.nil?
+  end
 end # end class DatadogChefMetrics

data/lib/chef/handler/datadog_chef_tags.rb

@@ -10,6 +10,7 @@ class DatadogChefTags
     @node = nil
     @run_status = nil
     @application_key = nil
+    @retries = 0
     @combined_host_tags = nil
   end
 
@@ -76,19 +77,39 @@ class DatadogChefTags
     self
   end
 
+  # set the number of retries when sending tags, when the host is not yet present
+  # on Datadog
+  #
+  # @param retries [Integer] number of retries
+  # @return [DatadogChefTags] instance reference to self enabling method chaining
+  def with_retries(retries)
+    @retries = retries unless retries.nil?
+    self
+  end
+
   # send updated chef run generated tags to Datadog
   def send_update_to_datadog
-    rc = @dog.update_tags(@hostname, combined_host_tags, 'chef')
+    retries = @retries
     begin
-      # See FIXME above about why I feel dirty repeating this code here
-      if rc.length < 2
-        Chef::Log.warn("Unexpected response from Datadog Event API: #{rc}")
-      else
-        if rc[0].to_i / 100 != 2
-          Chef::Log.warn("Could not submit #{combined_host_tags} tags for #{@hostname} to Datadog: #{rc}")
+      loop do
+        should_retry = false
+        rc = @dog.update_tags(@hostname, combined_host_tags, 'chef')
+        # See FIXME in DatadogChefEvents::emit_to_datadog about why I feel dirty repeating this code here
+        if rc.length < 2
+          Chef::Log.warn("Unexpected response from Datadog Tags API: #{rc}")
         else
-          Chef::Log.debug("Successfully updated #{@hostname}'s tags to #{combined_host_tags.join(', ')}")
+          if retries > 0 && rc[0].to_i == 404
+            Chef::Log.debug("Host #{@hostname} not yet present on Datadog, re-submitting tags in 2 seconds")
+            sleep 2
+            retries -= 1
+            should_retry = true
+          elsif rc[0].to_i / 100 != 2
+            Chef::Log.warn("Could not submit #{combined_host_tags} tags for #{@hostname} to Datadog: #{rc}")
+          else
+            Chef::Log.debug("Successfully updated #{@hostname}'s tags to #{combined_host_tags.join(', ')}")
+          end
         end
+        break unless should_retry
       end
     rescue
       Chef::Log.warn("Could not determine whether #{@hostname}'s tags were successfully submitted to Datadog: #{rc}")
@@ -106,6 +127,6 @@ class DatadogChefTags
   end
 
   def node_tags
-    @node.tags.map! { |tag| 'tag:' + tag } if @node.tags
+    @node.tags ? @node.tags.map! { |tag| 'tag:' + tag } : []
   end
 end # end class DatadogChefTags

data/lib/chef_handler_datadog.rb

@@ -2,5 +2,5 @@
 # Helper module for version number only.
 # Real deal in 'chef/handler/datadog.rb'
 module ChefHandlerDatadog
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/spec/datadog_spec.rb

@@ -56,7 +56,7 @@ describe Chef::Handler::Datadog, :vcr => :new_episodes do
       it 'reports metrics' do
         expect(a_request(:post, METRICS_ENDPOINT).with(
           :query => { 'api_key' => @handler.config[:api_key] }
-        )).to have_been_made.times(3)
+        )).to have_been_made.times(4)
       end
     end
 
@@ -233,6 +233,76 @@ describe Chef::Handler::Datadog, :vcr => :new_episodes do
     end
   end
 
+  context 'tags submission retries' do
+    before(:each) do
+      @node = Chef::Node.build('chef.handler.datadog.test-tags-retries')
+
+      @node.send(:chef_environment, 'hostile')
+      @node.send(:run_list, 'role[highlander]')
+      @node.normal.tags = ['the_one_and_only']
+
+      @events = Chef::EventDispatch::Dispatcher.new
+      @run_context = Chef::RunContext.new(@node, {}, @events)
+      @run_status = Chef::RunStatus.new(@node, @events)
+
+      @expected_time = Time.now
+      allow(Time).to receive(:now).and_return(@expected_time, @expected_time + 5)
+      @run_status.start_clock
+      @run_status.stop_clock
+
+      @run_status.run_context = @run_context
+    end
+
+    describe 'when specified as 2 retries' do
+      before(:each) do
+        @handler.config[:tags_submission_retries] = 2
+        # Stub `sleep` to avoid slowing down the execution
+        allow_any_instance_of(DatadogChefTags).to receive(:sleep)
+      end
+
+      it 'retries no more than twice' do
+        @handler.run_report_unsafe(@run_status)
+
+        expect(a_request(:put, HOST_TAG_ENDPOINT + @node.name).with(
+          :query => { 'api_key' => @handler.config[:api_key],
+                      'application_key' => @handler.config[:application_key],
+                      'source' => 'chef' },
+          :body => hash_including(:tags => [
+            'env:hostile', 'role:highlander', 'tag:the_one_and_only'
+            ]),
+        )).to have_been_made.times(3)
+      end
+
+      it 'stops retrying once submission is successful' do
+        @handler.run_report_unsafe(@run_status)
+
+        expect(a_request(:put, HOST_TAG_ENDPOINT + @node.name).with(
+          :query => { 'api_key' => @handler.config[:api_key],
+                      'application_key' => @handler.config[:application_key],
+                      'source' => 'chef' },
+          :body => hash_including(:tags => [
+            'env:hostile', 'role:highlander', 'tag:the_one_and_only'
+            ]),
+        )).to have_been_made.times(2)
+      end
+    end
+
+    describe 'when not specified' do
+      it 'does not retry after a failed submission'  do
+        @handler.run_report_unsafe(@run_status)
+
+        expect(a_request(:put, HOST_TAG_ENDPOINT + @node.name).with(
+          :query => { 'api_key' => @handler.config[:api_key],
+                      'application_key' => @handler.config[:application_key],
+                      'source' => 'chef' },
+          :body => hash_including(:tags => [
+            'env:hostile', 'role:highlander', 'tag:the_one_and_only'
+            ]),
+        )).to have_been_made.times(1)
+      end
+    end
+  end
+
   describe 'handles no application_key' do
     before(:each) do
       @node = Chef::Node.build('chef.handler.datadog.test-noapp')
@@ -373,10 +443,10 @@ describe Chef::Handler::Datadog, :vcr => :new_episodes do
         @handler.run_report_unsafe(@run_status)
       end
 
-      it 'does not emit metrics' do
+      it 'only emits a failure metric' do
         expect(a_request(:post, METRICS_ENDPOINT).with(
           :query => { 'api_key' => @handler.config[:api_key] }
-        )).to_not have_been_made
+        )).to have_been_made.times(1)
       end
 
       it 'posts an event' do
@@ -387,7 +457,7 @@ describe Chef::Handler::Datadog, :vcr => :new_episodes do
         )).to have_been_made.times(1)
       end
     end
-  end
+  end 
 
     # TODO: test failures:
     # @run_status.exception = Exception.new('Boy howdy!')

data/spec/support/cassettes/Chef_Handler_Datadog/failed_Chef_run/sets_alert_handles_when_specified.yml

@@ -5,10 +5,12 @@ http_interactions:
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.total","points":[[1410264911,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.run.failure","points":[[1453838668,1.0]],"type":"counter","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -19,29 +21,74 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:09 GMT
-      Server:
-      - dogdispatcher/5.2.0
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
+    http_version: 
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
+    body:
+      encoding: UTF-8
+      string: '{"series":[{"metric":"chef.resources.total","points":[[1453838668,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 202
+      message: Accepted
+    headers:
+      Content-Type:
+      - text/json
+      Date:
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
+      Content-Length:
+      - '16'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.updated","points":[[1410264911,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.resources.updated","points":[[1453838668,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -52,29 +99,35 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:09 GMT
-      Server:
-      - dogdispatcher/5.1.1
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.elapsed_time","points":[[1410264911,2.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.resources.elapsed_time","points":[[1453838668,2.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -85,38 +138,43 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:10 GMT
-      Server:
-      - dogdispatcher/5.1.1
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/events?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"msg_text":"Chef updated 6 resources out of 6 resources total.\n$$$\n-
+      string: '{"msg_text":"\n$$$\n- [paws] (dynamically defined)\n- [ears] (dynamically
+        defined)\n- [nose] (dynamically defined)\n- [tail] (dynamically defined)\n-
+        [fur] (dynamically defined)\n\n$$$\n\n$$$\nChef::Exceptions::UnsupportedAction:
+        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1453838668,"msg_title":"Chef
+        failed in 2 seconds on chef.handler.datadog.test-failed ","priority":"normal","parent":null,"tags":["env:hostile","role:highlander","tag:the_one_and_only"],"aggregation_key":"chef.handler.datadog.test-failed","alert_type":"error","event_type":"config_management.run","source_type_name":"chef","title":"Chef
+        failed in 2 seconds on chef.handler.datadog.test-failed ","text":"\n$$$\n-
         [paws] (dynamically defined)\n- [ears] (dynamically defined)\n- [nose] (dynamically
         defined)\n- [tail] (dynamically defined)\n- [fur] (dynamically defined)\n\n$$$\n\n$$$\nChef::Exceptions::UnsupportedAction:
-        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1410264911,"msg_title":"Chef
-        failed in 2 seconds on chef.handler.datadog.test-failed ","priority":"normal","parent":null,"tags":["env:hostile","role:highlander","tag:the_one_and_only"],"aggregation_key":"chef.handler.datadog.test-failed","alert_type":"error","event_type":"config_management.run","source_type_name":"chef","title":"Chef
-        failed in 2 seconds on chef.handler.datadog.test-failed ","text":"Chef updated
-        6 resources out of 6 resources total.\n$$$\n- [paws] (dynamically defined)\n-
-        [ears] (dynamically defined)\n- [nose] (dynamically defined)\n- [tail] (dynamically
-        defined)\n- [fur] (dynamically defined)\n\n$$$\n\n$$$\nChef::Exceptions::UnsupportedAction:
         Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","host":"chef.handler.datadog.test-failed","device":null}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -127,37 +185,39 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/plain; charset=utf-8
       Date:
-      - Tue, 09 Sep 2014 12:15:11 GMT
-      Server:
-      - dogdispatcher/5.2.0
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '729'
+      - '647'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status": "ok", "event": {"priority": "normal", "date_happened":
-        1410264911, "handle": null, "title": "Chef failed in 2 seconds on chef.handler.datadog.test-failed
-        ", "url": "https://app.datadoghq.com/event/jump_to?event_id=2449507845826654380",
-        "text": "Chef updated 6 resources out of 6 resources total.\n$$$\n- [paws]
+      encoding: UTF-8
+      string: '{"status":"ok","event":{"id":381236694692316426,"title":"Chef failed
+        in 2 seconds on chef.handler.datadog.test-failed ","text":"\n$$$\n- [paws]
         (dynamically defined)\n- [ears] (dynamically defined)\n- [nose] (dynamically
         defined)\n- [tail] (dynamically defined)\n- [fur] (dynamically defined)\n\n$$$\n\n$$$\nChef::Exceptions::UnsupportedAction:
-        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n",
-        "tags": ["env:hostile", "role:highlander", "tag:the_one_and_only"], "related_event_id":
-        null, "id": 2449507845826654380}}'
+        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1453838668,"handle":null,"priority":"normal","related_event_id":null,"tags":["env:hostile","role:highlander","tag:the_one_and_only"],"url":"https://app.datadoghq.com/event/event?id=381236694692316426"}}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: put
     uri: https://app.datadoghq.com/api/v1/tags/hosts/chef.handler.datadog.test-failed?api_key=<API_KEY>&application_key=<APPLICATION_KEY>&source=chef
     body:
       encoding: UTF-8
-      string: ! '{"tags":["env:hostile","role:highlander","tag:the_one_and_only"]}'
+      string: '{"tags":["env:hostile","role:highlander","tag:the_one_and_only"]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -172,30 +232,40 @@ http_interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 09 Sep 2014 12:15:11 GMT
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - dogweb_sameorig
       Pragma:
       - no-cache
-      Server:
-      - gunicorn/19.1.0
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
+      X-Dd-Debug:
+      - 4G6DflkbLuEPHPN7r5QLLJW1+B1YXxXufb+VXQ5hU44=
+      X-Frame-Options:
+      - SAMEORIGIN
       Content-Length:
       - '112'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"host": "chef.handler.datadog.test-failed", "tags": ["env:hostile",
+      encoding: UTF-8
+      string: '{"host": "chef.handler.datadog.test-failed", "tags": ["env:hostile",
         "role:highlander", "tag:the_one_and_only"]}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.total","points":[[1410264911,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.run.failure","points":[[1453838668,1.0]],"type":"counter","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -206,29 +276,35 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:12 GMT
-      Server:
-      - dogdispatcher/5.1.1
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.updated","points":[[1410264911,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.resources.total","points":[[1453838668,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -239,29 +315,35 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:12 GMT
-      Server:
-      - dogdispatcher/5.1.1
+      - Tue, 26 Jan 2016 20:04:26 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"series":[{"metric":"chef.resources.elapsed_time","points":[[1410264911,2.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+      string: '{"series":[{"metric":"chef.resources.updated","points":[[1453838668,6.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -272,38 +354,82 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/json
       Date:
-      - Tue, 09 Sep 2014 12:15:13 GMT
-      Server:
-      - dogdispatcher/5.1.1
+      - Tue, 26 Jan 2016 20:04:27 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '15'
+      - '16'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status":"ok"}'
+      encoding: UTF-8
+      string: '{"status": "ok"}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/series?api_key=<API_KEY>
+    body:
+      encoding: UTF-8
+      string: '{"series":[{"metric":"chef.resources.elapsed_time","points":[[1453838668,2.0]],"type":"gauge","host":"chef.handler.datadog.test-failed","device":null}]}'
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 202
+      message: Accepted
+    headers:
+      Content-Type:
+      - text/json
+      Date:
+      - Tue, 26 Jan 2016 20:04:27 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
+      Content-Length:
+      - '16'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"status": "ok"}'
+    http_version: 
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: post
     uri: https://app.datadoghq.com/api/v1/events?api_key=<API_KEY>
     body:
       encoding: UTF-8
-      string: ! '{"msg_text":"Chef updated 6 resources out of 6 resources total.\n$$$\n-
+      string: '{"msg_text":"\n$$$\n- [paws] (dynamically defined)\n- [ears] (dynamically
+        defined)\n- [nose] (dynamically defined)\n- [tail] (dynamically defined)\n-
+        [fur] (dynamically defined)\n\n$$$\n\nAlerting: @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction:
+        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1453838668,"msg_title":"Chef
+        failed in 2 seconds on chef.handler.datadog.test-failed ","priority":"normal","parent":null,"tags":["env:hostile","role:highlander","tag:tag:the_one_and_only"],"aggregation_key":"chef.handler.datadog.test-failed","alert_type":"error","event_type":"config_management.run","source_type_name":"chef","title":"Chef
+        failed in 2 seconds on chef.handler.datadog.test-failed ","text":"\n$$$\n-
         [paws] (dynamically defined)\n- [ears] (dynamically defined)\n- [nose] (dynamically
         defined)\n- [tail] (dynamically defined)\n- [fur] (dynamically defined)\n\n$$$\n\nAlerting:
-        @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction: Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1410264911,"msg_title":"Chef
-        failed in 2 seconds on chef.handler.datadog.test-failed ","priority":"normal","parent":null,"tags":["env:hostile","role:highlander","tag:tag:the_one_and_only"],"aggregation_key":"chef.handler.datadog.test-failed","alert_type":"error","event_type":"config_management.run","source_type_name":"chef","title":"Chef
-        failed in 2 seconds on chef.handler.datadog.test-failed ","text":"Chef updated
-        6 resources out of 6 resources total.\n$$$\n- [paws] (dynamically defined)\n-
-        [ears] (dynamically defined)\n- [nose] (dynamically defined)\n- [tail] (dynamically
-        defined)\n- [fur] (dynamically defined)\n\n$$$\n\nAlerting: @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction:
-        Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","host":"chef.handler.datadog.test-failed","device":null}'
+        @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction: Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","host":"chef.handler.datadog.test-failed","device":null}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -314,37 +440,39 @@ http_interactions:
       message: Accepted
     headers:
       Content-Type:
-      - text/json; charset=UTF-8
+      - text/plain; charset=utf-8
       Date:
-      - Tue, 09 Sep 2014 12:15:13 GMT
-      Server:
-      - dogdispatcher/5.2.0
+      - Tue, 26 Jan 2016 20:04:27 GMT
+      Dd-Pool:
+      - propjoe
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
       Content-Length:
-      - '758'
+      - '676'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"status": "ok", "event": {"priority": "normal", "date_happened":
-        1410264911, "handle": null, "title": "Chef failed in 2 seconds on chef.handler.datadog.test-failed
-        ", "url": "https://app.datadoghq.com/event/jump_to?event_id=2449507892182102265",
-        "text": "Chef updated 6 resources out of 6 resources total.\n$$$\n- [paws]
+      encoding: UTF-8
+      string: '{"status":"ok","event":{"id":381236701686654829,"title":"Chef failed
+        in 2 seconds on chef.handler.datadog.test-failed ","text":"\n$$$\n- [paws]
         (dynamically defined)\n- [ears] (dynamically defined)\n- [nose] (dynamically
         defined)\n- [tail] (dynamically defined)\n- [fur] (dynamically defined)\n\n$$$\n\nAlerting:
-        @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction: Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n",
-        "tags": ["env:hostile", "role:highlander", "tag:tag:the_one_and_only"], "related_event_id":
-        null, "id": 2449507892182102265}}'
+        @alice @bob\n\n$$$\nChef::Exceptions::UnsupportedAction: Something awry.\n$$$\n\n$$$\nwhiskers.rb:2\npaws.rb:1\nfile.rb:2\nfile.rb:1\n$$$\n","date_happened":1453838668,"handle":null,"priority":"normal","related_event_id":null,"tags":["env:hostile","role:highlander","tag:tag:the_one_and_only"],"url":"https://app.datadoghq.com/event/event?id=381236701686654829"}}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
 - request:
     method: put
     uri: https://app.datadoghq.com/api/v1/tags/hosts/chef.handler.datadog.test-failed?api_key=<API_KEY>&application_key=<APPLICATION_KEY>&source=chef
     body:
       encoding: UTF-8
-      string: ! '{"tags":["env:hostile","role:highlander","tag:tag:the_one_and_only"]}'
+      string: '{"tags":["env:hostile","role:highlander","tag:tag:the_one_and_only"]}'
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
       Content-Type:
@@ -359,19 +487,27 @@ http_interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 09 Sep 2014 12:15:14 GMT
+      - Tue, 26 Jan 2016 20:04:27 GMT
+      Dd-Pool:
+      - dogweb_sameorig
       Pragma:
       - no-cache
-      Server:
-      - gunicorn/19.1.0
+      Strict-Transport-Security:
+      - max-age=15724800;
+      X-Content-Type-Options:
+      - nosniff
+      X-Dd-Debug:
+      - QKcGho/VVHvOvAFq4WeaqBhqhL8eYL3K9CW+TToIP+o=
+      X-Frame-Options:
+      - SAMEORIGIN
       Content-Length:
       - '116'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"host": "chef.handler.datadog.test-failed", "tags": ["tag:tag:the_one_and_only",
+      encoding: UTF-8
+      string: '{"host": "chef.handler.datadog.test-failed", "tags": ["tag:tag:the_one_and_only",
         "env:hostile", "role:highlander"]}'
     http_version: 
-  recorded_at: Tue, 09 Sep 2014 12:15:11 GMT
-recorded_with: VCR 2.9.2
+  recorded_at: Tue, 26 Jan 2016 20:04:28 GMT
+recorded_with: VCR 3.0.1