fluent-plugin-datadog-log 0.1.0.rc4 → 0.1.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158cd2fccb7054e6b940dc005a0eac7b7a358750
-  data.tar.gz: d3a5bd069e6663ec704639d9303ee522484a364e
+  metadata.gz: cd01ed137f37018a18018778b7203c1e3c9ed2bc
+  data.tar.gz: 478756303d13c730f319b5eb3547d4a2af571332
 SHA512:
-  metadata.gz: b416daef3f8c4336b837607dd8ba620173e5b017e5d03f4bc2df0ae999eaa275e2787c93152cff705e1e9e6805ab4549aacb0d885f608a87c7fc26f294c730bb
-  data.tar.gz: a7ffe10ced889a307d77f563db0b829b0ce08730acee6bcd5af1152ab643db4ac24911e9a38ea4713660ed1ef7a8a9ef0384273f5766f0b6cefca8c94596b503
+  metadata.gz: 80a6bef237c7c06ea23fd77c0adc34625b370d3b170edbe3c9d2b2445ee9d1725454ba0752578adb320090111051eefabd4f6c5df2ecd2a9d1a061b8ed2c6e78
+  data.tar.gz: 8881fb329a39626cbd657dd6b7468c990beaee6f50a751f1fde937b3ab5c2661dea9e51a9dc5474653bc4803c686e18f92421ad5f91c2f0873c3d36ed7d313f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-datadog-log (0.1.0.rc4)
+    fluent-plugin-datadog-log (0.1.0.rc5)
       fluentd (~> 0.14)
       json (~> 1.8)
       net_tcp_client (~> 2.0.1)

data/fluent-plugin-datadog-log.gemspec

@@ -8,7 +8,7 @@ eos
   gem.homepage      = \
     'https://github.com/mumoshu/fluent-plugin-datadog-log'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.1.0.rc4'
+  gem.version       = '0.1.0.rc5'
   gem.authors       = ['Yusuke KUOKA']
   gem.email         = ['ykuoka@gmail.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_datadog_log.rb

@@ -25,7 +25,7 @@ require_relative 'monitoring'
 module Fluent::Plugin
   # fluentd output plugin for the Datadog Log Intake API
   class DatadogOutput < ::Fluent::Plugin::Output
-    Fluent::Plugin.register_output('datadog', self)
+    Fluent::Plugin.register_output('datadog_log', self)
 
     helpers :compat_parameters, :inject
 

data/lib/fluent/plugin/out_datadog_log.rb~

@@ -128,9 +128,9 @@ module Fluent::Plugin
       super
 
       if @api_key.size == 0
-        @api_key = ENV['DD_LOG_API_KEY']
+        @api_key = ENV['DD_API_KEY']
         if @api_key == '' || @api_key.nil?
-          error_message = 'Unable to obtain api_key from DD_LOG_API_KEY'
+          error_message = 'Unable to obtain api_key from DD_API_KEY'
           fail Fluent::ConfigError, error_message
         end
       end
@@ -249,10 +249,26 @@ module Fluent::Plugin
             tags << "#{tag_key}=#{kube[json_key]}" if kube.key? json_key
           end
 
-          if kube.key? 'labels'
-            labels = kube['labels']
-            labels.each do |k, v|
-              tags << "kube_#{k}=#{v}"
+          kube_labels = kube['labels']
+          unless kube_labels.nil?
+            kube_labels.each do |k, v|
+              k2 = k.dup
+              k2.gsub!(/[\,\.]/, '_')
+              k2.gsub!(%r{/}, '-')
+              tags << "kube_#{k2}=#{v}"
+            end
+          end
+
+          if kube.key? 'annotations'
+            annotations = kube['annotations']
+            created_by_str = annotations['kubernetes.io/created-by']
+            unless created_by_str.nil?
+              created_by = JSON.parse(created_by_str)
+              ref = created_by['reference'] unless created_by.nil?
+              kind = ref['kind'] unless ref.nil?
+              name = ref['name'] unless ref.nil?
+              kind = kind.downcase unless kind.nil?
+              tags << "kube_#{kind}=#{name}" if !kind.nil? && !name.nil?
             end
           end
 
@@ -264,6 +280,17 @@ module Fluent::Plugin
 
           tags.concat(@default_tags)
 
+          unless kube_labels.nil?
+            service = kube_labels['app'] ||
+                      kube_labels['k8s-app']
+          end
+          source = kube['pod_name']
+          source_category = kube['container_name']
+
+          service = @service if service.nil?
+          source = @source if source.nil?
+          source_category = @source_category if source_category.nil?
+
           datetime = Time.at(Fluent::EventTime.new(time).to_r).utc.to_datetime
 
           payload =
@@ -271,9 +298,9 @@ module Fluent::Plugin
               logset: @logset,
               msg: msg,
               datetime: datetime,
-              service: @service,
-              source: @source,
-              source_category: @source_category,
+              service: service,
+              source: source,
+              source_category: source_category,
               tags: tags
             )
 
@@ -291,11 +318,17 @@ module Fluent::Plugin
 
         rescue => error
           increment_failed_requests_count
-          increment_retried_entries_count(entries_count)
-          # RPC cancelled, so retry via re-raising the error.
-          @log.debug "Retrying #{entries_count} log message(s) later.",
-                     error: error.to_s
-          raise error
+          if entries_count.nil?
+            increment_dropped_entries_count(1)
+            @log.error 'Not retrying a log message later',
+                       error: error.to_s
+          else
+            increment_retried_entries_count(entries_count)
+            # RPC cancelled, so retry via re-raising the error.
+            @log.debug "Retrying #{entries_count} log message(s) later.",
+                       error: error.to_s
+            raise error
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc4
+  version: 0.1.0.rc5
 platform: ruby
 authors:
 - Yusuke KUOKA
@@ -162,6 +162,7 @@ files:
 - pkg/fluent-plugin-datadog-log-0.1.0.rc1.gem
 - pkg/fluent-plugin-datadog-log-0.1.0.rc2.gem
 - pkg/fluent-plugin-datadog-log-0.1.0.rc3.gem
+- pkg/fluent-plugin-datadog-log-0.1.0.rc4.gem
 - test/helper.rb
 - test/plugin/base_test.rb
 - test/plugin/constants.rb