fluent-plugin-prometheus 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a57fd10632488d41ca2f4fd29de81b238e35ca8
-  data.tar.gz: 2008368dbac8114bf331f4b35171f23fea3d0224
+SHA256:
+  metadata.gz: bc058ef050bbdee33044783899fc6af14b731d974cb5f2b827997683a82ddb85
+  data.tar.gz: aef907fc671770e55a4fb1cad4de41b09c6a0b053b6fbcc5fbde8193d71faa0d
 SHA512:
-  metadata.gz: 5ce7f491f1f8528f6da19b0d20eff61a0c48fa76b082d83b8a3fdcf9493355a9def2ba5dccbb07941348a0d2ef0c34a8602f002e7e02f2109df6737414f7c3c1
-  data.tar.gz: ed7d1d932ecc7a498279cb836860633a51916e910f315addcb3c42519ed2f3aede977871959eaebb731b3725842a88905fd628dd633477e976f545cab86185b6
+  metadata.gz: 4888508f00beb7f8654e7139f1d26962e1f3a2193b81a97b4f874a61d82ea759bde7f14558fba123565a01758478d6e30aad46937e7715bed8489099424579de
+  data.tar.gz: ea29389ae6b63bf8a8f20124d7cd8651f88dbe45db66e40a74eecc2ce73762f400385ae73adf8074a2e8733cb132340233f282cb1d27aecfb627fbdd7e9bd468

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 
 rvm:
-  - "2.3.4"
-  - "2.4.1"
+  - "2.3.6"
+  - "2.4.3"
+  - "2.5.0"
 
 gemfile:
   - Gemfile

data/README.md

@@ -73,9 +73,11 @@ Current exposed metrics:
 
 With following configuration, those metrics are collected.
 
+```
 <source>
   @type prometheus_monitor
 </source>
+```
 
 More configuration parameters:
 
@@ -107,9 +109,11 @@ Current exposed metrics:
 
 With following configuration, those metrics are collected.
 
+```
 <source>
   @type prometheus_output_monitor
 </source>
+```
 
 More configuration parameters:
 
@@ -139,9 +143,11 @@ Default labels:
 
 With following configuration, those metrics are collected.
 
+```
 <source>
   @type prometheus_tail_monitor
 </source>
+```
 
 More configuration parameters:
 
@@ -340,9 +346,10 @@ Reserved placeholders are:
 - `${hostname}`: hostname
 - `${worker_id}`: fluent worker id
 - `${tag}`: tag name
+  - only availabe in prometheus output/filter plugin
 
 
-### top-label labels and labels inside metric
+### top-level labels and labels inside metric
 
 Prometheus output/filter plugin can have multiple metric section. Top-level labels section spcifies labels for all metrics. Labels section insede metric section specifis labels for the metric. Both are specified, labels are merged.
 

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "1.0.1"
+  spec.version       = "1.1.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

@@ -12,6 +12,23 @@ module Fluent::Plugin
     config_param :port, :integer, default: 24231
     config_param :metrics_path, :string, default: '/metrics'
 
+    desc 'Enable ssl configuration for the server'
+    config_section :ssl, required: false, multi: false do
+      config_param :enable, :bool, 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, 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, default: nil
+
+      desc 'Path to CA in PEM format.  Read from file and added to conf as "SSLCACertificateFile"'
+      config_param :ca_path, :string, 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, default: {:SSLCertName => [['CN','nobody'],['DC','example']]}, symbolize_keys: true
+    end
+
     attr_reader :registry
 
     def initialize
@@ -30,15 +47,40 @@ module Fluent::Plugin
 
     def start
       super
-
       log.debug "listening prometheus http server on http://#{@bind}:#{@port}/#{@metrics_path} for worker#{fluentd_worker_id}"
-      @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_create(:in_prometheus) do
         @server.start

data/lib/fluent/plugin/in_prometheus_tail_monitor.rb

@@ -69,7 +69,7 @@ module Fluent::Plugin
         tails = info['instance_variables'][:tails]
         next if tails.nil?
 
-        tails.each do |_, watcher|
+        tails.clone.each do |_, watcher|
           # Access to internal variable of internal class...
           # Very fragile implementation
           pe = watcher.instance_variable_get(:@pe)

data/lib/fluent/plugin/prometheus.rb

@@ -60,6 +60,7 @@ module Fluent
         placeholder_values = {
           'tag' => tag,
           'hostname' => @hostname,
+          'worker_id' => fluentd_worker_id,
         }
 
         es.each do |time, record|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-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.