fluent-plugin-datadog 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d97d73d14d2207da6a62a845c1085d64d9b86d9
-  data.tar.gz: c2556c7eb295bda3c3e1cc428571dd068c28e458
+  metadata.gz: 64fc3410e04ef9d313059b2f93efdbd89ef0290c
+  data.tar.gz: '0962e805a36d1ffcf9910db5ee46757a418f3e54'
 SHA512:
-  metadata.gz: 010af82ee44ec20f858d4d53dc46c02cb25a9412de4b869641dbd201075832f79df300ed3571b8908a9ad20754a5275090a7642294c9183a1e923226f6fb4a37
-  data.tar.gz: f7b8ded303650fbac32cb98858daa6129623a9e47c1dc165fa30e2b480147c8b079fc578e32e618a0740bba33f4869f3a396953537ef8096be96a3172cad1ac5
+  metadata.gz: 94e21de6fc0be2fc23ec22f2836faabc25b5cee008b4b3ec83e17e0a1d12744deeb931bbc2c84260e512de11bf6e438656063830260c8fa8b55d60f54784aafc
+  data.tar.gz: 065dbe1169ffff05fbe4044aee9886c44713a1be81ea79bc2c0764fb95cc5d9f696212eba2755e122ce440f0965a8bc517265210acd7c73f8779faa7cb2d2672

data/.gitignore

@@ -39,3 +39,6 @@ build/
 foo/
 *.iml
 .idea/
+
+fluent/
+Gemfile.lock

data/README.md

@@ -33,6 +33,11 @@ TCP example
   include_tag_key true
   tag_key 'tag'
 
+  # Optional tags
+  dd_sourcecategory 'aws'
+  dd_source 'rds' 
+  dd_tags 'app:mysql,env:prod'
+
 </match>
 ```
 
@@ -65,5 +70,9 @@ As fluent-plugin-datadog is an output_buffer, you can set all output_buffer prop
 | **use_json**| Event format, if true, the event is sent in json format. Othwerwise, in plain text. | true      |
 | **include_tag_key**| Automatically include tags in the record. | false      |
 | **tag_key**| Name of the tag attribute, if they are included. | "tag"      |
-| **use_ssl** | If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise. | false |
+| **use_ssl** | If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise. | true |
 |**max_retries**| The number of retries before the output plugin stops. Set to -1 for unlimited retries | -1 |
+| **max_retries** | The number of retries before the output plugin stops. Set to -1 for unlimited retries | -1 |
+| **dd_source** | This tells Datadog what integration it is | nil |
+| **dd_sourcecategory** | Multiple value attribute. Can be used to refine the source attribtue | nil |
+| **dd_tags** | Custom tags with the following format "key1:value1, key2:value2" | nil |

data/fluent-plugin-datadog.gemspec

@@ -9,12 +9,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-datadog"
-  spec.version       = "0.9.6"
+  spec.version       = "0.10.0"
   spec.authors       = ["Datadog Solutions Team"]
   spec.email         = ["support@datadoghq.com"]
   spec.summary       = "Datadog output plugin for Fluent event collector"
   spec.homepage      = "http://datadoghq.com"
-  spec.license       = "Apache-2.0"
+  spec.license       = "Apache License 2.0"
 
   spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-datadog.gemspec", "lib/fluent/plugin/out_datadog.rb"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/fluent/plugin/out_datadog.rb

@@ -13,13 +13,16 @@ class Fluent::DatadogOutput < Fluent::BufferedOutput
   # Register the plugin
   Fluent::Plugin.register_output('datadog', self)
   # Output settings
-  config_param :use_json,       :bool,    :default => true
-  config_param :include_tag_key,:bool,    :default => false
-  config_param :tag_key,        :string,  :default => 'tag'
+  config_param :use_json,           :bool,    :default => true
+  config_param :include_tag_key,    :bool,    :default => false
+  config_param :tag_key,            :string,  :default => 'tag'
+  config_param :dd_sourcecategory,  :string
+  config_param :dd_source,          :string
+  config_param :dd_tags,            :string
 
   # Connection settings
   config_param :host,           :string,  :default => 'intake.logs.datadoghq.com'
-  config_param :use_ssl,        :bool,    :default => false
+  config_param :use_ssl,        :bool,    :default => true
   config_param :port,           :integer, :default => 10514
   config_param :ssl_port,       :integer, :default => 10516
   config_param :max_retries,    :integer, :default => -1
@@ -108,9 +111,19 @@ class Fluent::DatadogOutput < Fluent::BufferedOutput
     log.trace "Datadog plugin: received chunck: #{chunk}"
     chunk.msgpack_each do |tag, record|
       next unless record.is_a? Hash
+      next if record.empty?
 
       log.trace "Datadog plugin: received record: #{record}"
 
+      if @dd_sourcecategory
+        record["ddsourcecategory"] = @dd_sourcecategory
+      end
+      if @dd_source
+        record["ddsource"] = @dd_source
+      end
+      if @dd_tags
+        record["ddtags"] = @dd_tags
+      end
       if @include_tag_key
         record[@tag_key] = tag
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - Datadog Solutions Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,7 @@ files:
 - lib/fluent/plugin/out_datadog.rb
 homepage: http://datadoghq.com
 licenses:
-- Apache-2.0
+- Apache License 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog output plugin for Fluent event collector