fluent-plugin-http 0.4.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06eb1f3844b3acb3defcd95799816b80407ec3fc
-  data.tar.gz: 560e89a57bb879563d10106738e26ebdc3a33679
+SHA256:
+  metadata.gz: 728702ac71e92c7912c589f5ea21c32ec6b4e824477051f158cfd0828b300a25
+  data.tar.gz: 24f01adfe8074a1d76e693df7f39e6b359ab93e241b9abd18959f373dd61ca4b
 SHA512:
-  metadata.gz: ec9675ab52b62d921e94d8c2a10bf2c9b14b8808cb606d648d23c64678b22471b243d9275165d562c22cb63ab883b37008395f31af048e507a41e57aeb4fbd3e
-  data.tar.gz: 0ed6223fcd2c1afb7adfa16c7d9a8d8277e9dc8ee4e7eb2fee6ad97be7bab75e33bde5c297a56ca56a44aa3bc905a3632b89ad7e4801fe225ffd38b940a29815
+  metadata.gz: 8435f519f8f21745ff6a6dcd690166af709ebd2513dd5318fc97342f9f9f9d241fb61774b3192a567111d1c3b91aa848ea25a5e5a37397647cb2334493de6d37
+  data.tar.gz: 340993979eaab93b449a57b995b0584f9e14fd652cc9a397f7a8e89ce49af048630761f10e2344c1a15fcc7653cc7cf69f78d0c4d3327c0bdeff0d136f0c4a45

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+5�K��\�}J'(��uX�
+�)zC7jQ��e����|jmi�~J6�?ۅ�Of1��p�|����i�r���03�q���E���������Y�_�nG������O��\:��i{�2���_�.�b�$$�n��2�`+b��/Tou`g����D���8���v�u�+k��K�г��_����q�An��l`~k��@"ۙ�+n��4�b�����W`p�J0���\�Q+�R΋ �$���g��g���ꡱ

data.tar.gz.sig

@@ -0,0 +1,3 @@
+J��<�'��'�}&����Cg]N듚}�m�f����k�2�7�MS+�3%��Q�#�2��%�۪5o�mݞ7�v#�D8�T�G�t������xʑ�F	�5w�e\u��b
+^��T���|>DB&Lr
��[���3�a���s�D���1
������̍L9��smѵ��asx�j����9{Be�zC=1��碔�
+�6��"��h�l��]���,�X�����$��v[�y��_���t�˄�6��?�
�IiY:3�

data/lib/fluent/plugin/out_http.rb

@@ -8,7 +8,7 @@ require 'uri'
 # Fluentd
 module Fluent
   # The out_http buffered output plugin sends event records via HTTP.
-  class HTTPOutput < ObjectBufferedOutput
+  class HTTPOutput < ObjectBufferedOutput # rubocop:disable Metrics/ClassLength
     Fluent::Plugin.register_output('http', self)
 
     desc 'URL to send event records to'
@@ -20,6 +20,15 @@ module Fluent
     desc 'Authorization token'
     config_param :authorization_token, :string, default: nil, secret: true
 
+    desc 'Keep-alive timeout'
+    config_param :keep_alive_timeout, :float, default: 60.0
+
+    desc 'Basic auth username'
+    config_param :username, :string, default: nil
+
+    desc 'Basic auth password'
+    config_param :password, :string, default: nil, secret: true
+
     def initialize
       require 'fluent/plugin/http/error'
 
@@ -36,16 +45,9 @@ module Fluent
       @url = validate_url(url)
       @accept_status_code = validate_accept_status_code(accept_status_code)
       @authorization_token = validate_authorization_token(authorization_token)
-    end
-
-    # Hook method that is called at the startup
-    #
-    # @return void
-    def start
-      super
-
-      is_https = url.scheme == 'https'
-      @http = Net::HTTP.start(url.host, url.port, use_ssl: is_https)
+      @keep_alive_timeout = validate_keep_alive_timeout(keep_alive_timeout)
+      @username = validate_username(username)
+      @password = validate_password(password)
     end
 
     # Hook method that is called at the shutdown
@@ -54,7 +56,7 @@ module Fluent
     def shutdown
       super
 
-      http.finish
+      disconnect
     end
 
     # Serializes the event
@@ -73,6 +75,8 @@ module Fluent
     #   formatted events
     # @return void
     def write(chunk)
+      return if chunk.empty?
+
       records = []
 
       chunk.msgpack_each do |tag_time_record|
@@ -80,31 +84,43 @@ module Fluent
       end
 
       post_records = post_records_request(records)
-      response = http.request(post_records)
+      response = connect.request(post_records)
 
       return if accept_status_code.include?(response.code)
+
       raise ResponseError.error(post_records, response)
     end
 
     private
 
-    attr_reader :http
+    def connect
+      @http ||= Net::HTTP.start(
+        url.host,
+        url.port,
+        use_ssl: url.scheme == 'https',
+        keep_alive_timeout: keep_alive_timeout
+      )
+    end
 
-    JSON_MIME_TYPE = 'application/json'
-    USER_AGENT = 'FluentPluginHTTP'
+    def disconnect
+      return unless defined?(@http)
+      return unless @http
 
-    private_constant :USER_AGENT, :JSON_MIME_TYPE
+      @http.finish
+    end
 
     def post_records_request(records)
       Net::HTTP::Post.new(url).tap do |request|
         request.body = Oj.dump(records)
 
-        request.content_type = JSON_MIME_TYPE
-        request['User-Agent'] = USER_AGENT
+        request.content_type = 'application/json'
+        request['User-Agent'] = 'FluentPluginHTTP'
 
         if authorization_token
           request['Authorization'] = "Token token=#{authorization_token}"
         end
+
+        request.basic_auth(username, password) if username
       end
     end
 
@@ -114,8 +130,8 @@ module Fluent
 
       raise Fluent::ConfigError,
             "Unacceptable URL scheme, expected HTTP or HTTPs: #{test_url}"
-    rescue URI::InvalidURIError => invalid_uri_error
-      raise Fluent::ConfigError, invalid_uri_error
+    rescue URI::InvalidURIError => e
+      raise Fluent::ConfigError, e
     end
 
     def validate_accept_status_code(status_codes)
@@ -139,5 +155,30 @@ module Fluent
 
       raise Fluent::ConfigError, "Invalid authorization token: #{value.inspect}"
     end
+
+    def validate_keep_alive_timeout(value)
+      return value if value >= 0
+
+      raise Fluent::ConfigError, "Invalid keep-alive timeout: #{value.inspect}"
+    end
+
+    def validate_username(value)
+      return value if value.nil?
+
+      if authorization_token
+        raise Fluent::ConfigError,
+              'Mutually exclusive: authorization_token and username'
+      end
+
+      return value unless value.empty?
+
+      raise Fluent::ConfigError, "Invalid username: #{value.inspect}"
+    end
+
+    def validate_password(value)
+      return value if value.nil? || username
+
+      raise Fluent::ConfigError, 'Password requires a username'
+    end
   end
 end

metadata

@@ -1,85 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Konstantin
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIC6DCCAdCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDDA9lZmly
+  L0RDPXNveWxlbnQwHhcNMjEwNTE4MDExNjEzWhcNMjIwNTE4MDExNjEzWjAaMRgw
+  FgYDVQQDDA9lZmlyL0RDPXNveWxlbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQC2DMbzgA39U+3VTMjXn+0jnOQyLdmXQ5EXgSLKCgBLIcFTc9J47Th0
+  7Yb/f4RzWh49/EkDBiDtLqFeKBYsj3q0e8tRCAs32NtVyl/4FDyJvWsK3R2tcXOV
+  qxs48J3CgG+rFLOcMC9YF4FPTkz4p3EYGFVjZTbiqyVVuIZzWtrwdZesBVgpBRyN
+  8sEyNoi8vcDiOmEwf9/TVMTDf/wu6a+i3LNVGYWlvgMJRssaAnj/IbFFtPTz30Hx
+  eTUdfJu8YbwRspfFzcJGLf32E7vXfmHHqNzqjh4zD9sVpvTHbqLLsgVa+nYHPHAe
+  dzSZ5gZjG1oZ7hZDCJoEPj0oCHT0qkuXAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBSsvp1HAfA+QTjOg/ehyhv7adp0FjANBgkqhkiG
+  9w0BAQsFAAOCAQEAjdz9WfpI7CU4stw8NK9ODdOKaKiCi+TSQWjolHf6DA0i/KsK
+  km3z/fDViF+kfG6YOdtxTPEyua0hzeIPUVYrA/u8gnzc0Q/qaW5OS86T7Kfou7Gq
+  BtuQbYgD/X+k62pFijR8VmK/5MCkzGzkNIzhiWnoNsGBIlbviSYYrSOY8HX/3AII
+  byLjhl7M3heb8m5jF+4jgXJfAOs6gtAYibX3YKrplewpJ3zd+7ebIXcHnob4UODK
+  WuleLMzqh7WrqMwrLkhSEnyo36OS8fZBNr8WPYAFpsz0z5TbR/8ymGAXobU87DdV
+  J4zDM21+9T3I6Jzw8TrlaRx7kUytTRxVgjqPlA==
+  -----END CERTIFICATE-----
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.57.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -108,33 +127,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.45'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.45'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/fluent/plugin/http/error.rb
 - lib/fluent/plugin/out_http.rb
-homepage: 
+homepage: https://github.com/soylent/fluent-plugin-http
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,16 +147,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Fluentd output plugin that sends event records via HTTP
+summary: Fluentd output plugin to send logs to an HTTP endpoint
 test_files: []

metadata.gz.sig

@@ -0,0 +1 @@
+^S��g<!b,�M��CE\���e����z��>�p"&x��)ŋ%���d��IZ�*��6�� {3�_�������?^�@�;���Y莲`ü��Ov�H��i��F���(���