fluent-plugin-barito 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c714bb9ef094e6168c5cebd7920e71789a6ddc5
-  data.tar.gz: 1b7f4582d8f1ff20222f103955a3b3dd96f2a7fb
+  metadata.gz: 753ba672b958cc160d38fc62eb418f8ab2919310
+  data.tar.gz: 95dfa553c16d8074452695552a2553e99a33a86c
 SHA512:
-  metadata.gz: a924d303d8181cdb6e60bb429804de69c2e359ecbf98920a834d62692331492f3329f2cbbf8fae7d30f912f2212cb5ceb2fba3678b987b0bbb4e1ee593c24a0a
-  data.tar.gz: 847728caa85523c37d3673577c38f87cb5aecee3a12775e3ddf67954b18252d8a19d770f28cacbc8d3890c5f2febff5b1443c87552e35c88eea606b2221bc970
+  metadata.gz: 79794a905fef7c4bb895d8e8f5348afce598e5f6c67d74ce2875a117c0fadc21590c821806b8489f67789d5792af30b8815d0536ceb6def5ac816343e02054d9
+  data.tar.gz: 6a36ee02fdfee7782bb49374816c9da298de13f9301b3b083521be09b026632d44fafab146dc69c34a90eb475df3de22226649535a677de4b01a8e62a90ca8ae

data/README.md

@@ -1,5 +1,7 @@
 # fluent-plugin-barito
 
+[![Build Status](https://travis-ci.org/BaritoLog/Barito-Fluent-Plugin.svg?branch=master)](https://travis-ci.org/BaritoLog/Barito-Fluent-Plugin)
+
 [Fluentd](https://fluentd.org/) output plugin for [BaritoLog](https://github.com/BaritoLog).
 
 ## Installation
@@ -15,7 +17,7 @@ $ gem install fluent-plugin-barito
 Add following line to your Gemfile:
 
 ```ruby
-gem "fluent-plugin-barito"
+gem 'fluent-plugin-barito'
 ```
 
 And then execute:
@@ -38,18 +40,21 @@ You can copy and paste generated documents here.
 
 ## Without Kubernetes
 
+Use type `barito_vm` for deployment without kubernetes
+
 ```conf
 <source>
   @type tail
   tag "barito"
   path /path/to/file.log
+  <parse>
+    @type none
+  </parse>
 </source>
 
 <match barito>
-  @type barito
+  @type barito_vm
 
-  use_https false
-  use_kubernetes false
   application_secret "ABCDE1234"
   produce_url "http://receiver-host:receiver-port/str/1/st/2/fw/3/cl/4/produce/some-topic"
   <buffer>
@@ -59,27 +64,17 @@ You can copy and paste generated documents here.
 ```
 
 ## With Kubernetes
-If this gem used in Kubernetes daemonset, change `use_kubernetes` to `true`.
+Change type to `barito_k8s`.
 
 ```
 <match barito>
-  @type barito
+  @type barito_k8s
 
   use_https false
-  use_kubernetes true
-
-  application_secret "ABCDE1234"
-  stream_id "1"
-  store_id "2"
-  client_id "3"
-  forwarder_id "4"
-  produce_host "receiver-host"
-  produce_port "receiver-port"
-  produce_topic "some-topic"
 </match>
 ```
 
-Or alternatively, we can set `kubernetes labels` in YAML :
+and set `kubernetes labels` in YAML :
 
 ```
 labels:

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.6"
+  spec.version = "0.1.7"
   spec.authors = ["BaritoLog"]
   spec.email   = ["pushm0v.development@gmail.com", "iman.tung@gmail.com"]
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'coveralls', '~> 0.8.21'
   spec.add_development_dependency 'test-unit', '~> 3.2'
   

data/lib/fluent/plugin/barito_timber.rb

@@ -1,43 +1,38 @@
-class Fluent::Plugin::Timber
+class Fluent::Plugin::TimberFactory
   MESSAGE_KEY = "message"
   
   HINTS_NO_TIMESTAMP = "no timestamp".freeze
   HINTS_NO_MESSAGE = "no #{MESSAGE_KEY}".freeze
   
-  attr_accessor :location, :tag, :message, :timestamp, :client_trail
-  
-  def to_hash 
-    {
-      'location' => @location, 
-      'tag' => @tag,
-      '@message' => @message, 
-      '@timestamp' => @timestamp,
-      'client_trail' => @client_trail.to_hash
-    }
-  end
-  
-  def to_json
-    to_hash.to_json
-  end
-  
   def self.create_timber(tag, time, record, trail)
     
-    timber = Fluent::Plugin::Timber.new
-    timber.tag = tag
-    timber.timestamp = Time.at(time).utc.strftime('%FT%TZ')
-    timber.message = record[MESSAGE_KEY] if record.is_a?(Hash) and record.has_key?(MESSAGE_KEY)
-    timber.client_trail = trail
+    begin
+      timber = JSON.parse(record['message'])
+    rescue 
+    end
     
-    if timber.timestamp.nil? 
-      timber.timestamp = Time.now.utc.strftime('%FT%TZ')
-      trail.hints << HINTS_NO_TIMESTAMP
+    unless timber.is_a?(Hash) then
+      timber = Hash.new
     end
     
-    if timber.message.nil? or timber.message.empty? 
-      timber.message = record.to_str
+    
+    message = record[MESSAGE_KEY] if record.is_a?(Hash) and record.has_key?(MESSAGE_KEY)
+    client_trail = trail
+    
+    
+    timestamp = Time.now.utc.strftime('%FT%TZ')
+  
+    
+    if message.nil? or message.empty? 
+      message = record.to_str
       trail.hints << HINTS_NO_MESSAGE
     end
     
+    timber['tag'] =  tag
+    timber['@message'] = message
+    timber['@timestamp'] = timestamp
+    timber['client_trail'] = client_trail.to_hash
+    
     timber
     
   end

data/lib/fluent/plugin/out_barito_k8s.rb

@@ -9,13 +9,9 @@ module Fluent
     PLUGIN_NAME = 'barito_k8s'
     
     LABEL_APP_SECRET = 'baritoApplicationSecret'
-    LABEL_STREAM_ID = 'baritoStreamId'
     LABEL_PRODUCE_HOST = 'baritoProduceHost'
     LABEL_PRODUCE_PORT = 'baritoProducePort'
     LABEL_PRODUCE_TOPIC = 'baritoProduceTopic'
-    LABEL_STORE_ID = 'baritoStoreId'
-    LABEL_FORWARD_ID = 'baritoForwarderId'
-    LABEL_CLIENT_ID = 'baritoClientId'
     
 
     Fluent::Plugin.register_output(PLUGIN_NAME, self)
@@ -43,25 +39,21 @@ module Fluent
         
         trail = Fluent::Plugin::ClientTrail.new(true)
         
-        timber = Fluent::Plugin::Timber::create_timber(tag, time, record, trail)
-        header = {content_type: :json, application_secret: secret}
+        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)
-      stream_id = labels[LABEL_STREAM_ID]
       produce_host = labels[LABEL_PRODUCE_HOST]
       produce_port = labels[LABEL_PRODUCE_PORT]
       produce_topic = labels[LABEL_PRODUCE_TOPIC]
-      store_id = labels[LABEL_STORE_ID]
-      forwarder_id = labels[LABEL_FORWARD_ID]
-      client_id = labels[LABEL_CLIENT_ID]
       
       protocol = @use_https? 'https' : 'http'
       
-      produce_url = "#{protocol}://#{produce_host}:#{produce_port}/str/#{stream_id}/st/#{store_id}/fw/#{forwarder_id}/cl/#{client_id}/produce/#{produce_topic}"
+      produce_url = "#{protocol}://#{produce_host}:#{produce_port}/produce/#{produce_topic}"
       produce_url
     end
     

data/lib/fluent/plugin/out_barito_vm.rb

@@ -26,11 +26,13 @@ module Fluent
     # Overide from BufferedOutput
     def write(chunk)
       
+      # logger = Logger.new(STDOUT)
+      
       chunk.msgpack_each do |tag, time, record|
         trail = Fluent::Plugin::ClientTrail.new(false)
         
-        timber = Fluent::Plugin::Timber::create_timber(tag, time, record, trail)
-        header = {content_type: :json, application_secret: @application_secret}
+        timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
+        header = {content_type: :json, 'X-App-Secret' => @application_secret}
         
         RestClient.post @produce_url, timber.to_json, header
       end

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

@@ -1,45 +1,51 @@
 require 'spec_helper'
 
-describe 'Fluent::Plugin::Timber' do
+describe 'Fluent::Plugin::TimberFactory' do
   
   describe 'create_timber' do
     
-    it 'is valid parameter' do
-      trail = Fluent::Plugin::ClientTrail.new(true)
+    context 'message' do
       
-      tag = "some_tag"
-      time = Time.parse('2018-01-31 12:22:26')
-      record = {"message" => "some_message"}
-      
-      timber = Fluent::Plugin::Timber::create_timber(tag, time, record, trail)
-      expect(timber.tag).to eq(tag)
-      expect(timber.timestamp).to eq(time)
-      expect(timber.message).to eq("some_message")
-      expect(timber.client_trail).to eq(trail)
+      it 'is json' do
+        trail = Fluent::Plugin::ClientTrail.new(true)
+        tag = "some_tag"
+        record = {'message' => '{"booking_id":1234,"foo":"bar"}'}
+        
+        timber = Fluent::Plugin::TimberFactory::create_timber(tag, nil, record, trail)
+        expect(timber['booking_id']).to eq(1234)
+        expect(timber['foo']).to eq('bar')
+      end
       
-    end
-    
-    it 'using current timestamp if timber.timestamp nil' do
-      time = Time.parse('2018-01-31 12:22:26')
+      it 'is quoted string' do
+        trail = Fluent::Plugin::ClientTrail.new(true)
+        tag = "some_tag"
+        record = {'message' => '"something"'}
+        timber = Fluent::Plugin::TimberFactory::create_timber(tag, nil, record, trail)
+        expect(timber['@message']).to eq('"something"')
+      end
       
-      Timecop.freeze(time) do
+      it 'is not json' do
         trail = Fluent::Plugin::ClientTrail.new(true)
-        
+        tag = "some_tag"
         record = {"message" => "some_message"}
-        timber = Fluent::Plugin::Timber::create_timber("some_tag", nil, record, trail)
         
-        expect(timber.timestamp).to eq(time)
-        expect(timber.client_trail.hints).to include(Fluent::Plugin::Timber::HINTS_NO_TIMESTAMP)
+        timber = Fluent::Plugin::TimberFactory::create_timber(tag, nil, record, trail)
+        expect(timber['tag']).to eq(tag)
+        expect(timber['@message']).to eq("some_message")
+        expect(timber['client_trail']).to eq(trail.to_hash)
+      end  
+      
+      it 'has no message' do
+        trail = Fluent::Plugin::ClientTrail.new(true)
+        timber = Fluent::Plugin::TimberFactory::create_timber("some_tag", nil, "invalid_message", trail)
+        expect(timber['@message']).to eq("invalid_message")
+        expect(timber['client_trail']['hints']).to include(Fluent::Plugin::TimberFactory::HINTS_NO_MESSAGE)
       end
-    end
-    
-    it 'using whole record if record[MESSAGE_KEY] emtpy' do
-      trail = Fluent::Plugin::ClientTrail.new(true)
       
-      timber = Fluent::Plugin::Timber::create_timber("some_tag", nil, "invalid_message", trail)
-      expect(timber.message).to eq("invalid_message")
-      expect(timber.client_trail.hints).to include(Fluent::Plugin::Timber::HINTS_NO_MESSAGE)
     end
+    
+    
+    
   end
   
 end

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

@@ -7,22 +7,18 @@ describe 'Fluent::BaritoK8sOutput' do
       k8s_labels = {
         Fluent::BaritoK8sOutput::LABEL_PRODUCE_HOST => 'localhost',
         Fluent::BaritoK8sOutput::LABEL_PRODUCE_PORT => '5000',
-        Fluent::BaritoK8sOutput::LABEL_STREAM_ID => '1',
-        Fluent::BaritoK8sOutput::LABEL_STORE_ID => '2',
-        Fluent::BaritoK8sOutput::LABEL_FORWARD_ID => '3',
-        Fluent::BaritoK8sOutput::LABEL_CLIENT_ID => '4',
         Fluent::BaritoK8sOutput::LABEL_PRODUCE_TOPIC => 'sometopic'
       }
       
       out1 = Fluent::BaritoK8sOutput.new
       out1.use_https = true
       url = out1.produce_url(k8s_labels)
-      expect(url).to eq 'https://localhost:5000/str/1/st/2/fw/3/cl/4/produce/sometopic'
+      expect(url).to eq 'https://localhost:5000/produce/sometopic'
       
       out2 = Fluent::BaritoK8sOutput.new
       out2.use_https = false
       url = out2.produce_url(k8s_labels)
-      expect(url).to eq 'http://localhost:5000/str/1/st/2/fw/3/cl/4/produce/sometopic'
+      expect(url).to eq 'http://localhost:5000/produce/sometopic'
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement