fluent-plugin-ssl-check 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f7b5486c0f7706d4894b8095fdb61bae4ef4c13f737c50b0bd27c84f38d53d
-  data.tar.gz: '0186c6d987c747656417d61517e49d45de4a871e2a58dbb27c39aefedd0f1760'
+  metadata.gz: bd66e101f055ca5f4cf4d6ab29d548cb73df7783c9429171f03a397aaddd856f
+  data.tar.gz: 69fd54b23c4a88fa90565cf6bcb8d73990e96e0f42f869fd3fabf1ca16fa5f72
 SHA512:
-  metadata.gz: 6001e67a1e89cfad9cb37cc826e21b7af532c4ec12d2966fe3e0a3c790cec50ec5d028cd103b7bf105f0f38060db2e8de6f1eb285714d597b01dfe2e47f00a4d
-  data.tar.gz: c61103f0171fda24ef6f8323a018f7c012795e258993e46132940b69bcb152e1fdba80ec416105eec93debfe542895a8d1211da006cbaab5d0a28eb3bd4ca233
+  metadata.gz: 04500e488c04750d2f480037aa80feb16baf8d7a23b9b01f1921bbe201510b3b35a5694703da018a43705786af6d95ce67d7ee40fc0e661cd1df42823b640e4f
+  data.tar.gz: 13da4ca2dd02dd8c9a983570097cfa30b12b0f7e9dd0f573762d440c366fe0e0afc9b67deebf8c735dc87eaf52d8b1915dc3728b3179aa4d3686c5cc9a64c652

data/.rubocop.yml

@@ -27,8 +27,7 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/ParameterLists:
-  Exclude:
-    - test/helper.rb
+  Max: 6
 
 # Naming/MethodParameterName:
 #   Exclude:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-ssl-check (2.0.0)
+    fluent-plugin-ssl-check (2.1.0)
       fluentd (>= 0.14.10, < 2)
 
 GEM

data/README.md

@@ -30,6 +30,11 @@ Options are:
 * interval: check every X seconds
 * ca_path: directory that contains CA files
 * ca_file: specify a CA file directly
+* timeout: timeout for ssl check execution (5sec)
+* log_events: emit log format (true)
+* metric_events: emit metric format (false)
+* event_prefix: metric event prefix for extra dimension
+* timestamp_format: iso, epochmillis timestamp format (iso)
 
 If no port is specified with host, default port is 443.
 

data/fluent-plugin-ssl-check.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-ssl-check'
-  spec.version = '2.0.0'
+  spec.version = '2.1.0'
   spec.authors = ['Thomas Tych']
   spec.email   = ['thomas.tych@gmail.com']
 

data/lib/fluent/plugin/in_ssl_check.rb

@@ -35,7 +35,8 @@ module Fluent
       DEFAULT_TAG = NAME
       DEFAULT_HOST = 'localhost'
       DEFAULT_PORT = 443
-      DEFAULT_TIME = 600
+      DEFAULT_INTERVAL = 600
+      DEFAULT_SNI = true
       DEFAULT_TIMEOUT = 5
       DEFAULT_LOG_EVENTS = true
       DEFAULT_METRIC_EVENTS = false
@@ -47,11 +48,13 @@ module Fluent
       desc 'Host of the service to check'
       config_param :hosts, :array, default: [], value_type: :string
       desc 'Interval for the check execution'
-      config_param :interval, :time, default: DEFAULT_TIME
+      config_param :interval, :time, default: DEFAULT_INTERVAL
       desc 'CA path to load'
       config_param :ca_path, :string, default: nil
       desc 'CA file to load'
       config_param :ca_file, :string, default: nil
+      desc 'SNI support'
+      config_param :sni, :bool, default: DEFAULT_SNI
 
       desc 'Timeout for check'
       config_param :timeout, :integer, default: DEFAULT_TIMEOUT
@@ -82,6 +85,8 @@ module Fluent
       def start
         super
 
+        timer_execute(:ssl_check_timer, 1, repeat: false, &method(:check)) if interval > 60
+
         timer_execute(:ssl_check_timer, interval, repeat: true, &method(:check))
       end
 
@@ -102,7 +107,7 @@ module Fluent
         ssl_client = SslClient.new(
           host: host, port: port,
           ca_path: ca_path, ca_file: ca_file,
-          timeout: timeout
+          sni: sni, timeout: timeout
         )
         ssl_client.ssl_info
       end
@@ -209,13 +214,14 @@ module Fluent
       # ssl client
       #  to check ssl status
       class SslClient
-        attr_reader :host, :port, :ca_path, :ca_file, :timeout
+        attr_reader :host, :port, :ca_path, :ca_file, :sni, :timeout
 
-        def initialize(host:, port:, ca_path: nil, ca_file: nil, timeout: 5)
+        def initialize(host:, port:, ca_path: nil, ca_file: nil, sni: true, timeout: 5)
           @host = host
           @port = port
           @ca_path = ca_path
           @ca_file = ca_file
+          @sni = sni
           @timeout = timeout
         end
 
@@ -225,6 +231,7 @@ module Fluent
             Timeout.timeout(timeout) do
               tcp_socket = TCPSocket.open(host, port)
               ssl_socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ssl_context)
+              ssl_socket.hostname = host if sni
               ssl_socket.connect
               ssl_socket.sysclose
               tcp_socket.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ssl-check
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Thomas Tych
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump