chef-handler-datadog 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3608d27f3427fa1f07ecd1748fa02cc245ff15bceaf0ee7125707763d881122
-  data.tar.gz: a1093543048a39d22ddea517d5791002d103c15cba4e375483131f8fa9cccea9
+  metadata.gz: b6d238ccc66981606466cca7e0a36098a7fd55e2372306193c5f80021a161fb7
+  data.tar.gz: ae15461ffab7b5421d7dd0dd56493eb4fd0f696e4a9497e733367445779b3d66
 SHA512:
-  metadata.gz: 8878920f4498541aac73071a96249123012ed6fb6a0ff57d760da5287c653e0a81f08700052a2cc8a270f26c339429fc03251e850b8a653fb338016b60d46073
-  data.tar.gz: 3d6887a1e64193c7783bf078fe2b62ebd2b43855169466768a2e78109b55725a8535d2e912d287fefa7515d5ec1fa82e71489aad20740cd9c0a3bd050cee95d4
+  metadata.gz: f6308f1d7226e514baadc27262489a5597bc959f0e8662cec44e5e88abc346975fe26a87759cf25fdbc411c625808f2f37c4fc4887c9f2ea94df74ae68ebcdba
+  data.tar.gz: '0669c141775ea7b269ba16c019052ecf52b3214846841b3f518281aa4fbb6a392936f759eed130ca272f49201192a9b782edce17b1e391a6085f523f4f711c23'

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changes
 =======
 
+# 0.12.3 / 2019-11-19
+
+* [FEATURE] Use `api_url` to send Chef related data to extra endpoints. [#113][] [@Azoam][]
+
 # 0.12.2 / 2019-10-23
 
 * [OPTIMIZE] Rescue all errors when sending/emitting from the handler. [#98][] [@borgstrom][]
@@ -132,7 +136,9 @@ And all other versions were prior to this. See git history for more.
 [#103]: https://github.com/DataDog/chef-handler-datadog/issues/103
 [#104]: https://github.com/DataDog/chef-handler-datadog/issues/104
 [#109]: https://github.com/DataDog/chef-handler-datadog/issues/109
+[#113]: https://github.com/DataDog/chef-handler-datadog/issues/113
 [@ABrehm264]: https://github.com/ABrehm264
+[@Azoam]: https://github.com/Azoam
 [@DanielMuller]: https://github.com/DanielMuller
 [@DanielRedOak]: https://github.com/DanielRedOak
 [@alq]: https://github.com/alq

data/chef-handler-datadog.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
-  gem.add_dependency 'dogapi', '>= 1.31'
+  gem.add_dependency 'dogapi', '= 1.36.0'
 
   gem.add_development_dependency 'appraisal', '~> 2.0.1'
   gem.add_development_dependency 'bundler'

data/lib/chef/handler/datadog.rb

@@ -79,7 +79,7 @@ class Chef
         @event.emit_to_datadog dog
         @tags.send_update_to_datadog dog
       rescue => e
-        Chef::Log.error("Could not send/emit to Datadog:\n" + e)
+        Chef::Log.error("Could not send/emit to Datadog:\n" + e.to_s)
         Chef::Log.error('Event data to be submitted was:')
         Chef::Log.error(@event.event_title)
         Chef::Log.error(@event.event_body)
@@ -159,7 +159,7 @@ class Chef
         # then add extra endpoints
         extra_endpoints = @config[:extra_endpoints] || []
         extra_endpoints.each do |endpoint|
-          url = endpoint[:url] || config_url()
+          url = endpoint[:api_url] || endpoint[:url] || config_url()
           api_key = endpoint[:api_key]
           app_key = endpoint[:application_key]
           endpoints << [url, api_key, app_key] if validate_keys(api_key, app_key, false)

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.12.2'
+  VERSION = '0.12.3'
 end

data/spec/datadog_spec.rb

@@ -734,6 +734,31 @@ describe Chef::Handler::Datadog, :vcr => :new_episodes do
         expect(handler.send(:endpoints)).to eq(triplets[0..1])
       end
     end
+
+    context 'when using api url instead of url' do
+      it 'returns available triplets' do
+        triplets = [
+          ['https://app.datadoghq.com', 'api_key_2' , 'app_key_2'],
+          ['https://app.example.com', 'api_key_3', 'app_key_3'],
+          ['https://app.example.com', 'api_key_4', 'app_key_4']
+        ]
+        handler = Chef::Handler::Datadog.new api_key: triplets[0][1],
+                                             application_key: triplets[0][2],
+                                             url: triplets[0][0],
+                                             extra_endpoints: [{
+                                               api_url: triplets[1][0],
+                                               url: triplets[0][0],
+                                               api_key: triplets[1][1],
+                                               application_key: triplets[1][2]
+                                             }, {
+                                               api_url: triplets[2][0],
+                                               url:triplets[0][0],
+                                               api_key: triplets[2][1],
+                                               application_key: triplets[2][2]
+                                             }]
+        expect(handler.send(:endpoints)).to eq(triplets)
+      end
+    end
   end
 
   context 'when reporting to multiple endpoints' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-datadog
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Mike Fiedler
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: 1.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement