fluent-plugin-barito 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1322ed9381fdba786b7eebb34c03b0df7f8278d252321a1917afb28efc9d3b0
-  data.tar.gz: 1f4e5acff90c1fa78e95d23732b113ac26b40dc14729ba20d0b7cd92a811bda3
+  metadata.gz: b84669e65564859fa5fe631b76e71d9f830a23d66a524c5942d4300be7396c24
+  data.tar.gz: 60f1835917729abd12d00608f81c18aa063aee92925ca0246bfe720603d0c260
 SHA512:
-  metadata.gz: 1f43f31056da179fc49b9f352ab5ca1a133c2dd033d275bafc59aaa00df76c1f8b90690cb5b026cc3bed1984f91231cc2b5cca911af583e70a54acd65d7e8452
-  data.tar.gz: a39189386da6918a24e1a3b2a3949895bff5c5569abeb2c57b7b4a1a2d34a7b486b2d232f24d88a19a1812acb415f5a0c21581b87dbcba89745a3be93ccea90c
+  metadata.gz: fc7bde45ea4f7601f0a35ed06ab6f3342da74574b6e7adcc344081afe0479ee7d3f9532106cd0aaa070bb811f1623b81590ea5c71288c3231a3085af822834bd
+  data.tar.gz: 889dc1965589f3f9418163af70c14a2329a61692e7f5f25f7cc843cfc984e99365d1bcb94c3c56ad1064dff3dfd6153be2782e3c35741fba930d4b601cf34ff1

data/fluent-plugin-barito.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-barito"
-  spec.version = "0.1.13"
+  spec.version = "0.1.14"
   spec.authors = ["BaritoLog"]
   spec.email   = ["pushm0v.development@gmail.com", "iman.tung@gmail.com"]
 

data/lib/fluent/plugin/out_barito_k8s.rb

@@ -37,15 +37,13 @@ module Fluent
 
         next if url.nil? or secret.nil?
 
-        # Delete kubernetes & docker field
-        record.delete('kubernetes')
-        record.delete('docker')
-
+        record = clean_attribute(record)
         trail = Fluent::Plugin::ClientTrail.new(true)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
+        new_timber = merge_log_attribute(timber)
 
         # Add kubernetes information
-        timber['k8s_metadata'] = {
+        new_timber['k8s_metadata'] = {
           'pod_name' => k8s_metadata['pod_name'],
           'namespace_name' => k8s_metadata['namespace_name'],
           'container_name' => k8s_metadata['container_name'],
@@ -54,7 +52,7 @@ module Fluent
 
         header = {content_type: :json, 'X-App-Secret' => secret}
 
-        RestClient.post url, timber.to_json, header
+        RestClient.post url, new_timber.to_json, header
       end
     end
 
@@ -65,5 +63,26 @@ module Fluent
     def application_secret(params)
       params[LABEL_APP_SECRET]
     end
+
+    def clean_attribute(record)
+      # Delete kubernetes & docker field
+      record.delete('kubernetes')
+      record.delete('docker')
+      record
+    end
+
+    def merge_log_attribute(record)
+      message_log = nil
+      begin
+        message_log = JSON.parse(record['log'])
+      rescue
+      end
+
+      if !message_log.nil?
+        return record.merge(message_log)
+      end
+
+      record
+    end
   end
 end

data/spec/lib/fluent/plugin/barito_timber_spec.rb

@@ -41,11 +41,7 @@ describe 'Fluent::Plugin::TimberFactory' do
         expect(timber['@message']).to eq("invalid_message")
         expect(timber['client_trail']['hints']).to include(Fluent::Plugin::TimberFactory::HINTS_NO_MESSAGE)
       end
-      
     end
-    
-    
-    
   end
   
 end

data/spec/lib/fluent/plugin/out_barito_k8s_spec.rb

@@ -26,5 +26,30 @@ describe 'Fluent::BaritoK8sOutput' do
       expect(secret).to eq 'some_secret'
     end
   end
-  
+
+  describe '.merge_log_attribute' do
+    it do
+      out = Fluent::BaritoK8sOutput.new
+
+      record = { "log" => "{\"some_attr\":\"info\"}", "other_attr" => "other_value"}
+      new_record = out.merge_log_attribute(record)
+
+      expect(new_record['some_attr']).to eq("info")
+      expect(new_record['other_attr']).to eq("other_value")
+    end
+  end
+
+  describe '.clean_attribute' do
+    it do
+      out = Fluent::BaritoK8sOutput.new
+
+      record = {"kubernetes" => {"some_attr" => "some_value"}, "docker" => "docker_value", "attr" => "some_value"}
+      new_record = out.clean_attribute(record)
+
+      expect(new_record['kubernetes']).to be_nil
+      expect(new_record['docker']).to be_nil
+      expect(new_record['attr']).to eq("some_value")
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler