fluent-plugin-barito 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bed716866d230da6c6be384b855d783803a7bef2
-  data.tar.gz: 60463ec82d959f37aa733fd572572fa60c5e0634
+SHA256:
+  metadata.gz: 380a4d3f92566e9da10ce617114c07aca43f7313530efb1c905dec6771ab7e3f
+  data.tar.gz: 7f7db5fc7f2125649d3365154392dd10b2f7af445cb86bdd487cf5e6a730ad47
 SHA512:
-  metadata.gz: 76ca397a0037497a536d9193f9933cbc6d078c8e2731ca43bdd1682d83f50bd0c055074ba066d4e86c5b3a678cedf5073b6212bee79e7a8bb9d4e964bbf2d251
-  data.tar.gz: f35eb8952499925b14c1d4c94277ce411e9fcd04ab2f87983330d8f6f4052b39064c577e002c7618a6fcde7ed0c7d5e716d5045ac7cd7d9aac72aebd3506ca06
+  metadata.gz: f14b53f8afb43f140be186f20d1c175e8ab3c914219b6cb11146c0578bd2123ef9ebe13c17360d8de0a76aca1e87362d69428853db357393973cc91c00f66c5e
+  data.tar.gz: 937d8010b022fcd4fe88bdb625649009f03af708bc1ec593d1a103ef84a038b03a5f59c9a08e3d0b45de006dad9c7d35d336915891566aaa16b4bd5af18d5326

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.10"
+  spec.version = "0.1.11"
   spec.authors = ["BaritoLog"]
   spec.email   = ["pushm0v.development@gmail.com", "iman.tung@gmail.com"]
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'coveralls', '~> 0.8.21'
   spec.add_development_dependency 'test-unit', '~> 3.2'
-  
+
   spec.add_runtime_dependency "fluentd", "~> 0.12", ">= 0.12.0"
   spec.add_runtime_dependency "rest-client", "~> 2"
 end

data/lib/fluent/plugin/out_barito_k8s.rb

@@ -7,17 +7,10 @@ module Fluent
   class BaritoK8sOutput < BufferedOutput
 
     PLUGIN_NAME = 'barito_k8s'
-    
-    LABEL_APP_SECRET = 'baritoApplicationSecret'
-    LABEL_PRODUCE_HOST = 'baritoProduceHost'
-    LABEL_PRODUCE_PORT = 'baritoProducePort'
-    LABEL_PRODUCE_TOPIC = 'baritoProduceTopic'
-    
+    LABEL_APP_SECRET = 'barito.applicationSecret'
+    LABEL_PRODUCE_URL = 'barito.produceUrl'
 
     Fluent::Plugin.register_output(PLUGIN_NAME, self)
-    
-    config_param :use_https, :bool, :default => false
-    
 
     # Overide from BufferedOutput
     def start
@@ -31,38 +24,28 @@ module Fluent
 
     # Overide from BufferedOutput
     def write(chunk)
-      
       chunk.msgpack_each do |tag, time, record|
-        labels = record['kubernetes']['labels']
-        url = produce_url(labels)
-        secret = application_secret(labels)
-        
-        trail = Fluent::Plugin::ClientTrail.new(true)
-        
+        params = record['kubernetes']['annotations']
+
+        next if params.nil?
+        url = produce_url(params)
+        secret = application_secret(params)
+
+        next if url.nil? or secret.nil?
+        trail = Fluent::Plugin::ClientTrail.new(false)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
         header = {content_type: :json, 'X-App-Secret' => secret}
-        
+
         RestClient.post url, timber.to_json, header
       end
     end
-    
-    def produce_url(labels)
-      produce_host = labels[LABEL_PRODUCE_HOST]
-      produce_port = labels[LABEL_PRODUCE_PORT]
-      produce_topic = labels[LABEL_PRODUCE_TOPIC]
-      
-      protocol = @use_https? 'https' : 'http'
-      
-      produce_url = "#{protocol}://#{produce_host}:#{produce_port}/produce/#{produce_topic}"
-      produce_url
+
+    def produce_url(params)
+      params[LABEL_PRODUCE_URL]
     end
-    
-    def application_secret(labels)
-      labels[LABEL_APP_SECRET]
+
+    def application_secret(params)
+      params[LABEL_APP_SECRET]
     end
-    
-    
   end
-  
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for BaritoLog