fluent-plugin-vmware-log-intelligence 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda3fc2dd74d505b8554a65f96cba15afe0a188485fe04546da4b0c0ff686df4
-  data.tar.gz: b1f298d59fd07a1e4dbdaf6de30e213efd1e9e8ce75589e7de40388880168bc2
+  metadata.gz: b02a27878c1270123d2ff6496ba8623d560046b4eaf9008e754ffd539e730765
+  data.tar.gz: c4350681f8298633c2dccca64ab783923e43feac26d5b00e2110d9f70eae088e
 SHA512:
-  metadata.gz: b10231dc99aa642d6667fab12befc712a3552aaa6e0c4cadef3b0449df0bfe014683ecf3146b99fc5d1bd854b925c3d677046e990fca0809bb0db2416cb1919c
-  data.tar.gz: c8391559359760faec9bf61b4dc3f900415c2c822151953727202e58093394283ca44f00e5c268d7a750b0c549d0cb14f31db7ee153a7b1b2d13af9d475b3a1b
+  metadata.gz: f683c0d3e06cd4d780cfcc72698a43dbb9d20c8f29c82b5b49e2478fd0779e57f5f810c2c89ea7c6f567d04196b3cab4d7a05ffc56915f2677c64117af37aba6
+  data.tar.gz: edb4eaca17536dbbf1cb545013921805a197635221c526c55fd2f98ab3d7c941ea1c763723c0dc5d60b4fb648a9029978b2dbce3906c7e6db7854f4cf31214f8

data/Gemfile

@@ -1,11 +1,11 @@
-# Copyright (c) 2013 ablagoev
-# Copyright 2018 VMware, Inc.
-# SPDX-License-Identifier: MIT
-
-source "http://rubygems.org"
-
-gemspec
-
-group :test do
-  gem 'coveralls', require: false
+# Copyright (c) 2013 ablagoev
+# Copyright 2018 VMware, Inc.
+# SPDX-License-Identifier: MIT
+
+source "http://rubygems.org"
+
+gemspec
+
+group :test do
+  gem 'coveralls', require: false
 end

data/LICENSE.txt

@@ -1,15 +1,15 @@
-fluent-plugin-vmware-log-intelligence
-
-Copyright (c) 2013 ablagoev
-Copyright (c) 2018 VMware, Inc.				
-
-The MIT license (the "License") set forth below applies to all parts of the fluent-plugin-vmware-log-intelligence project.  You may not use this file except in compliance with the License.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+fluent-plugin-vmware-log-intelligence
+
+Copyright (c) 2013 ablagoev
+Copyright (c) 2018 VMware, Inc.				
+
+The MIT license (the "License") set forth below applies to all parts of the fluent-plugin-vmware-log-intelligence project.  You may not use this file except in compliance with the License.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,106 +1,113 @@
-= Overview
-
-vmware_log_intelligence is a Fluentd output plugin that buffers data and sends the data to VMware Log Intelligence.
-
-== Requirements
-
-fluentd version: 0.14.0 or above
-
-Ruby version: 2.2 or above
-
-== Build and install the plugin
-
-`gem build fluent-plugin-vmware-log-intelligence.gemspec`
-
-`gem install fluent-plugin-vmware-log-intelligence-1.0.0.gem`
-
-== Usage
-vmware_log_intelligence does not support Fluentd v0.12 style configurations.
-Please use Fluentd v1.0 style configurations when working with the plugin.
-
-Here is an example of the vmware_log_intelligence plugin configurations:
-
-  <match pattern>
-    @type vmware_log_intelligence
-    endpoint_url https://data.upgrade.symphony-dev.com/le-mans/v1/streams/ingestion-pipeline-stream
-    verify_ssl false
-    <headers>
-      Content-Type application/json
-      Authorization Bearer Your-VMware-Log-Intelligence-API-Token
-      structure simple
-    </headers>
-    <buffer>
-      chunk_limit_records 300
-      flush_interval 3s
-      retry_max_times 3
-    </buffer>
-    <format>
-      @type json
-      tag_key text
-    </format>
-  </match>
-
-You can find more configuration examples in the files under the examples folder.
-
-Besides Fluentd, you can also use the plugin with td-agent.
-
-== Payload format
-VMware Log Intelligence expects the body of the HTTP requests you send to be in JSON format. It also expects the JSON payload to have a 'text' field that contains your raw log text.
-
-The fluentd way of turning raw log text into a JSON is to use the JSON formatter plugin (https://docs.fluentd.org/v0.12/articles/formatter_json). The plugin uses a 'tag' field to store the text of a log. One configuration option of the JSON formatter plugin is called 'tag_key'. You need to set 'tag_key' to 'text' so that the JSON formatter will generate JSON payloads that conform to what VMware Log Intelligence expects.
-
-== Configuration
-
-=== endpoint_url
-This is the URL to which you want to send the logs to. You should set it to the URL of VMware Log Intelligence:
-https://data.upgrade.symphony-dev.com/le-mans/v1/streams/ingestion-pipeline-stream
-
-=== verify_ssl
-You can use this setting to control whether the vmware_log_intelligence plugin should verify
-the SSL certificate of the endpoint_url. You should always set this to `true` except in testing
-or troubleshooting.
-
-=== <headers>
-In order to send logs to VMware Log Intelligence, you need to have the `<headers>`
-section in your configuration. The `<headers>` section should look like the following:
-
-  <headers>
-    Content-Type application/json
-    Authorization Bearer Your-VMware-Log-Intelligence-API-Token
-    structure simple
-  </headers>
-
-=== <buffer>
-The vmware_log_intelligence plugin supports buffering. All the buffering configurations
-of Fluentd are supported. Detailed information of the buffering configurations can be
-found here https://docs.fluentd.org/v1.0/articles/buffer-section.
-
-== Run tests
-If you would like to contribute to this project, you might want to be able to run the tests
-under the `test` folder. You can do that in a Ruby environment you have set up on your dev
-machine. You can also run the tests in a Docker container. To run the tests in a Docker container,
-you can follow these steps:
-
-Go to the root folder of this project and build the Docker image like this:
-`docker build -t fluent-plugin-dev .`
-
-Run the container like this:
-`docker run --rm -i -t --name fluent-plugin-dev -v $(pwd):/app fluent-plugin-dev /bin/bash`
-
-Once inside the container, you can run the following to make sure that all dependecies are installed:
-`bundle install`
-
-Then you can run tests like this:
-`bundle exec rake`
-
-== Contributing
-The vmware_log_intelligence plugin project team welcomes contributions from the community. Before you start working with fluent-plugin-vmware-log-intelligence, please read our [Developer Certificate of Origin](https://cla.vmware.com/dco). All contributions to this repository must be signed as described on that page. Your signature certifies that you wrote the patch or have the right to pass it on as an open-source patch. For more detailed information, refer to [CONTRIBUTING.md](CONTRIBUTING.md).
-
-== License
-Please see LICENSE.txt[LICENSE.txt].
-
-== Copyright
-
-Copyright (c) 2013 ablagoev.
-
-Copyright 2018 VMware, Inc.
+= Overview
+
+vmware_log_intelligence is a Fluentd output plugin that buffers data and sends the data to VMware Log Intelligence.
+
+== Requirements
+
+fluentd version: 0.14.0 or above
+
+Ruby version: 2.2 or above
+
+== Build and install the plugin
+
+`gem build fluent-plugin-vmware-log-intelligence.gemspec`
+
+`gem install fluent-plugin-vmware-log-intelligence-1.0.0.gem`
+
+== Usage
+vmware_log_intelligence does not support Fluentd v0.12 style configurations.
+Please use Fluentd v1.0 style configurations when working with the plugin.
+
+Here is an example of the vmware_log_intelligence plugin configurations:
+
+  <match pattern>
+    @type vmware_log_intelligence
+    endpoint_url https://data.upgrade.symphony-dev.com/le-mans/v1/streams/ingestion-pipeline-stream
+    verify_ssl false
+    http_compress false
+    <headers>
+      Content-Type application/json
+      Authorization Bearer Your-VMware-Log-Intelligence-API-Token
+      structure simple
+    </headers>
+    <buffer>
+        @type file
+        path /path/to/buffer/lint.buf
+        chunk_limit_records 300
+        flush_interval 20s
+        delayed_commit_timeout 120s
+        retry_max_times 3
+      </buffer>
+    <format>
+      @type json
+      tag_key text
+    </format>
+  </match>
+
+You can find more configuration examples in the files under the examples folder.
+
+Besides Fluentd, you can also use the plugin with td-agent.
+
+== Payload format
+VMware Log Intelligence expects the body of the HTTP requests you send to be in JSON format. It also expects the JSON payload to have a 'text' field that contains your raw log text.
+
+The fluentd way of turning raw log text into a JSON is to use the JSON formatter plugin (https://docs.fluentd.org/v0.12/articles/formatter_json). The plugin uses a 'tag' field to store the text of a log. One configuration option of the JSON formatter plugin is called 'tag_key'. You need to set 'tag_key' to 'text' so that the JSON formatter will generate JSON payloads that conform to what VMware Log Intelligence expects.
+
+== Configuration
+
+=== endpoint_url
+This is the URL to which you want to send the logs to. You should set it to the URL of VMware Log Intelligence:
+https://data.upgrade.symphony-dev.com/le-mans/v1/streams/ingestion-pipeline-stream
+
+=== verify_ssl
+You can use this setting to control whether the vmware_log_intelligence plugin should verify
+the SSL certificate of the endpoint_url. You should always set this to `true` except in testing
+or troubleshooting.
+
+=== http_compress
+You can use this setting to compress the data while sending it to vRealize Log Insight Cloud. The default value is set 'false' here, If needed you can set it 'true'.   
+
+=== <headers>
+In order to send logs to VMware Log Intelligence, you need to have the `<headers>`
+section in your configuration. The `<headers>` section should look like the following:
+
+  <headers>
+    Content-Type application/json
+    Authorization Bearer Your-VMware-Log-Intelligence-API-Token
+    structure simple
+  </headers>
+
+=== <buffer>
+The vmware_log_intelligence plugin supports buffering. All the buffering configurations
+of Fluentd are supported. Detailed information of the buffering configurations can be
+found here https://docs.fluentd.org/v1.0/articles/buffer-section.
+
+== Run tests
+If you would like to contribute to this project, you might want to be able to run the tests
+under the `test` folder. You can do that in a Ruby environment you have set up on your dev
+machine. You can also run the tests in a Docker container. To run the tests in a Docker container,
+you can follow these steps:
+
+Go to the root folder of this project and build the Docker image like this:
+`docker build -t fluent-plugin-dev .`
+
+Run the container like this:
+`docker run --rm -i -t --name fluent-plugin-dev -v $(pwd):/app fluent-plugin-dev /bin/bash`
+
+Once inside the container, you can run the following to make sure that all dependecies are installed:
+`bundle install`
+
+Then you can run tests like this:
+`bundle exec rake`
+
+== Contributing
+The vmware_log_intelligence plugin project team welcomes contributions from the community. Before you start working with fluent-plugin-vmware-log-intelligence, please read our [Developer Certificate of Origin](https://cla.vmware.com/dco). All contributions to this repository must be signed as described on that page. Your signature certifies that you wrote the patch or have the right to pass it on as an open-source patch. For more detailed information, refer to [CONTRIBUTING.md](CONTRIBUTING.md).
+
+== License
+Please see LICENSE.txt[LICENSE.txt].
+
+== Copyright
+
+Copyright (c) 2013 ablagoev.
+
+Copyright 2018 VMware, Inc.

data/Rakefile

@@ -1,16 +1,16 @@
-#!/usr/bin/env rake
-
-# Copyright (c) 2013 ablagoev
-# Copyright 2018 VMware, Inc.
-# SPDX-License-Identifier: MIT
-
-require "bundler/gem_tasks"
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
+#!/usr/bin/env rake
+
+# Copyright (c) 2013 ablagoev
+# Copyright 2018 VMware, Inc.
+# SPDX-License-Identifier: MIT
+
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
 task :default => :test

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/fluent-plugin-vmware-log-intelligence.gemspec

@@ -1,53 +1,53 @@
-# Copyright (c) 2013 ablagoev
-# Copyright 2018 VMware, Inc.
-# SPDX-License-Identifier: MIT
-
-$:.push File.expand_path('../lib', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = 'fluent-plugin-vmware-log-intelligence'
-  s.version     = File.read("VERSION").strip
-  s.date        = '2018-08-12'
-  s.summary     = "Fluentd buffered output plugin for VMware Log Intelligence"
-  s.description = "Send Fluentd buffered logs to VMware Log Intelligence"
-  s.authors     = ["Alexander Blagoev", "Chaur Wu"]
-  s.email       = 'gwu@vmware.com'
-  s.homepage    =
-    'http://github.com/vmware/fluent-plugin-vmware-log-intelligence'
-
-  s.files       = [
-    "lib/fluent/plugin/out_vmware_log_intelligence.rb",
-    "lib/fluent/plugin/http_client.rb",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "fluent-plugin-vmware-log-intelligence.gemspec",
-    "test/helper.rb",
-    "test/plugin/test_out_vmware_log_intelligence.rb",
-    "test/plugin/test_http_client.rb",
-  ]
-
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.licenses = ["MIT"]
-
-  s.require_paths = ['lib']
-
-  s.add_dependency "fluentd", ">= 0.14.20"
-  s.add_dependency "http", ">= 0.9.8"
-  s.add_dependency "myslog", "~> 0.0"
-  s.add_dependency "fluent-plugin-mysqlslowquery", ">= 0.0.9"
-  s.add_development_dependency "rake", ">= 0.9.2"
-  s.add_development_dependency "bundler", ">= 1.3.4"
-  s.add_development_dependency 'test-unit', '~> 3.1.0'
-  s.add_development_dependency 'webmock', '~> 3.4.0'
-  s.add_development_dependency 'fluent-plugin-detect-exceptions', '>= 0.0.12'
-  s.add_development_dependency 'fluent-plugin-concat', '>= 2.0.0'
-  s.add_development_dependency 'fluent-plugin-kubernetes_metadata_filter', '>= 2.0.0'
-  s.add_development_dependency 'fluent-plugin-multi-format-parser', '>= 1.0.0'
-  s.add_development_dependency 'fluent-plugin-postgres', '>= 0.0.1'
-end
+# Copyright (c) 2013 ablagoev
+# Copyright 2018 VMware, Inc.
+# SPDX-License-Identifier: MIT
+
+$:.push File.expand_path('../lib', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = 'fluent-plugin-vmware-log-intelligence'
+  s.version     = File.read("VERSION").strip
+  s.date        = '2018-08-12'
+  s.summary     = "Fluentd buffered output plugin for VMware Log Intelligence"
+  s.description = "Send Fluentd buffered logs to VMware Log Intelligence"
+  s.authors     = ["Alexander Blagoev", "Chaur Wu"]
+  s.email       = 'gwu@vmware.com'
+  s.homepage    =
+    'http://github.com/vmware/fluent-plugin-vmware-log-intelligence'
+
+  s.files       = [
+    "lib/fluent/plugin/out_vmware_log_intelligence.rb",
+    "lib/fluent/plugin/http_client.rb",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "fluent-plugin-vmware-log-intelligence.gemspec",
+    "test/helper.rb",
+    "test/plugin/test_out_vmware_log_intelligence.rb",
+    "test/plugin/test_http_client.rb",
+  ]
+
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.licenses = ["MIT"]
+
+  s.require_paths = ['lib']
+
+  s.add_dependency "fluentd", ">= 0.14.20"
+  s.add_dependency "http", ">= 0.9.8"
+  s.add_dependency "myslog", "~> 0.0"
+  s.add_dependency "fluent-plugin-mysqlslowquery", ">= 0.0.9"
+  s.add_development_dependency "rake", ">= 0.9.2"
+  s.add_development_dependency "bundler", ">= 1.3.4"
+  s.add_development_dependency 'test-unit', '~> 3.1.0'
+  s.add_development_dependency 'webmock', '~> 3.4.0'
+  s.add_development_dependency 'fluent-plugin-detect-exceptions', '>= 0.0.12'
+  s.add_development_dependency 'fluent-plugin-concat', '>= 2.0.0'
+  s.add_development_dependency 'fluent-plugin-kubernetes_metadata_filter', '>= 2.0.0'
+  s.add_development_dependency 'fluent-plugin-multi-format-parser', '>= 1.0.0'
+  s.add_development_dependency 'fluent-plugin-postgres', '>= 0.0.1'
+end

data/lib/fluent/plugin/http_client.rb

@@ -1,72 +1,72 @@
-# Copyright 2018 VMware, Inc.
-# SPDX-License-Identifier: MIT
-
-module Fluent::Plugin
-  class HttpClient
-    def initialize(endpoint_url, verify_ssl, 
-      headers, statuses, open_timeout, read_timeout, log)
-      @log = log
-      @statuses = statuses
-      @options = {}
-
-      if !verify_ssl
-        @log.warn('SSL verification of the remote VMware Log Intelligence service is turned off. This is serious security risk. Please turn on SSL verification and restart the Fluentd/td-agent process.')
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        @options = {:ssl_context => ctx}
-      end
-
-      timeout_options = {
-        :connect_timeout => open_timeout,
-        :read_timeout => read_timeout
-      }
-        
-      @conn = HTTP.persistent(endpoint_url)
-        .headers(headers)
-        .timeout(timeout_options)
-
-      @endpoint_path = HTTP::URI.parse(endpoint_url).path
-      @last_429_time = nil
-    end
-
-    def check_quota
-      if @last_429_time
-        if (Time.new - @last_429_time) < 600
-          return false
-        end
-
-        @last_429_time = nil
-      end
-      return true
-    end
-
-    def post(data)
-      if !check_quota
-        return
-      end
-
-      begin
-        response = @conn.post(@endpoint_path, @options.merge(:body => data))
-        response.body.to_s
-        if (response.code == 429)
-          @log.warn('1GB quota of free account has been reached. Will stop sending data for 1 hour.')
-          @last_429_time = Time.new
-        else
-          @last_429_time = nil
-        end
-        
-        if @statuses.include? response.code.to_i
-          # Raise an exception so that fluent will retry based on the configurations.
-          fail "Server returned bad status: #{response.code}. #{response.to_s}"
-        end
-
-      rescue EOFError, SystemCallError, OpenSSL::SSL::SSLError => e
-        @log.warn "http post raises exception: #{e.class}, '#{e.message}'"
-      end
-    end
-
-    def close
-      @conn.close
-    end
-  end
-end
+# Copyright 2018 VMware, Inc.
+# SPDX-License-Identifier: MIT
+
+module Fluent::Plugin
+  class HttpClient
+    def initialize(endpoint_url, verify_ssl, 
+      headers, statuses, open_timeout, read_timeout, log)
+      @log = log
+      @statuses = statuses
+      @options = {}
+
+      if !verify_ssl
+        @log.warn('SSL verification of the remote VMware Log Intelligence service is turned off. This is serious security risk. Please turn on SSL verification and restart the Fluentd/td-agent process.')
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        @options = {:ssl_context => ctx}
+      end
+
+      timeout_options = {
+        :connect_timeout => open_timeout,
+        :read_timeout => read_timeout
+      }
+        
+      @conn = HTTP.persistent(endpoint_url)
+        .headers(headers)
+        .timeout(timeout_options)
+
+      @endpoint_path = HTTP::URI.parse(endpoint_url).path
+      @last_429_time = nil
+    end
+
+    def check_quota
+      if @last_429_time
+        if (Time.new - @last_429_time) < 600
+          return false
+        end
+
+        @last_429_time = nil
+      end
+      return true
+    end
+
+    def post(data)
+      if !check_quota
+        return
+      end
+
+      begin
+        response = @conn.post(@endpoint_path, @options.merge(:body => data))
+        response.body.to_s
+        if (response.code == 429)
+          @log.warn('1GB quota of free account has been reached. Will stop sending data for 1 hour.')
+          @last_429_time = Time.new
+        else
+          @last_429_time = nil
+        end
+        
+        if @statuses.include? response.code.to_i
+          # Raise an exception so that fluent will retry based on the configurations.
+          fail "Server returned bad status: #{response.code}. #{response.to_s}"
+        end
+
+      rescue EOFError, SystemCallError, OpenSSL::SSL::SSLError => e
+        @log.warn "http post raises exception: #{e.class}, '#{e.message}'"
+      end
+    end
+
+    def close
+      @conn.close
+    end
+  end
+end