fluent-plugin-out-http 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9b48a2a4c29d1c6a8e7178fbe20a8a5f008c62ee2e8c143462d1a87cfe8abb
-  data.tar.gz: df8adcc79a9f7cadb17ea48884ca3c6505c45d09ea3cb8049cab53ed7d02624f
+  metadata.gz: 3880fd774a40aecbe2a66d70b82f1839262ac6b788a9beded2cd5209a272c9eb
+  data.tar.gz: f4edd620701fdba356062650b67fb80b45308d240d49240b291447cea10788d8
 SHA512:
-  metadata.gz: fce02600476eddabc19b92fa08bc5ef555e3c90b459ec999c8fa9ec8290e490c1039d7bc51e1614f28c1bf9b4628c50ff734eeec515fd371af259138a4c6f1ff
-  data.tar.gz: df0573593436717a393523cf7a10325e9d45dd72e04cb7ee7950c8871ffd6257b7ab4123942384cab33554657c48d7f8b8b17adbd932cf0aa65f9d2441f8442f
+  metadata.gz: 7596426626b5c0c419c5851075f9727b998c10a8ddfc65304ed9580a461d5b0fabb626de0dd19ff8dd951174afb8ee749e65127df08dafcb6b610843226948a0
+  data.tar.gz: 03bfe5f1164a42accc81b1fc2a0c746ad80b468d70e0b313994e86d5b2765ffad11cf4f14aecc51bc7e4412c46999dd88c9fe251053b2140627555fa3c94d0ef

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.1.1
+* Added plain text transport capability
+* Added specify cacert file for ssl verify
+
+## 1.1.0
+* Support for jwt token authentication
+
+## 1.0.1
+* Added endpoint_url placeholder support
+
+## 1.0.0
+* Use Fluentd v1 API
+
 ## 0.2.0
 ### Added
 * SSL is now supported if `endpoint_url` uses the `https` scheme (uses ruby-2.1 syntax internally)

data/README.md

@@ -17,6 +17,7 @@ A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint.
       username        alice  # default: ''
       password        bobpop # default: '', secret: true
       buffered        true   # default: false. Switch non-buffered/buffered mode
+      cacert_file     /etc/ssl/endpoint1.cert # default: ''
       token           tokent # default: ''
     </match>
 

data/fluent-plugin-out-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http"
-  gem.version       = "1.1.0"
+  gem.version       = "1.1.1"
   gem.authors       = ["Marica Odagaki"]
   gem.email         = ["ento.entotto@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint}

data/lib/fluent/plugin/out_http.rb

@@ -24,7 +24,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   config_param :http_method, :enum, list: [:get, :put, :post, :delete], :default => :post
 
   # form | json
-  config_param :serializer, :enum, list: [:json, :form], :default => :form
+  config_param :serializer, :enum, list: [:json, :form, :text], :default => :form
 
   # Simple rate limiting: ignore any records within `rate_limit_msec`
   # since the last one.
@@ -33,6 +33,9 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   # Raise errors that were rescued during HTTP requests?
   config_param :raise_on_error, :bool, :default => true
 
+  # ca file to use for https request
+  config_param :cacert_file, :string, :default => ''
+
   # 'none' | 'basic' | 'jwt' | 'bearer'
   config_param :authentication, :enum, list: [:none, :basic, :jwt, :bearer],  :default => :none
   config_param :username, :string, :default => ''
@@ -56,6 +59,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
                          OpenSSL::SSL::VERIFY_PEER
                        end
 
+    @ca_file = @cacert_file
     @last_request_time = nil
     raise Fluent::ConfigError, "'tag' in chunk_keys is required." if !@chunk_key_tag && @buffered
   end
@@ -75,6 +79,8 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   def set_body(req, tag, time, record)
     if @serializer == :json
       set_json_body(req, record)
+    elsif @serializer == :text
+      set_text_body(req, record)
     else
       req.set_form_data(record)
     end
@@ -90,6 +96,11 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
     req['Content-Type'] = 'application/json'
   end
 
+  def set_text_body(req, data)
+    req.body = data["message"]
+    req['Content-Type'] = 'text/plain'
+  end
+
   def create_request(tag, time, record)
     url = format_url(tag, time, record)
     uri = URI.parse(url)
@@ -104,6 +115,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
         :use_ssl => uri.scheme == 'https'
       }
       opts[:verify_mode] = @ssl_verify_mode if opts[:use_ssl]
+      opts[:ca_file] = File.join(@ca_file) if File.file?(@ca_file)
       opts
   end
 

data/test/plugin/test_out_http.rb

@@ -96,6 +96,9 @@ class HTTPOutputTestBase < Test::Unit::TestCase
           record = {:auth => nil}
           if req.content_type == 'application/json'
             record[:json] = Yajl.load(req.body)
+          elsif req.content_type == 'text/plain'
+            puts req
+            record[:data] = req.body
           else
             record[:form] = Hash[*(req.body.split('&').map{|kv|kv.split('=')}.flatten)]
           end
@@ -202,6 +205,11 @@ class HTTPOutputTest < HTTPOutputTestBase
     serializer json
   ]
 
+  CONFIG_TEXT = %[
+    endpoint_url http://127.0.0.1:#{port}/api/
+    serializer text
+  ]
+
   CONFIG_PUT = %[
     endpoint_url http://127.0.0.1:#{port}/api/
     http_method put
@@ -390,6 +398,18 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_nil record[:auth]
   end
 
+  def test_emit_text
+    binary_string = "\xe3\x81\x82"
+    d = create_driver CONFIG_TEXT
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ "message" => "hello" })
+    end
+    assert_equal 1, @posts.size
+    record = @posts[0]
+    assert_equal 'hello', record[:data]
+    assert_nil record[:auth]
+  end
+
   def test_http_error_is_raised
     d = create_driver CONFIG_HTTP_ERROR
     assert_raise Errno::ECONNREFUSED do
@@ -542,6 +562,20 @@ class HTTPSOutputTest < HTTPOutputTestBase
     http_opts = d.instance.http_opts(test_uri)
     assert_equal true, http_opts[:use_ssl]
     assert_equal OpenSSL::SSL::VERIFY_NONE, http_opts[:verify_mode]
+
+    cacert_file_config = %[
+    endpoint_url https://127.0.0.1:#{self.class.port}/api/
+    ssl_no_verify true
+    cacert_file /tmp/ssl.cert
+    ]
+    d = create_driver cacert_file_config
+    FileUtils::touch '/tmp/ssl.cert'
+    http_opts = d.instance.http_opts(test_uri)
+    assert_equal true, http_opts[:use_ssl]
+    assert_equal OpenSSL::SSL::VERIFY_NONE, http_opts[:verify_mode]
+    assert_equal true, File.file?('/tmp/ssl.cert')
+    puts http_opts
+    assert_equal File.join('/tmp/ssl.cert'), http_opts[:ca_file]
   end
 
   def test_emit_form_ssl
@@ -559,4 +593,21 @@ class HTTPSOutputTest < HTTPOutputTestBase
 
     assert_equal '50', record[:form]['field1']
   end
+
+  def test_emit_form_ssl_ca
+    config = %[
+    endpoint_url https://127.0.0.1:#{self.class.port}/api/
+    ssl_no_verify true
+    cacert_file /tmp/ssl.cert
+    ]
+    d = create_driver config
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50 })
+    end
+
+    assert_equal 1, @posts.size
+    record = @posts[0]
+
+    assert_equal '50', record[:form]['field1']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Marica Odagaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby