fluent-plugin-prometheus 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f287173d66fb76c109519b9b81e230e13a324dd1b1388b644b57d29aff872a
-  data.tar.gz: 8bf951166f0a76ebaf12bc55e67c774ee8788f69fd74c60ae9168ab0729424ef
+  metadata.gz: a2c3701c496726e677bf8182e4b549d493648b1f639930a7508ead0a07611ed6
+  data.tar.gz: c7f62e9dfc1a37d8089e07b41a6704e92fc365c0811b960bb628ffafe01134eb
 SHA512:
-  metadata.gz: 4e7f3fae38dd44efa082be764b65d610649aa6d6449d159fffb380bfe71464c79bd7764c492c2518ea6a100105910e9ae38b2e37b6327754b442fc780f81d975
-  data.tar.gz: 7a5235458808bf4d9eb9b60994688171d45c455c703dcc55062432765b84d9e7e800043bde6e59d4507a45330461e2554b7631ca69fbaa4e2d8fd523ed664625
+  metadata.gz: 53f721520289f3ca5f8b7b47fe4c5daf7829fae4e22f4bd6145dffaa1d4d173fc81909576067136299b0e256a55d8b961d432ac15aa16074f73dfb6003b9fbfb
+  data.tar.gz: 5cdf65cb05bf988df0cfc255a2af2e0f5b8223e5b54c56d4bbabe081827c111e7e210d45d2256d6f3af9cf4dab9154d2b6aba85c7226a87ebb96b420e9230402

data/.github/workflows/linux.yml

@@ -4,20 +4,30 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+  schedule:
+    - cron: '0 0 1 * *'
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.7
   build:
+    needs: ruby-versions
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.4', '3.3', '3.2', '3.1', '3.0', '2.7' ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby: head
         os:
           - ubuntu-latest
         experimental: [false]
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -14,3 +14,4 @@
 *.o
 *.a
 mkmf.log
