fluent-plugin-node-exporter-metrics 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62cd74f3d7cf5b3e1dbca91ddf364d74ef624f5bbbf7fc4c433cb01fe0fe395
-  data.tar.gz: ef90042396cde24e70b97238ce3bf9d1d477f60ccada8e387c750edc13904976
+  metadata.gz: 39c4e311b2cb926ee56048a22458ad3919180b6b9623d6b5067979f32440772d
+  data.tar.gz: b0489c8318a0ee7456b2f67ff7afb0049c1a07f905a66ce708ee571dc3f446fd
 SHA512:
-  metadata.gz: fe568aa876e4f02e8c2ad36a89e41f6499c3fc6cbd7c0bb048c7e1f889e87e2b4deb6cfc1cbd3d952c1dd69423912d804203e8e0f9e245d75204583cf972ed91
-  data.tar.gz: 64aa9bb65c333d5add6fcad002da4225977b766b6bec9bea0f8f8bbfbe26e8761a432cf6fe5ce52f1a3bc40c92c9ff0b6b9a07413a59fa1308681b1ed28f6730
+  metadata.gz: 3eb6209efcff10d759d6a3b3fcc2ab883c2e75df076d249afe5a79727471b867339f2eec1a74622fa06953b2bac0d18dbdfc7926d7b563a6215a673d3df0b2dd
+  data.tar.gz: 8b7d39a645a6c2e80cb8196b70d4b19968c11e995ff88876760c18df53c7f62acf50bbeeec348f223dda4e189b74122cca8700f1c967af563836cb7b97a03131

data/.github/dependabot.yml

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

data/.github/workflows/linux-test.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '2.7', '2.6']
+        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
         os: [ubuntu-latest]
         experimental: [false]
         include:
@@ -22,9 +22,9 @@ jobs:
 
     name: Ruby ${{ matrix.ruby-version }} capability ${{ matrix.capability }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@7bae1d00b5db9166f4f0fc47985a3a5702cb58f0 # v1.197.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Install dependencies

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.2.2
+
+## Release v0.2.2 - 2024/10/23
+
+* Fixed "time" to produce collect Unix time
+* meminfo: Added missing meminfo entries
+* Updated dependency to cmetrics 0.3.x
+
+# 0.2.1
+
+## Release v0.2.1 - 2021/09/28
+
+* Fixed needless instance assignment for diskstats collector
+
 # 0.2.0
 
 ## Release v0.2.0 - 2021/09/22

data/fluent-plugin-node-exporter-metrics.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-node-exporter-metrics"
-  spec.version = "0.2.0"
+  spec.version = "0.2.2"
   spec.authors = ["Kentaro Hayashi"]
   spec.email   = ["hayashi@clear-code.com"]
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = test_files
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "cmetrics", "~> 0.2.3"
+  spec.add_runtime_dependency "cmetrics", "~> 0.3.3"
   spec.add_runtime_dependency "capng_c", "~> 0.2.2"
 
   spec.add_development_dependency "bundler", "~> 2.2.0"

data/lib/fluent/plugin/node_exporter/diskstats_collector.rb

@@ -152,8 +152,6 @@ module Fluent
                                                       "This is the total number of seconds spent by all flush requests.",
                                                       ["device"])
           end
-
-          @metrics = {}
         end
 
         def kernel_version_over4_18?
@@ -240,7 +238,12 @@ module Fluent
                   end
                 end
               end
-              @metrics = {
+            end
+          end
+        end
+
+        def cmetrics
+          metrics = {
                 reads_completed_total: @reads_completed_total,
                 reads_merged_total: @reads_merged_total,
                 read_bytes_total: @read_bytes_total,
@@ -252,27 +255,22 @@ module Fluent
                 io_now: @io_now,
                 io_time_seconds_total: @io_time_seconds_total,
                 io_time_weighted_seconds_total: @io_time_weighted_seconds_total
-              }
-              if kernel_version_over4_18?
-                @metrics.merge!({
-                                  discards_completed_total: @discards_completed_total,
-                                  discards_merged_total: @discards_merged_total,
-                                  discarded_sectors_total: @discarded_sectors_total,
-                                  discard_time_seconds_total: @discard_time_seconds_total
-                               })
-              end
-              if kernel_version_over5_5?
-                @metrics.merge!({
-                                  flush_requests_total: @flush_requests_total,
-                                  flush_requests_time_seconds_total: @flush_requests_time_seconds_total
-                                })
-              end
-            end
+          }
+          if kernel_version_over4_18?
+            metrics.merge!({
+                              discards_completed_total: @discards_completed_total,
+                              discards_merged_total: @discards_merged_total,
+                              discarded_sectors_total: @discarded_sectors_total,
+                              discard_time_seconds_total: @discard_time_seconds_total
+                            })
           end
-        end
-
-        def cmetrics
-          @metrics
+          if kernel_version_over5_5?
+            metrics.merge!({
+                              flush_requests_total: @flush_requests_total,
+                              flush_requests_time_seconds_total: @flush_requests_time_seconds_total
+                            })
+          end
+          metrics
         end
       end
     end

data/lib/fluent/plugin/node_exporter/time_collector.rb

@@ -35,7 +35,7 @@ module Fluent
 
         def time_update
           current_time = Fluent::EventTime.now
-          value = current_time.to_i / 1e9
+          value = current_time.to_i
           @gauge.set(value)
         end
 

data/test/plugin/test_in_node_exporter_metrics.rb

@@ -344,20 +344,29 @@ class NodeExporterMetricsInputTest < Test::Unit::TestCase
           Unevictable_bytes
           Mlocked_bytes
           SwapTotal_bytes
-          SwapFree_bytes
+          SwapFree_bytes)
+        if meminfo_key_exist?("Zswap")
+          fields.concat(%w(
+            Zswap_bytes
+            Zswapped_bytes
+          ))
+        end
+        fields.concat(%w(
           Dirty_bytes
           Writeback_bytes
           AnonPages_bytes
           Mapped_bytes
           Shmem_bytes
-          )
+          ))
         fields.concat(["KReclaimable_bytes"]) if meminfo_key_exist?("KReclaimable")
         fields.concat(%w(
           Slab_bytes
           SReclaimable_bytes
           SUnreclaim_bytes
           KernelStack_bytes
-          PageTables_bytes
+          PageTables_bytes))
+        fields.concat(["SecPageTables_bytes"]) if meminfo_key_exist?("SecPageTables")
+        fields.concat(%w(
           NFS_Unstable_bytes
           Bounce_bytes
           WritebackTmp_bytes
@@ -376,6 +385,7 @@ class NodeExporterMetricsInputTest < Test::Unit::TestCase
         fields.concat(["ShmemPmdMapped_bytes"]) if meminfo_key_exist?("ShmemPmdMapped")
         fields.concat(["FileHugePages_bytes"]) if meminfo_key_exist?("FileHugePages")
         fields.concat(["FilePmdMapped_bytes"]) if meminfo_key_exist?("FilePmdMapped")
+        fields.concat(["Unaccepted_bytes"]) if meminfo_key_exist?("Unaccepted")
         fields.concat(%w(
           HugePages_Total
           HugePages_Free

data/test/plugin/test_time_collector.rb

@@ -9,7 +9,7 @@ class TimeColectorTest < Test::Unit::TestCase
       stub(Fluent::EventTime).now { Fluent::EventTime.new(1e9) }
       collector.run
       time_seconds = collector.cmetrics[:time_seconds]
-      assert_equal(1.0, time_seconds.val)
+      assert_equal(1_000_000_000, time_seconds.val)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-node-exporter-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Kentaro Hayashi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmetrics
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: capng_c
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/linux-test.yaml"
 - ".gitignore"
 - CHANGELOG.md
@@ -205,7 +206,7 @@ homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-node-exporter-
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Input plugin which collects metrics similar to Prometheus Node Exporter
 test_files: