fluent-plugin-prometheus_pushgateway 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8bb8dea982c73df9e3cd84646a75e9c41c5f3cd8d8698dba21f02e0f83105e
-  data.tar.gz: c7831671c45eee6a91c1806b9f7e517f1a538f195ade2d06d1e8f852e0912ed3
+  metadata.gz: 347755e0922e0015347adaaa22e0d1ba07cb5a191725c9c4a0e3a6f249a19801
+  data.tar.gz: 3493f9e0a6ceb4ed96a740b807204cf692f59bf3927de8b88ee24a45d3ce59de
 SHA512:
-  metadata.gz: 33b8be6357fa0cfb5c5c4f90844384a6d5a7f3c51f2c066d520890b3e893bb9d1ff185c38084cf5691fd726f073a0b30d66c6bbe399e1763d16b5f63b5632774
-  data.tar.gz: 3a9d054b8fe7a1852d8a3554377ef104ecd26c25de4f87106a6423d76fb44445fe51a59c5766aaaf7720b2fed51df06fb01e8f728e2d658f7e7268aaf594f06a
+  metadata.gz: c69005b206f10d8248641e3d2323a80f740fc42d41d63af13791a06e09150c498b768d6f328818090693b4145c9f8ca3d92ba1c36f5e32ab693295010d066da9
+  data.tar.gz: c370274cf1598e0d862cec68eea3c868ba8dd85054bae0c9c009712ba40dccefb24b75db9149a9efe0799c4bbf8eba8ca9ab1a921027ef022ba2257ec2df3838

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/run_spec.yml

@@ -1,6 +1,10 @@
 name: Run tests
 
-on: [push]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   build:
@@ -8,7 +12,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        ruby_version: [2.5, 2.6, 2.7, 3.0]
+        ruby_version: [ '3.4', '3.3', '3.2', '3.1' ]
         experimental: [false]
         include:
           - ruby_version: head
@@ -17,7 +21,7 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{  matrix.ruby_version }}
       uses: ruby/setup-ruby@v1
       with:

data/ChangeLog

@@ -1,3 +1,19 @@
+Release 0.2.0 - 2025/03/21
+
+ * CI: Bump actions/checkout from v3 to v4.
+ * CI: Add Ruby 3.3/3.4 for CI.
+ * Support prometheus-client 3.0 or later.
+   - In the previous versions of fluent-plugin-prometheus was also restricted
+     to prometheus-client 2.x if you use with it.
+
+Release 0.1.1 - 2023/07/12
+
+ * CI: Update supported version of Ruby.
+   - Ruby 2.6 was dropped
+ * CI: Add GitHub Action to watch by dependabot (weekly).
+ * Stay on prometheus-client to 2.1.0.
+ * Relax required version of fluent-plugin-prometheus to 2.1.0.
+
 Release 0.1.0 - 2021/04/20
 
 　* Upgrade fluent-plugin-prometheus to 2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/fluent-plugin-prometheus_pushgateway.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.license = "Apache-2.0"
 
-  spec.add_dependency "fluent-plugin-prometheus", ">= 2.0.0", "< 2.1.0"
+  spec.add_dependency "fluent-plugin-prometheus", ">= 2.0.0", "< 2.2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/fluent/plugin/out_prometheus_pushgateway.rb

@@ -15,6 +15,7 @@
 #
 
 require 'prometheus/client/push'
+require 'prometheus/client/version'
 require 'fluent/plugin/output'
 
 begin
@@ -69,7 +70,12 @@ module Fluent
       def configure(conf)
         super
 
-        @push_client = ::Prometheus::Client::Push.new("#{@job_name}:#{fluentd_worker_id}", @instance, @gateway)
+        if Prometheus::Client::VERSION.split(".")[0].to_i >= 3
+          grouping_key = @instance ? {instance: @instance} : {}
+          @push_client = ::Prometheus::Client::Push.new(job: "#{@job_name}:#{fluentd_worker_id}", grouping_key: grouping_key, gateway: @gateway)
+        else
+          @push_client = ::Prometheus::Client::Push.new("#{@job_name}:#{fluentd_worker_id}", @instance, @gateway)
+        end
 
         use_tls = gateway && (URI.parse(gateway).scheme == 'https')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus_pushgateway
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuta Iwama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-prometheus
@@ -19,7 +19,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/run_spec.yml"
 - ".gitignore"
 - ".rspec"
@@ -113,7 +114,7 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/fluent/fluent-plugin-prometheus_pushgateway
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A fluent plugin for prometheus pushgateway
 test_files: []