fluent-plugin-datadog-log 0.1.0.rc2 → 0.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec628db3ffd3258f75a1ec766c763f3d4ad70ea
-  data.tar.gz: 9dc3f96c5ff194ab5cdb17e3e7ed1ac7ccfcecfd
+  metadata.gz: 611b755ad3430317ab1fbb5993bab8fce0a1a627
+  data.tar.gz: 1a3831af8f454ddf9c21adcffcdf1b9a1bc5c1e5
 SHA512:
-  metadata.gz: 5a97cd2159cb172acd76cb1ed9141176cac53758dd2d384b6bcd7c77dacf0f45f37e81edc932b092e2c86847b65c3a552f8a2756057ae456364aacfafc3b1f6a
-  data.tar.gz: e26b6ef4808d0d76fc56f0d63b545f7df3497658ed9353fa7aa1cdb00d20f834227a825bb7e3c45f5dfe127a18bad7add8d55b258cca983c103f70a9fd092329
+  metadata.gz: 84f631f652a38971f1d2e1b038535ad989df1161cbc2b758c85dac07385cdf441cef6ecea8090d0947ccf95ba724cf153558546793ac2fd33c13156691648ddd
+  data.tar.gz: 799fe91700013328051d6ffef9e601330cdb93df09f5faf095d0a856b0d3431b68304db873c0bf7d63feb633f6175e0bb20f9a1d9e100ef6121807ab33ad1a12

data/Gemfile.lock

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

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.rc2'
+  gem.version       = '0.1.0.rc3'
   gem.authors       = ['Yusuke KUOKA']
   gem.email         = ['ykuoka@gmail.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

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.rc1'
+  gem.version       = '0.1.0.rc2'
   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

@@ -280,7 +280,10 @@ module Fluent::Plugin
 
           tags.concat(@default_tags)
 
-          service = kube_labels['app'] || kube_labels['k8s-app'] unless kube_labels.nil?
+          unless kube_labels.nil?
+            service = kube_labels['app'] ||
+                      kube_labels['k8s-app']
+          end
           source = kube['pod_name']
           source_category = kube['container_name']
 
@@ -314,7 +317,6 @@ module Fluent::Plugin
           end
 
         rescue => error
-          raise error
           increment_failed_requests_count
           if entries_count.nil?
             increment_dropped_entries_count(1)

data/test/plugin/test_out_datadog_log.rb

@@ -113,6 +113,7 @@ class DatadogLogOutputTest < Test::Unit::TestCase
         source_category mysourcecategory
         logset mylogset
         log_level debug
+        tags ["kube_cluster=MyCluster", "mykey=myval"]
       EOC
       conn = StubConn.new
       fluentd_tag = 'mytag'
@@ -146,7 +147,7 @@ class DatadogLogOutputTest < Test::Unit::TestCase
       assert_equal(1, d.logs.count { |l| l =~ /Sent payload to Datadog/ })
       assert_equal(1, conn.sent.size)
       # rubocop:disable LineLength
-      payload = %(myapikey/mylogset <46>0 2006-01-02T15:04:05.000000+00:00 i-81c16767 myapp - - [dd ddsource="mypod"][dd ddsourcecategory="mycontainer"][dd ddtags="pod_name=mypod,container_name=mycontainer,kube_k8s-app=myapp,kube_deployment=myapp,host=i-81c16767,zone=aws:us-west-2b,aws_account_id=123456789012"] mymsg\n)
+      payload = %(myapikey/mylogset <46>0 2006-01-02T15:04:05.000000+00:00 i-81c16767 myapp - - [dd ddsource="mypod"][dd ddsourcecategory="mycontainer"][dd ddtags="pod_name=mypod,container_name=mycontainer,kube_k8s-app=myapp,kube_deployment=myapp,host=i-81c16767,zone=aws:us-west-2b,aws_account_id=123456789012,kube_cluster=MyCluster,mykey=myval"] mymsg\n)
       # rubocop:enable LineLength
       assert_equal(payload, conn.sent.first)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc2
+  version: 0.1.0.rc3
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd