fluent-plugin-datadog-log 0.1.0.rc9 → 0.1.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7c1ae1745bd1e2cf136e146145e280abec60c7
-  data.tar.gz: deb2d3d35eb0a37b431160f694ba2bb00511f2fd
+  metadata.gz: 8c9df2b279c5e9048bd66cd3a8745b846b04052e
+  data.tar.gz: 2b2c3fbd224a2999057149073662157030b0c8e2
 SHA512:
-  metadata.gz: 8cf0853cfa35f60f0abe8b069ad7f1eb77a0d4bade42e619da0190f0ac0a5fe6182ba55298aaef0bb82c8fd66efd74183c3c2dd67e599028d88752f62591d683
-  data.tar.gz: 60f773328557aa2a6cffc70439e14a58879b6dbfdba9648d1ed9825385d906e9e795e6cb083cb450d64115b4bc5bacc23a8612bdc52edfebd0c1c3f86f1f88df
+  metadata.gz: bd31ec06397133d8720f8e44c4775f2d0b6bdfe494b79407fddc2589f314b5eecc5d9cbc72c3a3f05f47d93b52349565d2dc98892e480aba6f75819129c7ecb9
+  data.tar.gz: f4d69d86c46a88f2bb067dbbcaa42be29c313a8cc39c0e93174078a40958c88ec6c44b9987638651aac23d7e739f44732f5adb9c1e3b57c78694fdb68aca115e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-datadog-log (0.1.0.rc9)
+    fluent-plugin-datadog-log (0.1.0.rc10)
       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.rc9'
+  gem.version       = '0.1.0.rc10'
   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

@@ -246,7 +246,7 @@ module Fluent::Plugin
           }
 
           mappings.each do |json_key, tag_key|
-            tags << "#{tag_key}=#{kube[json_key]}" if kube.key? json_key
+            tags << "#{tag_key}:#{kube[json_key]}" if kube.key? json_key
           end
 
           kube_labels = kube['labels']
@@ -255,22 +255,22 @@ module Fluent::Plugin
               k2 = k.dup
               k2.gsub!(/[\,\.]/, '_')
               k2.gsub!(%r{/}, '-')
-              tags << "kube_#{k2}=#{v}"
+              tags << "kube_#{k2}:#{v}"
             end
           end
 
           @log.debug 'Dumping kubernetes metadata', metadata: kube
 
-          if kube.key? 'annotations'
-            annotations = kube['annotations']
-            created_by_str = annotations['kubernetes.io/created-by']
+          annotations = kube['annotations']
+          unless annotations.nil?
+            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?
+              tags << "kube_#{kind}:#{name}" if !kind.nil? && !name.nil?
             end
           end
 
@@ -476,7 +476,7 @@ module Fluent::Plugin
       aws_account_id = ec2_metadata['accountId'] if
           ec2_metadata.key?('accountId')
       # #host:i-09fbfed2672d2c6bf
-      %W(host=#{@vm_id} zone=#{@zone} aws_account_id=#{aws_account_id})
+      %W(host:#{@vm_id} zone:#{@zone} aws_account_id:#{aws_account_id})
         .concat @tags
     end
 

data/test/plugin/test_out_datadog_log.rb

@@ -92,7 +92,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 myservice - - [dd ddsource="mysource"][dd ddsourcecategory="mysourcecategory"][dd ddtags="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 myservice - - [dd ddsource="mysource"][dd ddsourcecategory="mysourcecategory"][dd ddtags="host:i-81c16767,zone:aws:us-west-2b,aws_account_id:123456789012"] mymsg\n)
       # rubocop:enable LineLength
       assert_equal(payload, conn.sent.first)
     end
@@ -113,7 +113,7 @@ class DatadogLogOutputTest < Test::Unit::TestCase
         source_category mysourcecategory
         logset mylogset
         log_level debug
-        tags ["kube_cluster=MyCluster", "mykey=myval"]
+        tags ["kube_cluster:MyCluster", "mykey:myval"]
       EOC
       conn = StubConn.new
       fluentd_tag = 'mytag'
@@ -135,7 +135,8 @@ class DatadogLogOutputTest < Test::Unit::TestCase
             },
             'annotations' => {
               # rubocop:disable LineLength
-              'kubernetes.io/created-by' => '{"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"Deployment","namespace":"default","name":"myapp","uid":"d67e8857-c2dc-11e7-aed9-066d23381f8c","apiVersion":"extensions","resourceVersion":"289"}}'
+              # kubernetes.io is translated to kubernetes_io by kubernetes metadata filter
+              'kubernetes_io/created-by' => '{"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"Deployment","namespace":"default","name":"myapp","uid":"d67e8857-c2dc-11e7-aed9-066d23381f8c","apiVersion":"extensions","resourceVersion":"289"}}'
               # rubocop:enable LineLength
             }
           }
@@ -147,7 +148,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,kube_cluster=MyCluster,mykey=myval"] 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.rc9
+  version: 0.1.0.rc10
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -172,16 +172,6 @@ files:
 - lib/fluent/plugin/monitoring.rb
 - lib/fluent/plugin/out_datadog_log.rb
 - lib/fluent/plugin/out_datadog_log.rb~
-- pkg/fluent-plugin-datadog-0.1.0.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.gem
-- 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
-- pkg/fluent-plugin-datadog-log-0.1.0.rc5.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc6.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc7.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc8.gem
 - test/helper.rb
 - test/plugin/base_test.rb
 - test/plugin/constants.rb