fluent-plugin-prometheus 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 464d04815988e50129af844c36fba2f260d88071
-  data.tar.gz: b8ea875d061ce8b83c6f6970fa41aefaf3aad7cf
+SHA256:
+  metadata.gz: c8de232abd7ede7d5988f3280f6c8735de2c0371c831830ee56574ca5d38a056
+  data.tar.gz: 5042393a2e68e75dbcc35bf4ae7a857498f9d2e6ebbbd164f62a270e3274be65
 SHA512:
-  metadata.gz: a4d5053269cc5ecce7318408905da8c104d9f544c963595334c156f9bf351da35b8b6dcea4fe4a8c75aae14ab867025fab0aa3fa8cc34173a5916d2f5c8e4db2
-  data.tar.gz: 0d38d9a9ba4830b03376bcff82dd86f4739145ffae3e07ae2d4b308fcd3f6440a096918976a2583ff72c2bdb032f0e037973e9bd71076d9fcf2f4494b5b572bc
+  metadata.gz: 8acba008b1f5beafae1e7cac6214083ad033def64ea5af572724cbec3337b03c122cef09b1935a9617e375abc0f83b7b33269904f567f7e17ec90d7f79e8da40
+  data.tar.gz: 7187a5995e479c445bb0457081606b869456ad46bacd539962fb74147f5b9d72d0b78cb45b1d43a64c247328f673c91aa12ce86c53e915e171d6f5fb70e23afa

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}

data/lib/fluent/plugin/in_prometheus.rb

@@ -10,6 +10,23 @@ module Fluent
     config_param :port, :integer, :default => 24231
     config_param :metrics_path, :string, :default => '/metrics'
 
+    desc 'Enable ssl configuration for the server'
+    config_section :ssl, multi: false, required: false do
+      config_param :enable, :bool, required: false, default: false
+
+      desc 'Path to the ssl certificate in PEM format.  Read from file and added to conf as "SSLCertificate"'
+      config_param :certificate_path, :string, required: false, default: nil
+
+      desc 'Path to the ssl private key in PEM format.  Read from file and added to conf as "SSLPrivateKey"'
+      config_param :private_key_path, :string, required: false, default: nil
+
+      desc 'Path to CA in PEM format.  Read from file and added to conf as "SSLCACertificateFile"'
+      config_param :ca_path, :string, required: false, default: nil
+
+      desc 'Additional ssl conf for the server.  Ref: https://github.com/ruby/webrick/blob/master/lib/webrick/ssl.rb'
+      config_param :extra_conf, :hash, multi: false, required: false, default: {:SSLCertName => [['CN','nobody'],['DC','example']]}, symbolize_keys: true
+    end
+
     attr_reader :registry
 
     def initialize
@@ -23,13 +40,39 @@ module Fluent
 
     def start
       super
-      @server = WEBrick::HTTPServer.new(
+      config = {
         BindAddress: @bind,
         Port: @port,
         MaxClients: 5,
         Logger: WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
         AccessLog: [],
-      )
+      }
+      unless @ssl.nil? || !@ssl['enable']
+        require 'webrick/https'
+        require 'openssl'
+        if (@ssl['certificate_path'] && @ssl['private_key_path'].nil?) || (@ssl['certificate_path'].nil? && @ssl['private_key_path'])
+            raise RuntimeError.new("certificate_path and private_key_path most both be defined")
+        end
+        ssl_config = {
+            SSLEnable: true
+        }
+        if @ssl['certificate_path']
+          cert = OpenSSL::X509::Certificate.new(File.read(@ssl['certificate_path']))
+          ssl_config[:SSLCertificate] = cert
+        end
+        if @ssl['private_key_path']
+          key = OpenSSL::PKey::RSA.new(File.read(@ssl['private_key_path']))
+          ssl_config[:SSLPrivateKey] = key
+        end
+        ssl_config[:SSLCACertificateFile] = @ssl['ca_path'] if @ssl['ca_path']
+        ssl_config = ssl_config.merge(@ssl['extra_conf'])
+        config = ssl_config.merge(config)
+      end
+      @log.on_debug do
+        @log.debug("WEBrick conf: #{config}")
+      end
+
+      @server = WEBrick::HTTPServer.new(config)
       @server.mount(@metrics_path, MonitorServlet, self)
       @thread = Thread.new { @server.start }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A fluent plugin that collects metrics and exposes for Prometheus.