fluent-plugin-http-pull 0.7.0 → 0.8.1

data/appveyor.yml

@@ -1,23 +1,23 @@
-version: '{build}'
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - "%devkit%\\devkitvars.bat"
-  - ruby --version
-  - gem --version
-  - bundle install
-
-build: off
-
-test_script:
-  - bundle exec rake test TESTOPTS=-v
-
-branches:
-  only:
-    - master
-
-# https://www.appveyor.com/docs/installed-software/#ruby
-environment:
-  matrix:
-    - ruby_version: "23-x64"
-      devkit: C:\Ruby23-x64\DevKit
+version: '{build}'
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - "%devkit%\\devkitvars.bat"
+  - ruby --version
+  - gem --version
+  - bundle install
+
+build: off
+
+test_script:
+  - bundle exec rake test TESTOPTS=-v
+
+branches:
+  only:
+    - master
+
+# https://www.appveyor.com/docs/installed-software/#ruby
+environment:
+  matrix:
+    - ruby_version: "23-x64"
+      devkit: C:\Ruby23-x64\DevKit

data/fluent-plugin-http-pull.gemspec

@@ -1,33 +1,33 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name    = "fluent-plugin-http-pull"
-  spec.version = "0.7.0"
-  spec.authors = ["filepang"]
-  spec.email   = ["filepang@gmail.com"]
-
-  spec.summary       = %q{fluent-plugin-http-pull}
-  spec.description   = %q{The input plugin of fluentd to pull log from rest api}
-  spec.homepage      = "https://github.com/HatsuneMiku3939/fluent-plugin-http-pull"
-  spec.license       = "Apache-2.0"
-
-  test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.files         = files
-  spec.executables   = files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = test_files
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = '>= 2.1'
-
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "simplecov", "~> 0.7"
-  spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_development_dependency "test-unit-rr", "~> 1.0", "~> 1.0.2"
-  spec.add_development_dependency "coveralls", "~> 0.7"
-
-  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
-  spec.add_runtime_dependency "rest-client", [">= 2.0.0", "< 3"]
-end
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name    = "fluent-plugin-http-pull"
+  spec.version = "0.8.1"
+  spec.authors = ["filepang"]
+  spec.email   = ["filepang@gmail.com"]
+
+  spec.summary       = %q{fluent-plugin-http-pull}
+  spec.description   = %q{The input plugin of fluentd to pull log from rest api}
+  spec.homepage      = "https://github.com/HatsuneMiku3939/fluent-plugin-http-pull"
+  spec.license       = "Apache-2.0"
+
+  test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.files         = files
+  spec.executables   = files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = test_files
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = '>= 2.1'
+
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "simplecov", "~> 0.7"
+  spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "test-unit-rr", "~> 1.0", "~> 1.0.2"
+  spec.add_development_dependency "coveralls", "~> 0.7"
+
+  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
+  spec.add_runtime_dependency "rest-client", [">= 2.0.0", "< 3"]
+end

data/lib/fluent/plugin/in_http_pull.rb

@@ -1,147 +1,168 @@
-#
-# Copyright 2017- filepang
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "fluent/plugin/input"
-require "rest-client"
-
-module Fluent
-  module Plugin
-    class HttpPullInput < Fluent::Plugin::Input
-      Fluent::Plugin.register_input("http_pull", self)
-      helpers :timer, :parser, :compat_parameters
-
-      def initialize
-        super
-      end
-
-      desc 'The tag of the event.'
-      config_param :tag, :string
-
-      desc 'The url of monitoring target'
-      config_param :url, :string
-
-      desc 'The interval time between periodic request'
-      config_param :interval, :time
-
-      desc 'The user agent string of request'
-      config_param :agent, :string, default: "fluent-plugin-http-pull"
-
-      desc 'status_only'
-      config_param :status_only, :bool, default: false
-
-      desc 'The http method for each request'
-      config_param :http_method, :enum, list: [:get, :post, :delete], default: :get
-
-      desc 'The timeout second of each request'
-      config_param :timeout, :time, default: 10
-
-      desc 'The HTTP proxy URL to use for each requests'
-      config_param :proxy, :string, default: nil
-
-      desc 'user of basic auth'
-      config_param :user, :string, default: nil
-
-      desc 'password of basic auth'
-      config_param :password, :string, default: nil
-
-      config_section :response_header, param_name: :response_headers, multi: true do
-        desc 'The name of header to cature from response'
-        config_param :header, :string
-      end
-
-      config_section :request_header, param_name: :request_headers, multi: true do
-        desc 'The name of request header'
-        config_param :header, :string
-
-        desc 'The value of request header'
-        config_param :value, :string
-      end
-
-      def configure(conf)
-        compat_parameters_convert(conf, :parser)
-        super
-
-        @parser = parser_create unless @status_only
-        @_request_headers = {
-          "Content-Type" => "application/x-www-form-urlencoded",
-          "User-Agent" => @agent
-        }.merge(@request_headers.map do |section|
-          header = section["header"]
-          value = section["value"]
-
-          [header.to_sym, value]
-        end.to_h)
-
-        @http_method = :head if @status_only
-      end
-
-      def start
-        super
-
-        timer_execute(:in_http_pull, @interval, &method(:on_timer))
-      end
-
-      def on_timer
-        record = { "url" => @url }
-
-        begin
-          request_options = { method: @http_method, url: @url, timeout: @timeout, headers: @_request_headers }
-
-          request_options[:proxy] = @proxy if @proxy
-          request_options[:user] = @user if @user
-          request_options[:password] = @password if @password
-
-          res = RestClient::Request.execute request_options
-
-          record["status"] = res.code
-          record["body"] = res.body
-
-          record["header"] = {} unless @response_headers.empty?
-          @response_headers.each do |section|
-            name = section["header"]
-            symbolize_name = name.downcase.gsub(/-/, '_').to_sym
-
-            record["header"][name] = res.headers[symbolize_name]
-          end
-        rescue StandardError => err
-          if err.respond_to? :http_code
-            record["status"] = err.http_code || 0
-          else
-            record["status"] = 0
-          end
-
-          record["error"] = err.message
-        end
-
-        record_time = Engine.now
-
-        if !@status_only && record["body"] != nil
-          @parser.parse(record["body"]) do |time, message|
-            record["message"] = message
-            record_time = time
-          end
-        end
-
-        record.delete("body")
-        router.emit(@tag, record_time, record)
-      end
-
-      def shutdown
-        super
-      end
-
-    end
-  end
-end
+#
+# Copyright 2017- filepang
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "fluent/plugin/input"
+require "rest-client"
+
+module Fluent
+  module Plugin
+    class HttpPullInput < Fluent::Plugin::Input
+      Fluent::Plugin.register_input("http_pull", self)
+      helpers :timer, :parser, :compat_parameters
+
+      def initialize
+        super
+      end
+
+      # basic options
+      desc 'The tag of the event.'
+      config_param :tag, :string
+
+      desc 'The url of monitoring target'
+      config_param :url, :string
+
+      desc 'The interval time between periodic request'
+      config_param :interval, :time
+
+      desc 'The user agent string of request'
+      config_param :agent, :string, default: "fluent-plugin-http-pull"
+
+      desc 'status_only'
+      config_param :status_only, :bool, default: false
+
+      desc 'The http method for each request'
+      config_param :http_method, :enum, list: [:get, :post, :delete], default: :get
+
+      desc 'The timeout second of each request'
+      config_param :timeout, :time, default: 10
+
+      # proxy options
+      desc 'The HTTP proxy URL to use for each requests'
+      config_param :proxy, :string, default: nil
+
+      # basic auth options
+      desc 'user of basic auth'
+      config_param :user, :string, default: nil
+
+      desc 'password of basic auth'
+      config_param :password, :string, default: nil
+
+      # req/res header options
+      config_section :response_header, param_name: :response_headers, multi: true do
+        desc 'The name of header to cature from response'
+        config_param :header, :string
+      end
+
+      config_section :request_header, param_name: :request_headers, multi: true do
+        desc 'The name of request header'
+        config_param :header, :string
+
+        desc 'The value of request header'
+        config_param :value, :string
+      end
+
+      # ssl options
+      desc 'verify_ssl'
+      config_param :verify_ssl, :bool, default: true
+
+      desc "The absolute path of directory where ca_file stored"
+      config_param :ca_path, :string, default: nil
+
+      desc "The absolute path of ca_file"
+      config_param :ca_file, :string, default: nil
+
+
+      def configure(conf)
+        compat_parameters_convert(conf, :parser)
+        super
+
+        @parser = parser_create unless @status_only
+        @_request_headers = {
+          "Content-Type" => "application/x-www-form-urlencoded",
+          "User-Agent" => @agent
+        }.merge(@request_headers.map do |section|
+          header = section["header"]
+          value = section["value"]
+
+          [header.to_sym, value]
+        end.to_h)
+
+        @http_method = :head if @status_only
+      end
+
+      def start
+        super
+
+        timer_execute(:in_http_pull, @interval, &method(:on_timer))
+      end
+
+      def on_timer
+        record = { "url" => @url }
+
+        begin
+          request_options = { method: @http_method, url: @url, timeout: @timeout, headers: @_request_headers }
+
+          request_options[:proxy] = @proxy if @proxy
+          request_options[:user] = @user if @user
+          request_options[:password] = @password if @password
+
+          request_options[:verify_ssl] = @verify_ssl
+          if @verify_ssl and @ca_path and @ca_file
+            request_options[:ssl_ca_path] = @ca_path
+            request_options[:ssl_ca_file] = @ca_file
+          end
+
+          res = RestClient::Request.execute request_options
+
+          record["status"] = res.code
+          record["body"] = res.body
+
+          record["header"] = {} unless @response_headers.empty?
+          @response_headers.each do |section|
+            name = section["header"]
+            symbolize_name = name.downcase.gsub(/-/, '_').to_sym
+
+            record["header"][name] = res.headers[symbolize_name]
+          end
+        rescue StandardError => err
+          if err.respond_to? :http_code
+            record["status"] = err.http_code || 0
+          else
+            record["status"] = 0
+          end
+
+          record["error"] = err.message
+        end
+
+        record_time = Engine.now
+
+        if !@status_only && record["body"] != nil
+          @parser.parse(record["body"]) do |time, message|
+            record["message"] = message
+            record_time = time
+          end
+        end
+
+        record.delete("body")
+        router.emit(@tag, record_time, record)
+      end
+
+      def shutdown
+        super
+      end
+
+    end
+  end
+end

data/test/helper.rb

@@ -1,29 +1,29 @@
-# simplecov must be loaded before any of target code
-require 'simplecov'
-require 'coveralls'
-Coveralls.wear!
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
-
-SimpleCov.start do
-  add_filter '/test/'
-end
-
-# load our target code
-$LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
-require "test-unit"
-require "fluent/test"
-require "fluent/test/driver/input"
-require "fluent/test/helpers"
-
-require "test/unit/rr"
-
-# require stub_server
-require "test/helper/stub_server"
-require "test/helper/stub_proxy"
-
-Test::Unit::TestCase.include(Fluent::Test::Helpers)
-Test::Unit::TestCase.extend(Fluent::Test::Helpers)
+# simplecov must be loaded before any of target code
+require 'simplecov'
+require 'coveralls'
+Coveralls.wear!
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+])
+
+SimpleCov.start do
+  add_filter '/test/'
+end
+
+# load our target code
+$LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
+require "test-unit"
+require "fluent/test"
+require "fluent/test/driver/input"
+require "fluent/test/helpers"
+
+require "test/unit/rr"
+
+# require stub_server
+require "test/helper/stub_server"
+require "test/helper/stub_proxy"
+
+Test::Unit::TestCase.include(Fluent::Test::Helpers)
+Test::Unit::TestCase.extend(Fluent::Test::Helpers)