+/vendor/

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 2.2.2 - 2026/03/27
+
+	* in_prometheus: fix: Add IPv6 support for bind parameter (#240)
+
 Release 2.2.1 - 2025/03/24
 
 	* in_prometheus_tail_monitor: Add throttling metrics as `fluentd_tail_file_throttled`. (GitHub#227)

data/README.md

@@ -1,6 +1,6 @@
 # fluent-plugin-prometheus, a plugin for [Fluentd](https://www.fluentd.org)
 
-[![Build Status](https://travis-ci.org/fluent/fluent-plugin-prometheus.svg?branch=master)](https://travis-ci.org/fluent/fluent-plugin-prometheus)
+[![linux](https://github.com/fluent/fluent-plugin-prometheus/actions/workflows/linux.yml/badge.svg)](https://github.com/fluent/fluent-plugin-prometheus/actions/workflows/linux.yml)
 
 A fluent plugin that instruments metrics from records and exposes them via web interface. Intended to be used together with a [Prometheus server](https://github.com/prometheus/prometheus).
 

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "2.2.1"
+  spec.version       = "2.2.2"
   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/async_wrapper.rb

@@ -4,13 +4,20 @@ module Fluent::Plugin
   class PrometheusInput
     module AsyncWrapper
       def do_request(host:, port:, secure:)
+        # Format host for URI - bracket IPv6 addresses if not already bracketed
+        uri_host = if host.include?(':') && !host.start_with?('[')
+                     "[#{host}]"
+                   else
+                     host
+                   end
+        
         endpoint =
           if secure
             context = OpenSSL::SSL::SSLContext.new
             context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            Async::HTTP::Endpoint.parse("https://#{host}:#{port}", ssl_context: context)
+            Async::HTTP::Endpoint.parse("https://#{uri_host}:#{port}", ssl_context: context)
           else
-            Async::HTTP::Endpoint.parse("http://#{host}:#{port}")
+            Async::HTTP::Endpoint.parse("http://#{uri_host}:#{port}")
           end
 
         Async::HTTP::Client.open(endpoint) do |client|

data/lib/fluent/plugin/in_prometheus.rb

@@ -67,12 +67,25 @@ module Fluent::Plugin
     def start
       super
 
+      # Normalize bind address: strip brackets if present (for consistency)
+      # Brackets are only for URI formatting, not for socket binding
+      @bind = @bind[1..-2] if @bind.start_with?('[') && @bind.end_with?(']')
+
       scheme = @secure ? 'https' : 'http'
-      log.debug "listening prometheus http server on #{scheme}:://#{@bind}:#{@port}/#{@metrics_path} for worker#{fluentd_worker_id}"
+      # Format bind address properly for URLs (add brackets for IPv6)
+      bind_display = @bind.include?(':') ? "[#{@bind}]" : @bind
+      log.debug "listening prometheus http server on #{scheme}://#{bind_display}:#{@port}/#{@metrics_path} for worker#{fluentd_worker_id}"
 
       proto = @secure ? :tls : :tcp
 
-      if @ssl && @ssl['enable'] && @ssl['extra_conf']
+      # IPv6 + TLS combination is not currently supported
+      if @bind.include?(':') && @secure
+        raise Fluent::ConfigError, 'IPv6 with <transport tls> is not currently supported. Use bind 0.0.0.0 with TLS, or bind ::1 without TLS.'
+      end
+
+      # Use webrick for IPv6 or SSL extra_conf
+      # The http_server helper has issues with IPv6 URI construction
+      if (@ssl && @ssl['enable'] && @ssl['extra_conf']) || @bind.include?(':')
         start_webrick
         return
       end
@@ -110,6 +123,8 @@ module Fluent::Plugin
                   ssl_config
                 end
 
+      # Use raw bind address for socket binding (no brackets)
+      # Brackets are only for URL/URI formatting, not for bind()
       http_server_create_http_server(:in_prometheus_server, addr: @bind, port: @port, logger: log, proto: proto, tls_opts: tls_opt) do |server|
         server.get(@metrics_path) { |_req| all_metrics }
         server.get(@aggregated_metrics_path) { |_req| all_workers_metrics }
@@ -127,6 +142,7 @@ module Fluent::Plugin
     private
 
     # For compatiblity because http helper can't support extra_conf option
+    # Also used for IPv6 addresses since http helper has IPv6 URI issues
     def start_webrick
       require 'webrick/https'
       require 'webrick'
@@ -138,28 +154,32 @@ module Fluent::Plugin
         Logger: WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
         AccessLog: [],
       }
-      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
+      
+      # Configure SSL if enabled
+      if @ssl && @ssl['enable']
+        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,
-        SSLCertName: [['CN', 'nobody'], ['DC', 'example']]
-      }
+        ssl_config = {
+          SSLEnable: true,
+          SSLCertName: [['CN', 'nobody'], ['DC', 'example']]
+        }
 
-      if @ssl['certificate_path']
-        cert = OpenSSL::X509::Certificate.new(File.read(@ssl['certificate_path']))
-        ssl_config[:SSLCertificate] = cert
-      end
+        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.read(@ssl['private_key_path'])
-        ssl_config[:SSLPrivateKey] = key
-      end
+        if @ssl['private_key_path']
+          key = OpenSSL::PKey.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']) if @ssl['extra_conf']
-      config = ssl_config.merge(config)
+        ssl_config[:SSLCACertificateFile] = @ssl['ca_path'] if @ssl['ca_path']
+        ssl_config = ssl_config.merge(@ssl['extra_conf']) if @ssl['extra_conf']
+        config = ssl_config.merge(config)
+      end
 
       @log.on_debug do
         @log.debug("WEBrick conf: #{config}")
@@ -207,7 +227,16 @@ module Fluent::Plugin
     end
 
     def send_request_to_each_worker
-      bind = (@bind == '0.0.0.0') ? '127.0.0.1' : @bind
+      # Convert bind address to localhost for inter-worker communication
+      # 0.0.0.0 and :: are not connectable, use localhost instead
+      bind = case @bind
+             when '0.0.0.0'
+               '127.0.0.1'
+             when '::'
+               '::1'  # IPv6 localhost
+             else
+               @bind
+             end
       [*(@base_port...(@base_port + @num_workers))].each do |worker_port|
         do_request(host: bind, port: worker_port, secure: @secure) do |http|
           yield(http.get(@metrics_path))

data/spec/fluent/plugin/in_prometheus_spec.rb

@@ -89,6 +89,22 @@ describe Fluent::Plugin::PrometheusInput do
       end
     end
 
+    context 'IPv6 with TLS' do
+      let(:config) do
+        %[
+           @type prometheus
+           bind ::1
+           <transport tls>
+             insecure true
+           </transport>
+         ]
+      end
+
+      it 'raises ConfigError for unsupported combination' do
+        expect { driver.run(timeout: 1) }.to raise_error(Fluent::ConfigError, /IPv6 with <transport tls> is not currently supported/)
+      end
+    end
+
     context 'old parameters are given' do
       context 'when extra_conf is used' do
         let(:config) do
@@ -278,4 +294,41 @@ describe Fluent::Plugin::PrometheusInput do
       end
     end
   end
+
+  describe '#run with IPv6' do
+    shared_examples 'IPv6 server binding' do |bind_addr, connect_addr, description|
+      let(:config) do
+        # Quote the bind address if it contains brackets
+        bind_value = bind_addr.include?('[') ? "\"#{bind_addr}\"" : bind_addr
+        %[
+          @type prometheus
+          bind #{bind_value}
+        ]
+      end
+
+      it description do
+        skip 'IPv6 not available on this system' unless ipv6_enabled?
+
+        driver.run(timeout: 3) do
+          Net::HTTP.start(connect_addr, port) do |http|
+            req = Net::HTTP::Get.new('/metrics')
+            res = http.request(req)
+            expect(res.code).to eq('200')
+          end
+        end
+      end
+    end
+
+    context 'IPv6 loopback address ::1' do
+      include_examples 'IPv6 server binding', '::1', '::1', 'binds and serves on IPv6 loopback address'
+    end
+
+    context 'IPv6 any address ::' do
+      include_examples 'IPv6 server binding', '::', '::1', 'binds on :: and connects via ::1'
+    end
+
+    context 'pre-bracketed IPv6 address [::1]' do
+      include_examples 'IPv6 server binding', '[::1]', '::1', 'handles pre-bracketed address correctly'
+    end
+  end
 end

data/spec/fluent/plugin/shared.rb

@@ -289,7 +289,12 @@ end
 
 shared_examples_for 'instruments record' do
   before do
-    driver.run(default_tag: tag) { driver.feed(event_time, message) }
+    # Should not shut down driver because it will be used in subsequent tests.
+    driver.run(default_tag: tag, shutdown: false) { driver.feed(event_time, message) }
+  end
+
+  after do
+    driver.instance_shutdown
   end
 
   context 'full config' do

data/spec/spec_helper.rb

@@ -8,3 +8,21 @@ Test::Unit::AutoRunner.need_auto_run = false
 
 Fluent::Test.setup
 include Fluent::Test::Helpers
+
+def ipv6_enabled?
+  require 'socket'
+
+  begin
+    # Try to actually bind to an IPv6 address to verify it works
+    sock = Socket.new(Socket::AF_INET6, Socket::SOCK_STREAM, 0)
+    sock.bind(Socket.sockaddr_in(0, '::1'))
+    sock.close
+    
+    # Also test that we can resolve IPv6 addresses
+    # This is needed because some systems can bind but can't connect
+    Socket.getaddrinfo('::1', nil, Socket::AF_INET6)
+    true
+  rescue Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, SocketError
+    false
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Masahiro Sano
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -144,7 +143,6 @@ homepage: https://github.com/fluent/fluent-plugin-prometheus
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.8
 specification_version: 4
 summary: A fluent plugin that collects metrics and exposes for Prometheus.
 test_files: