chef-handler-datadog 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjkzOTQ0NTMxMmMyNDkyZDg1NTI4YmZjYzc1ODk4ZDI4ZGFlOTNkMg==
-  data.tar.gz: !binary |-
-    MjlhNGU4MjZjYTZiZTFlMDEyMmFmOThlMjcyZjcyZTNhODAzOWM5NQ==
+SHA1:
+  metadata.gz: 345202254b0a6790a4ee591adfeceb1b6fe4987b
+  data.tar.gz: 95b4da8f05b6179952e61a984ad683e83c11eae0
 SHA512:
-  metadata.gz: !binary |-
-    ZDcyMGViMDc4YTNmN2MyNDVkZTRmODY0OWRhZWQ5MzVkMGEyMzAzZjViOTIw
-    MWY0NDg2YjZlYmVlYTVmZjEyODI1MWNhOGI0NDM3MzNmNGFiNzNmZDA4ZGRj
-    NDA1YThjMjliMzg3MGE2ZDQ2MmM1MDg0OWI0YWQ5MWFkY2YwNTk=
-  data.tar.gz: !binary |-
-    Y2I2MmZhNzY0MWQ0YmEwNGE4ODZlOGY5YzM1NDhhZjczYWFkYjIxOTUxYWY2
-    NmNjODE0NmVjNDkxOGU1NDk4NjBmMjY3NmM1OTdlOTdlZGY0ZWMxY2U4NGJm
-    NTFlYTllY2I3M2E3M2I4ZDI0MzA4YzhjYTJhNjc3ZmQ2Y2Q0ODE=
+  metadata.gz: 672bc2ade623d4afda862b27b66d7301ea05ce1efe0404811bd9c99a36ce69c900e9cdd233165317c946f9891c23d313328c7effd8bb95185236b3043368ea00
+  data.tar.gz: 1565a34fa7063abe4db33ee64b724c1a7189b2d8a5478bdb46e18d00ebf8ad07497f6862f772e3b97bb2859bae4f4ccd2847b36093565263c47f22456b69321f

data/.rubocop.yml

@@ -1,42 +1,44 @@
 AllCops:
   Include:
     - chef-handler-datadog.gemspec
-    - Appraisals
-    - Gemfile
-    - Rakefile
+    - '**/Appraisals'
+    - '**/Gemfile'
+    - '**/Rakefile'
   Exclude:
-    - spec/*.rb
-
-# We want to continue to support Ruby 1.8.x for now
-HashSyntax:
-  EnforcedStyle: hash_rockets
+    - 'spec/*.rb'
+    - '*/vendor/**/*'
 
 # 80 characters is a nice goal, but not worth currently changing in existing
 # code for the sake of changing it to conform to a length set in 1928 (IBM).
-LineLength:
+Metrics/LineLength:
   Max: 150
 
 #####
 # These exceptions are good goals to attain, and probably will over time,
 # so periodic disabling and re-running to inspect values is suggested.
 
+# TODO: main method `report` does a lot of work, which drives this number up.
+Metrics/AbcSize:
+  Max: 38
+
 # TODO: Main class is currently over 100 lines of code, making comprehending
 # it harder. With refactors and simplifications, we can bring this down,
 # but for now, let's not make it too much worse.
-ClassLength:
-  Max: 160
+Metrics/ClassLength:
+  Max: 158
 
-# TODO: this is currently down to 12 from 22, and should be a constant
+# TODO: this is currently down to 7 from 22, and should be a constant
 # goal to reduce method complexity. The accepted goal is 6.
-CyclomaticComplexity:
-  Max: 12
+# Method `select_hostname`
+Metrics/CyclomaticComplexity:
+  Max: 7
 
 # TODO: The main method `report` is now down from 85 lines. As refactors
 # continue, this should drop. However, the goal of 10 lines in a method may
 # be a little lofty.
-MethodLength:
-  Max: 78
+Metrics/MethodLength:
+  Max: 36
 
 # TODO: select_hostname, report are both higher than the default of 7
-PerceivedComplexity:
+Metrics/PerceivedComplexity:
   Max: 9

data/.travis.yml

@@ -1,20 +1,25 @@
 language: ruby
+cache: bundler
+sudo: false
+
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1.5
+
 bundler_args: --without=localdev
+
 gemfile:
-  - gemfiles/chef_10.26.0.gemfile
-  - gemfiles/chef_10.32.2.gemfile
-  - gemfiles/chef_11.8.2.gemfile
-  - gemfiles/chef_11.10.4.gemfile
-  - gemfiles/chef_11.12.8.gemfile
-  - gemfiles/chef_11.14.2.gemfile
-  - gemfiles/chef_11.16.0.gemfile
-  - gemfiles/chef_12.0.0.alpha.1.gemfile
+  - gemfiles/chef_10.14.4.gemfile
+  - gemfiles/chef_10.gemfile
+  - gemfiles/chef_11.gemfile
+  - gemfiles/chef_12.gemfile
+
 env:
   - API_KEY=somefakeapikey APPLICATION_KEY=somefakeapplicationkey
+
 matrix:
+  exclude:
+    # Chef 12.x with Ohai 8.2.x doesn't work on Chef 1.9.3
+    - rvm: 1.9.3
+      gemfile: gemfiles/chef_12.gemfile
   allow_failures:
-    - rvm: 2.1.2
-    - gemfile: gemfiles/chef_12.0.0.alpha.1.gemfile

data/Appraisals

@@ -1,27 +1,16 @@
 # encoding: utf-8
 
-# Describe any version dependencies here.
-%w(
-  11.8.2
-  11.10.4
-  11.12.8
-  11.14.2
-  11.16.0
-  12.0.0.alpha.1
-).each do |tv|
+# Latest release of mainline Chef versions here.
+%w(10 11 12).each do |tv|
   appraise "chef-#{tv}" do
-    gem 'chef', tv
+    gem 'chef', "~> #{tv}.0"
   end
 end
 
-# Due to some oddity in json gem version pinning for versions that have
-# conflicts, specify best version here.
-%w(
-  10.26.0
-  10.32.2
-).each do |tv|
-  appraise "chef-#{tv}" do
-    gem 'chef', tv
-    gem 'json', '1.7.7'
-  end
+# Describe any specific Chef versions here.
+appraise 'chef-10.14.4' do
+  gem 'chef', '10.14.4'
+  # Old versions of Chef didn't pin the max version of Ohai they supported.
+  # See: http://git.io/vecAn
+  gem 'ohai', '< 8.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changes
 =======
 
+# 0.7.0 / 2015-10-22
+
+* [FEATURE] Support passing `DATADOG_PROXY` env var to control `dogapi` behavior, [#65][] [@datwiz][]
+* [OPTIMIZE] Only map `tags` if non-nil, [#66][] [@owen][]
+* [MISC] Style updates, [#60][] [@miketheman][]
+* [MISC] Update test matrix to handle latest released major versions, [#59][] [@miketheman][]
+
 # 0.6.0 / 2014-09-17
 
 * [FEATURE] Submit Chef-related tags to Datadog for Events, [#52][] [@miketheman][]
@@ -62,7 +69,13 @@ And all other versions were prior to this. See git history for more.
 [#50]: https://github.com/DataDog/chef-handler-datadog/issues/50
 [#51]: https://github.com/DataDog/chef-handler-datadog/issues/51
 [#52]: https://github.com/DataDog/chef-handler-datadog/issues/52
+[#59]: https://github.com/DataDog/chef-handler-datadog/issues/59
+[#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
 [@alq]: https://github.com/alq
+[@datwiz]: https://github.com/datwiz
 [@dwradcliffe]: https://github.com/dwradcliffe
 [@miketheman]: https://github.com/miketheman
+[@owen]: https://github.com/owen
 [@remh]: https://github.com/remh

data/README.md

@@ -15,6 +15,18 @@ This can be installed by using the `dd-handler` recipe from the [datadog cookboo
 run_list 'foo::bar', 'datadog::dd-handler'
 ```
 
+### Windows support
+
+The chef handler does work on Microsoft Windows however limitations with SSL + Ruby on Windows require extra setup.  One solution is to set the `SSL_CERT_FILE` environmental variable to the one that chef uses on the machine to fix this issue. Here is how [chef](https://github.com/chef/omnibus-chef/blob/master/files/openssl-customization/windows/ssl_env_hack.rb) fixes the issue.
+
+```ruby
+# Setup the certs for ruby in windows
+env 'SSL_CERT_FILE' do
+  action :create
+  value "C:\\opscode\\chef\\embedded\\ssl\\certs\\cacert.pem"
+end
+```
+
 The Datadog Docs on [Chef](http://docs.datadoghq.com/guides/chef/#deployhandler) has detailed instructions.
 
 ## Contributing to chef-handler-datadog

data/Rakefile

@@ -3,12 +3,11 @@
 require 'rubygems'
 require 'bundler/gem_tasks'
 
-require 'appraisal'
 require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-task :default => [:cops, :spec]
+task default: [:cops, :spec]
 
 CLEAN.include(['coverage/', 'doc/', 'pkg/'])
 

data/chef-handler-datadog.gemspec

@@ -9,20 +9,20 @@ Gem::Specification.new do |gem|
   gem.version       = ChefHandlerDatadog::VERSION
 
   gem.files         = `git ls-files`.split($\) # rubocop:disable SpecialGlobalVars
-  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
+  gem.executables   = gem.files.grep(%r{^bin\/}).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)\/})
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
   gem.add_dependency 'dogapi', '>= 1.6'
 
-  gem.add_development_dependency 'appraisal', '~> 1.0.0'
+  gem.add_development_dependency 'appraisal', '~> 2.0.1'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'chef', '>= 10', '<= 12'
+  gem.add_development_dependency 'chef', '>= 10.14.4', '<= 13'
   gem.add_development_dependency 'dotenv'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 3.0.0'
-  gem.add_development_dependency 'rubocop', '~> 0.25.0'
+  gem.add_development_dependency 'rspec', '~> 3.2.0'
+  gem.add_development_dependency 'rubocop', '~> 0.34.2'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'

data/gemfiles/{chef_10.26.0.gemfile → chef_10.14.4.gemfile}

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "chef", "10.26.0"
-gem "json", "1.7.7"
+gem "chef", "10.14.4"
+gem "ohai", "< 8.0"
 
 group :localdev do
   gem "guard"

data/gemfiles/{chef_11.14.2.gemfile → chef_10.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "chef", "11.14.2"
+gem "chef", "~> 10.0"
 
 group :localdev do
   gem "guard"

data/gemfiles/{chef_11.16.0.gemfile → chef_11.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "chef", "11.16.0"
+gem "chef", "~> 11.0"
 
 group :localdev do
   gem "guard"

data/gemfiles/{chef_11.10.4.gemfile → chef_12.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "chef", "11.10.4"
+gem "chef", "~> 12.0"
 
 group :localdev do
   gem "guard"

data/lib/chef/handler/datadog.rb

@@ -3,6 +3,9 @@ require 'rubygems'
 require 'chef/handler'
 require 'chef/mash'
 require 'dogapi'
+require_relative 'datadog_chef_metrics'
+require_relative 'datadog_chef_tags'
+require_relative 'datadog_chef_events'
 
 class Chef
   class Handler
@@ -20,241 +23,75 @@ class Chef
       end
 
       def report
-        # resolve correct hostname
-        hostname = select_hostname(run_status.node, config)
-
-        # Send the metrics
-        emit_metrics_to_datadog(hostname, run_status)
-
-        # Build the correct event
-        event_data = build_event_data(hostname, run_status)
-
-        # Submit the details back to Datadog
-        begin
-          # Collect tags
-          new_host_tags = get_combined_tags(node)
-
-          # Send the Event data
-          emit_event_to_datadog(hostname, event_data, new_host_tags)
-
-          # Update tags
-          if config[:application_key].nil?
-            Chef::Log.warn('You need an application key to let Chef tag your nodes ' \
-              'in Datadog. Visit https://app.datadoghq.com/account/settings#api to ' \
-                'create one and update your datadog attributes in the datadog cookbook.'
-            )
-            fail ArgumentError, 'Missing Datadog Application Key'
-          else
-
-            # Replace all Chef tags with the found Chef tags
-            rc = @dog.update_tags(hostname, new_host_tags, 'chef')
-            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 #{new_host_tags} tags for #{hostname} to Datadog: #{rc}")
-                else
-                  Chef::Log.debug("Successfully updated #{hostname}'s tags to #{new_host_tags.join(', ')}")
-                end
-              end
-            rescue
-              Chef::Log.warn("Could not determine whether #{hostname}'s tags were successfully submitted to Datadog: #{rc}")
-            end
-          end
-        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
-          Chef::Log.error("Could not connect to Datadog. Connection error:\n" + e)
-          Chef::Log.error('Data to be submitted was:')
-          Chef::Log.error(event_title)
-          Chef::Log.error(event_body)
-          Chef::Log.error('Tags to be set for this run:')
-          Chef::Log.error(new_host_tags)
-        end
+        # use datadog agent proxy settings, if available
+        use_agent_proxy unless ENV['DATADOG_PROXY'].nil?
+
+        # prepare the metrics, event, and tags information to be reported
+        prepare_report_for_datadog
+        # post the report information to the datadog service
+        send_report_to_datadog
+      ensure
+        # restore the env proxy settings before leaving to avoid downstream side-effects
+        restore_env_proxies unless ENV['DATADOG_PROXY'].nil?
       end
 
       private
 
-      # Build the Event data for submission
-      #
-      # @param hostname [String] resolved hostname to attach to Event
-      # @param run_status [Chef::RunStatus] current run status
-      # @return [Array] alert_type, event_priority, event_title, event_body
-      def build_event_data(hostname, run_status)
-        # bail early in case of a compiletime failure
-        # OPTIMIZE: Use better inspectors to handle failure scenarios, refactor needed.
-        if run_status.elapsed_time.nil?
-
-          alert_type = 'error'
-          event_title = "Chef failed during compile phase on #{hostname} "
-          event_priority = 'normal'
-          event_body = 'Chef was unable to complete a run, an error during compilation may have occurred.'
-
-          return [alert_type, event_priority, event_title, event_body]
-        end
-
-        run_time = pluralize(run_status.elapsed_time, 'second')
-
-        # This is the first line of the Event body, the rest is appended here.
-        event_body = "Chef updated #{run_status.updated_resources.length} resources out of #{run_status.all_resources.length} resources total."
-
-        # Show the updated resource list, truncated when failed to 5
-        event_body << updated_resource_list(run_status)
-
-        if run_status.success?
-          alert_type = 'success'
-          event_priority = 'low'
-          event_title = "Chef completed in #{run_time} on #{hostname} "
-        else
-          alert_type = 'error'
-          event_priority = 'normal'
-          event_title = "Chef failed in #{run_time} on #{hostname} "
-
-          if @config[:notify_on_failure]
-            handles = @config[:notify_on_failure]
-            # convert the notification handle array to a string
-            event_body << "\nAlerting: #{handles.join(' ')}\n"
-          end
-
-          event_body << "\n$$$\n#{run_status.formatted_exception}\n$$$\n"
-          event_body << "\n$$$\n#{run_status.backtrace.join("\n")}\n$$$\n"
-        end
-
-        # Return resolved data
-        [alert_type, event_priority, event_title, event_body]
-      end
-
-      # Compose a list of resources updated during a run.
-      # Shorten the list when there is a failure for stacktrace debugging
-      #
-      # @param run_status [Chef::RunStatus] current run status
-      # @return [String] formatted list of resources updated, truncated on failure
-      def updated_resource_list(run_status)
-        # No resources updated? Go away.
-        return '' unless run_status.updated_resources.length.to_i > 0
-
-        if run_status.failed?
-          report_resources = run_status.updated_resources.last(5)
-        else
-          report_resources = run_status.updated_resources
-        end
-
-        event_body = "\n$$$\n"
-        report_resources.each do |r|
-          event_body << "- #{r} (#{r.defined_at})\n"
-        end
-        event_body << "\n$$$\n"
-      end
-
-      # Emit Event to Datadog Event Stream
-      #
-      # @param hostname [String] resolved hostname to attach to Event
-      # @param event_params [Array] all the configurables to build a valid Event
-      # @param tags [Array] Chef env/roles/tags to be set as Datadog tags
-      def emit_event_to_datadog(hostname, event_data, tags)
-        alert_type, event_priority, event_title, event_body = event_data
-
-        evt = @dog.emit_event(Dogapi::Event.new(event_body,
-                                                :msg_title => event_title,
-                                                :event_type => 'config_management.run',
-                                                :event_object => hostname,
-                                                :alert_type => alert_type,
-                                                :priority => event_priority,
-                                                :source_type_name => 'chef',
-                                                :tags => tags
-        ), :host => hostname)
-
-        begin
-          # FIXME: nice-to-have: abstract format of return value away a bit
-          # in dogapi directly. See https://github.com/DataDog/dogapi-rb/issues/18
-          if evt.length < 2
-            Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
-          else
-            # [http_response_code, {"event" => {"url" => "...", ...}}]
-            # 2xx means ok
-            if evt[0].to_i / 100 != 2
-              Chef::Log.warn("Could not submit event to Datadog (HTTP call failed): #{evt[0]}")
-            else
-              Chef::Log.debug("Successfully submitted Chef event to Datadog for #{hostname} at #{evt[1]['event']['url']}")
-            end
-          end
-        rescue
-          Chef::Log.warn("Could not determine whether chef run was successfully submitted to Datadog: #{evt}")
-        end
+      # prepare metrics, event, and tags data for posting to datadog
+      def prepare_report_for_datadog
+        # uses class method accessors for run_status and config
+        hostname = resolve_correct_hostname
+        # prepare chef run metrics
+        @metrics =
+            DatadogChefMetrics.new
+            .with_dogapi_client(@dog)
+            .with_hostname(hostname)
+            .with_run_status(run_status)
+
+        # Collect and prepare tags
+        @tags =
+            DatadogChefTags.new
+            .with_dogapi_client(@dog)
+            .with_hostname(hostname)
+            .with_run_status(run_status)
+            .with_application_key(config[:application_key])
+
+        # Build the chef event information
+        @event =
+            DatadogChefEvents.new
+            .with_dogapi_client(@dog)
+            .with_hostname(hostname)
+            .with_run_status(run_status)
+            .with_failure_notifications(@config['notify_on_failure'])
+            .with_tags(@tags.combined_host_tags)
       end
 
-      # Emit Chef metrics to Datadog
-      #
-      # @param hostname [String] resolved hostname to attach to series
-      # @param run_status [Chef::RunStatus] current run status
-      def emit_metrics_to_datadog(hostname, run_status)
-        # 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?
-
-        @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)
-        @dog.emit_point('chef.resources.elapsed_time', run_status.elapsed_time, :host => hostname)
-        Chef::Log.debug('Submitted Chef metrics back to Datadog')
+      # Submit metrics, event, and tags information to datadog
+      def send_report_to_datadog
+        @metrics.emit_to_datadog
+        @event.emit_to_datadog
+        @tags.send_update_to_datadog
       rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
-        Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
-      end
-
-      # Build up an array of Chef tags to send back
-      #
-      # Selects all [env, roles, tags] from the Node's object and reformats
-      # them to `key:value` e.g. `role:database-master`.
-      #
-      # @param node [Chef::Node]
-      # @return [Array] current Chef env, roles, tags
-      def get_combined_tags(node)
-        chef_env = get_node_env(node).split # converts a string into an array
-
-        chef_roles = get_node_roles(node)
-        chef_tags = get_node_tags(node)
-
-        # Combine (union) all arrays. Removes duplicates if found.
-        chef_env | chef_roles | chef_tags
-      end
-
-      def get_node_roles(node)
-        node.run_list.roles.map! { |role| 'role:' + role }
-      end
-
-      def get_node_env(node)
-        'env:' + node.chef_environment if node.respond_to?('chef_environment')
-      end
-
-      def get_node_tags(node)
-        node.tags.map! { |tag| 'tag:' + tag }
-      end
-
-      def pluralize(number, noun)
-        case number
-        when 0..1
-          "less than 1 #{noun}"
-        else
-          "#{number.round} #{noun}s"
-        end
-      rescue
-        Chef::Log.warn("Cannot make #{number} more legible")
-        "#{number} #{noun}s"
+        Chef::Log.error("Could not connect to Datadog. Connection error:\n" + e)
+        Chef::Log.error('Data to be submitted was:')
+        Chef::Log.error(@event.event_title)
+        Chef::Log.error(@event.event_body)
+        Chef::Log.error('Tags to be set for this run:')
+        Chef::Log.error(@tags.combined_host_tags)
       end
 
       # Select which hostname to report back to Datadog.
       # Makes decision based on inputs from `config` and when absent, use the
       # node's `ec2` attribute existence to make the decision.
       #
-      # @param node [Chef::Node] from `run_status`, can feasibly any `node`
-      # @param config [Hash] config object passed in to handler
       # @return [String] the hostname decided upon
-      def select_hostname(node, config)
+      def resolve_correct_hostname
+        node = run_status.node
         use_ec2_instance_id = !config.key?(:use_ec2_instance_id) ||
-                                (config.key?(:use_ec2_instance_id) &&
-                                  config[:use_ec2_instance_id])
+                              (config.key?(:use_ec2_instance_id) && config[:use_ec2_instance_id])
 
         if config[:hostname]
+          puts "found hostname #{config[:hostname]} in config object"
           config[:hostname]
         elsif use_ec2_instance_id && node.attribute?('ec2') && node.ec2.attribute?('instance_id')
           node.ec2.instance_id
@@ -262,6 +99,23 @@ class Chef
           node.name
         end
       end
+
+      # Using the agent proxy settings requires setting http(s)_proxy
+      # env vars.  However, original env var settings need to be
+      # preserved for restoration at the end of the handler.
+      def use_agent_proxy
+        Chef::Log.info('Using agent proxy settings')
+        @env_http_proxy = ENV['http_proxy']
+        @env_https_proxy = ENV['https_proxy']
+        ENV['http_proxy'] = ENV['DATADOG_PROXY']
+        ENV['https_proxy'] = ENV['DATADOG_PROXY']
+      end
+
+      # Restore environment proxy settings to pre-report values
+      def restore_env_proxies
+        ENV['http_proxy'] = @env_http_proxy
+        ENV['https_proxy'] = @env_https_proxy
+      end
     end # end class Datadog
   end # end class Handler
 end # end class Chef