fluent-plugin-barito 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf8a3646e7930f83602324b333be4399b4995455f061fa92c4a059b7e054c1d
-  data.tar.gz: f0abcd3652ba0ddbe029f59ed24332a87102bb2971a017577332418df60a9ffd
+  metadata.gz: 9e4c37eded53d571e098bfbe5b12df7d823711e420229facc6215bfa06f86386
+  data.tar.gz: dc1960dd6c13a8dfb765d8b5ae5275d285e225cc3c02e2ab3ea9e248d805d314
 SHA512:
-  metadata.gz: cb971966ecb6feff749865a6cea6c5bdc812bb104fe2a6fa8a99aebf0711dae35268dd9066ffe1206794322484611351a47989b022a88e54648d1c84e947448c
-  data.tar.gz: a54188a399d3958707511c178b0555b24102965f181e39e0d421f8498532a2ff3ff39cfd76a101a6f7c6245725fdffaecf1317d50393af5374953c349ae0c95e
+  metadata.gz: 88db76d4b14e5eab54266cb19a8c217bf9ca704bdca9030aa4f5d151ad2c1ed288875caec7518a197375b2906c201d81b57149f0160c1587fe42de67daf684bf
+  data.tar.gz: 4ceb45b8e712e9d27c929ae2eaa139bc10ef334879aadcaa438ac692b4d157cd7f6c75c659f03468312ea541a80f7451641f58f41cb4cfac40cd5de342358fbc

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+**0.3.5**
+
+- Add gzip/compressed feature before sent timber
+
+**0.3.4**
+
+- Add cluster name field (from k8s)
+  
 **0.3.3**
 
 - Print verbose error on logs when receiving failed response from the server

data/README.md

@@ -64,30 +64,32 @@ Use type `barito_vm` for deployment without kubernetes
 ```
 
 ## With Kubernetes
-Change type to `barito_k8s`.
+Change type to `barito_batch_k8s`.
 
 ```
-<match barito>
-  @type barito_k8s
-
-  use_https false
+<match kubernetes.var.log.containers.server-**.log>
+  @type barito_batch_k8s
+  name test_container
+  cluster_name test_cluster
+  application_name test_application_name
+  application_group_secret xxxxxx
+  produce_url https://router.barito/produce_batch
+  <buffer>
+    flush_at_shutdown false
+    flush_thread_count 8
+    flush_thread_interval 1
+    flush_thread_burst_interval 1
+    flush_mode interval
+    flush_interval 1s
+    queued_chunks_limit_size 1
+    overflow_action drop_oldest_chunk
+    retry_timeout 0s
+    retry_max_times 0
+    disable_chunk_backup true
+  </buffer>
 </match>
 ```
 
-and set `kubernetes labels` in YAML :
-
-```
-labels:
-    baritoApplicationSecret: "ABCDE1234"
-    baritoProduceHost: "receiver-host"
-    baritoProducePort: "receiver-port"
-    baritoProduceTopic: "some-topic"
-    baritoStreamId: "1"
-    baritoStoreId: "2"
-    baritoForwarderId: "3"
-    baritoClientId: "4"
-```
-
 ## Copyright
 
 * Copyright(c) 2018- BaritoLog

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

data/lib/fluent/plugin/barito_transport.rb

@@ -1,4 +1,5 @@
 require 'rest-client'
+require 'zlib'
 
 class Fluent::Plugin::BaritoTransport
 
@@ -17,4 +18,16 @@ class Fluent::Plugin::BaritoTransport
     end
   end
 
+  def send_compressed(timber, header)
+    begin
+      header['Content-Encoding'] = 'gzip'
+
+      gz = Zlib::GzipWriter.new(StringIO.new)
+      gz << timber.to_json
+      RestClient.post @produce_url, gz.close.string, header
+    rescue Exception => e
+      puts(header)
+      @logger.error [e.message, e.response, Hash[header.collect{|k,v| [k.to_s, v]}]].join(', ')
+    end
+  end
 end

data/lib/fluent/plugin/out_barito_batch_k8s.rb

@@ -14,6 +14,7 @@ module Fluent
     config_param :application_group_secret, :string, :default => nil
     config_param :application_name, :string, :default => nil
     config_param :produce_url, :string, :default => ''
+    config_param :cluster_name, :string, :default => ''
 
     # Overide from BufferedOutput
     def start
@@ -47,7 +48,8 @@ module Fluent
           'pod_name' => k8s_metadata['pod_name'],
           'namespace_name' => k8s_metadata['namespace_name'],
           'container_name' => k8s_metadata['container_name'],
-          'host' => k8s_metadata['host']
+          'host' => k8s_metadata['host'],
+          'cluster_name' => @cluster_name
         }
 
         data['items'] << new_timber
@@ -64,7 +66,7 @@ module Fluent
         header = {content_type: :json, 'X-App-Secret' => @application_secret}
       end
 
-      transport.send(data, header)
+      transport.send_compressed(data, header)
     end
 
     def clean_attribute(record)

data/lib/fluent/plugin/out_barito_batch_vm.rb

@@ -49,7 +49,7 @@ module Fluent
         header = {content_type: :json, 'X-App-Secret' => @application_secret}
       end
 
-      transport.send(data, header)
+      transport.send_compressed(data, header)
     end
   end
 end

data/lib/fluent/plugin/out_barito_vm.rb

@@ -42,7 +42,7 @@ module Fluent
         else
           header = {content_type: :json, 'X-App-Secret' => @application_secret}
         end
-        transport.send(timber, header)
+        transport.send_compressed(timber, header)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,22 +126,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -205,8 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for BaritoLog