fluent-plugin-prometheus 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949d2ec196fae78bdfcbbfeae20d718e7a3a34a6ceba9ba665d1a7d40326d529
-  data.tar.gz: c1adf9a63565a38141247034157f84aadb85336e5add24ca6d99c126cd8e01d7
+  metadata.gz: 21b4b3d81d41fadb057a133293f2629b39961faaadcb7caebbd885c10ed344d1
+  data.tar.gz: dbd8aa719306aa164f373c781f568b82bee27fc44bfc88e86c4ea5d31c5ce545
 SHA512:
-  metadata.gz: 7199fc669d4c389fa5638615d16a4fdb29a27cc959b60c3ec6e3031328a9cb052bb6169733c73e66f659ec929aa3faffd8869187dc70f6eff361263b3304ecb0
-  data.tar.gz: acfbe23681c5bf801ae10c41a265dfb358b05516b79d0e2944317469b0b4be8aad5b1fbda246d9e4caa0e75f473428046015232c0900689ccb629a3b7c5b72a8
+  metadata.gz: ca73efb455416a5e7c022793c17ae088cd685f5751e3497a501f9af880a5f9e970dd838c939d3b61e9145c92e2a0d3acff3d61fbde35a88c7f29e52b148de5c4
+  data.tar.gz: 9feaab5d5b45e6e9cb1bd48ea3bc47381db6c9cc806e4782fab18df21b093f4034ca8215202e32f64cd776ea695a385f195b3b02ab22679e8b3c01b97b2bd27c

data/.github/workflows/linux.yml

@@ -1,7 +1,9 @@
 name: linux
 on:
-  - push
-  - pull_request
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -9,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        ruby: [ '3.1', '3.0', '2.7', '2.6' ]
         os:
           - ubuntu-latest
         experimental: [false]

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 2.0.3 - 2022/05/06
+
+	* in_prometheus_output_monitor: Fix a bug where output_status_num_errors metric is missing
+
 Release 2.0.2 - 2021/08/02
 
 	* in_prometheus_output_monitor: Follow Fluentd's core metrics mechanism

data/fluent-plugin-prometheus.gemspec

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

@@ -133,25 +133,24 @@ module Fluent::Plugin
 
       monitor_info = {
         # buffer metrics
-        'buffer_total_queued_size' => @metrics[:buffer_total_queued_size],
-        'buffer_stage_length' => @metrics[:buffer_stage_length],
-        'buffer_stage_byte_size' => @metrics[:buffer_stage_byte_size],
-        'buffer_queue_length' => @metrics[:buffer_queue_length],
-        'buffer_queue_byte_size' => @metrics[:buffer_queue_byte_size],
-        'buffer_available_buffer_space_ratios' => @metrics[:buffer_available_buffer_space_ratios],
-        'buffer_newest_timekey' => @metrics[:buffer_newest_timekey],
-        'buffer_oldest_timekey' => @metrics[:buffer_oldest_timekey],
+        'buffer_total_queued_size' => [@metrics[:buffer_total_queued_size]],
+        'buffer_stage_length' => [@metrics[:buffer_stage_length]],
+        'buffer_stage_byte_size' => [@metrics[:buffer_stage_byte_size]],
+        'buffer_queue_length' => [@metrics[:buffer_queue_length]],
+        'buffer_queue_byte_size' => [@metrics[:buffer_queue_byte_size]],
+        'buffer_available_buffer_space_ratios' => [@metrics[:buffer_available_buffer_space_ratios]],
+        'buffer_newest_timekey' => [@metrics[:buffer_newest_timekey]],
+        'buffer_oldest_timekey' => [@metrics[:buffer_oldest_timekey]],
 
         # output metrics
-        'retry_count' => @metrics[:retry_counts],
+        'retry_count' => [@metrics[:retry_counts], @metrics[:num_errors]],
         # Needed since Fluentd v1.14 due to metrics extensions.
-        'num_errors' => @metrics[:num_errors],
-        'write_count' => @metrics[:write_count],
-        'emit_count' => @metrics[:emit_count],
-        'emit_records' => @metrics[:emit_records],
-        'rollback_count' => @metrics[:rollback_count],
-        'flush_time_count' => @metrics[:flush_time_count],
-        'slow_flush_count' => @metrics[:slow_flush_count],
+        'write_count' => [@metrics[:write_count]],
+        'emit_count' => [@metrics[:emit_count]],
+        'emit_records' => [@metrics[:emit_records]],
+        'rollback_count' => [@metrics[:rollback_count]],
+        'flush_time_count' => [@metrics[:flush_time_count]],
+        'slow_flush_count' => [@metrics[:slow_flush_count]],
       }
       # No needed for Fluentd v1.14 but leave as-is for backward compatibility.
       instance_vars_info = {
@@ -167,12 +166,14 @@ module Fluent::Plugin
       agent_info.each do |info|
         label = labels(info)
 
-        monitor_info.each do |name, metric|
-          if info[name]
-            if metric.is_a?(::Prometheus::Client::Gauge)
-              metric.set(info[name], labels: label)
-            elsif metric.is_a?(::Prometheus::Client::Counter)
-              metric.increment(by: info[name] - metric.get(labels: label), labels: label)
+        monitor_info.each do |name, metrics|
+          metrics.each do |metric|
+            if info[name]
+              if metric.is_a?(::Prometheus::Client::Gauge)
+                metric.set(info[name], labels: label)
+              elsif metric.is_a?(::Prometheus::Client::Counter)
+                metric.increment(by: info[name] - metric.get(labels: label), labels: label)
+              end
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A fluent plugin that collects metrics and exposes for Prometheus.