fluent-plugin-barito 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b84669e65564859fa5fe631b76e71d9f830a23d66a524c5942d4300be7396c24
-  data.tar.gz: 60f1835917729abd12d00608f81c18aa063aee92925ca0246bfe720603d0c260
+SHA1:
+  metadata.gz: a9443cfecff7d382c4941e5bfae21d520a3818d7
+  data.tar.gz: b49bf6375814aeb01bddda08bf2b2a6573392dd6
 SHA512:
-  metadata.gz: fc7bde45ea4f7601f0a35ed06ab6f3342da74574b6e7adcc344081afe0479ee7d3f9532106cd0aaa070bb811f1623b81590ea5c71288c3231a3085af822834bd
-  data.tar.gz: 889dc1965589f3f9418163af70c14a2329a61692e7f5f25f7cc843cfc984e99365d1bcb94c3c56ad1064dff3dfd6153be2782e3c35741fba930d4b601cf34ff1
+  metadata.gz: b72763e3cbe8b57c0a297d44de0ed348fbf1f39537f6891aee75dadc66ee68983c595fea042ce1fc07f5083ad65f1ef37f289263b4991da1cb09b3007c344a70
+  data.tar.gz: fdef293d09591b1adbf5d34a1eb68c1970fc6d70c5ad70b27c2d1951af00d39afb64c30c68d93424adfff09d519c26b89dd30bb6e7b93d3f508cb32dc9c66012

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+**0.2.0**
+
+- Allow Application Group Secret to be used

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.14"
+  spec.version = "0.2.0"
   spec.authors = ["BaritoLog"]
   spec.email   = ["pushm0v.development@gmail.com", "iman.tung@gmail.com"]
 

data/lib/fluent/plugin/out_barito_k8s.rb

@@ -8,6 +8,8 @@ module Fluent
 
     PLUGIN_NAME = 'barito_k8s'
     LABEL_APP_SECRET = 'barito.applicationSecret'
+    LABEL_APP_GROUP_SECRET = 'barito.applicationGroupSecret'
+    LABEL_APP_NAME = 'barito.applicationName'
     LABEL_PRODUCE_URL = 'barito.produceUrl'
 
     Fluent::Plugin.register_output(PLUGIN_NAME, self)
@@ -33,9 +35,22 @@ module Fluent
         # Skip record if no annotations found
         next if params.nil?
         url = produce_url(params)
-        secret = application_secret(params)
-
-        next if url.nil? or secret.nil?
+        app_secret = application_secret(params)
+        app_group_secret = application_group_secret(params)
+        app_name = application_name(params)
+
+        next if url.nil?
+
+        if app_secret.nil?
+          next if app_group_secret.nil? or app_name.nil?
+          header = {
+            content_type: :json,
+            'X-App-Group-Secret' => app_group_secret,
+            'X-App-Name' => app_name
+          }
+        else
+          header = {content_type: :json, 'X-App-Secret' => app_secret}
+        end
 
         record = clean_attribute(record)
         trail = Fluent::Plugin::ClientTrail.new(true)
@@ -50,8 +65,6 @@ module Fluent
           'host' => k8s_metadata['host']
         }
 
-        header = {content_type: :json, 'X-App-Secret' => secret}
-
         RestClient.post url, new_timber.to_json, header
       end
     end
@@ -64,6 +77,14 @@ module Fluent
       params[LABEL_APP_SECRET]
     end
 
+    def application_group_secret(params)
+      params[LABEL_APP_GROUP_SECRET]
+    end
+
+    def application_name(params)
+      params[LABEL_APP_NAME]
+    end
+
     def clean_attribute(record)
       # Delete kubernetes & docker field
       record.delete('kubernetes')

data/lib/fluent/plugin/out_barito_vm.rb

@@ -7,10 +7,12 @@ module Fluent
   class BaritoVMOutput < BufferedOutput
 
     PLUGIN_NAME = "barito_vm"
-    
+
     Fluent::Plugin.register_output(PLUGIN_NAME, self)
 
     config_param :application_secret, :string, :default => nil
+    config_param :application_group_secret, :string, :default => nil
+    config_param :application_name, :string, :default => nil
     config_param :produce_url, :string, :default => ''
 
     # Overide from BufferedOutput
@@ -28,13 +30,20 @@ module Fluent
       chunk.msgpack_each do |tag, time, record|
         trail = Fluent::Plugin::ClientTrail.new(false)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
-        header = {content_type: :json, 'X-App-Secret' => @application_secret}
-        
+
+        if @application_secret.nil? or @application_secret.blank?
+          next if @application_group_secret.nil? or @application_name.nil?
+          header = {
+            content_type: :json,
+            'X-App-Group-Secret' => @application_group_secret,
+            'X-App-Name' => @application_name
+          }
+        else
+          header = {content_type: :json, 'X-App-Secret' => @application_secret}
+        end
+
         RestClient.post @produce_url, timber.to_json, header
       end
     end
-    
   end
-  
-
 end

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

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
 describe 'Fluent::BaritoK8sOutput' do
-  
+
   describe '.produce_url' do
     it do
       k8s_labels = {
         Fluent::BaritoK8sOutput::LABEL_PRODUCE_URL => 'https://localhost:5000/produce/sometopic'
       }
-      
+
       out = Fluent::BaritoK8sOutput.new
       url = out.produce_url(k8s_labels)
       expect(url).to eq 'https://localhost:5000/produce/sometopic'
     end
-    
+
   end
-  
+
   describe '.application_secret' do
     it do
       out = Fluent::BaritoK8sOutput.new
-      
+
       k8s_labels = {
         Fluent::BaritoK8sOutput::LABEL_APP_SECRET => 'some_secret'
       }
@@ -27,6 +27,30 @@ describe 'Fluent::BaritoK8sOutput' do
     end
   end
 
+  describe '.application_group_secret' do
+    it do
+      out = Fluent::BaritoK8sOutput.new
+
+      k8s_labels = {
+        Fluent::BaritoK8sOutput::LABEL_APP_GROUP_SECRET => 'some_secret'
+      }
+      secret = out.application_group_secret(k8s_labels)
+      expect(secret).to eq 'some_secret'
+    end
+  end
+
+  describe '.application_name' do
+    it do
+      out = Fluent::BaritoK8sOutput.new
+
+      k8s_labels = {
+        Fluent::BaritoK8sOutput::LABEL_APP_NAME => 'some_name'
+      }
+      app_name = out.application_name(k8s_labels)
+      expect(app_name).to eq 'some_name'
+    end
+  end
+
   describe '.merge_log_attribute' do
     it do
       out = Fluent::BaritoK8sOutput.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,6 +154,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for BaritoLog