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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5783b3b581c87d3e305da625e7cb9dabf63aee126bc2f23ca889a553906c131
-  data.tar.gz: da252aa8bf053fd1fdbe0fb5111804d6865a9f16dbd78527d8fa13ccb2ffbb10
+  metadata.gz: a62cd74f3d7cf5b3e1dbca91ddf364d74ef624f5bbbf7fc4c433cb01fe0fe395
+  data.tar.gz: ef90042396cde24e70b97238ce3bf9d1d477f60ccada8e387c750edc13904976
 SHA512:
-  metadata.gz: 782fb7e500cb04da57373ba18fa2da26a54c25f4fb9951dacad0ee073c74af1c5010de907ea532ad46c6b2f98564524d589a5bc213cd80545d883ad2d86e99c0
-  data.tar.gz: d930fe4fd9b378535af2c3a977441a61fa9a703ddb2d101217494fad91b9cf2a0b1cb0d3584721e2def4bee69e5d09e0ca7dcdafdc652527e68fd7f7a98e2598
+  metadata.gz: fe568aa876e4f02e8c2ad36a89e41f6499c3fc6cbd7c0bb048c7e1f889e87e2b4deb6cfc1cbd3d952c1dd69423912d804203e8e0f9e245d75204583cf972ed91
+  data.tar.gz: 64aa9bb65c333d5add6fcad002da4225977b766b6bec9bea0f8f8bbfbe26e8761a432cf6fe5ce52f1a3bc40c92c9ff0b6b9a07413a59fa1308681b1ed28f6730

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.2.0
+
+## Release v0.2.0 - 2021/09/22
+
+* Fixed memory leaks with meminfo, netdev and vmstat collectors
+* Fixed a bug that raising wrong exception with CMetricsDataSchemaParser.
+* Added a FAQ for cpufreq configuration
+* Updated missing cmake 3.x install instruction for CentOS 7/RHEL 7
+
 # 0.1.0
 
 ## Release v0.1.0 - 2021/09/21

data/README.md

@@ -22,13 +22,14 @@ Note that CMake 3.13 or later must be installed.
 ### CentOS 7/RHEL 7
 
 ```
-$ sudo yum install libcap-ng-devel gcc cmake3
+$ sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+$ sudo yum install libcap-ng-devel gcc cmake3 make
 ```
 
 ### CentOS 8/RHEL 8
 
 ```
-$ sudo dnf install libcap-ng-devel gcc cmake
+$ sudo dnf install libcap-ng-devel gcc cmake make
 ```
 
 
@@ -160,6 +161,12 @@ Here is the result.
 2021-09-21 10:57:48.015023773 +0900 node_metrics: [{"name":"node_time_seconds","value":1.632189468,"desc":"System time in seconds since epoch (1970).","ts":1632189468014812147}]
 ```
 
+## FAQ
+
+### Why is error_class=Fluent::ConfigError error="Linux capability CAP_DAC_READ_SEARCH must be enabled" happen?
+
+See [Prerequisite for cpufreq](docs/cpufreq.md#prerequisite) section for enabling cpufreq collector.
+
 ## Copyright
 
 * Copyright(c) 2021- Kentaro Hayashi

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.1.0"
+  spec.version = "0.2.0"
   spec.authors = ["Kentaro Hayashi"]
   spec.email   = ["hayashi@clear-code.com"]
 

data/lib/fluent/plugin/in_node_exporter_metrics.rb

@@ -110,20 +110,21 @@ module Fluent
 
       def refresh_watchers
         begin
-          @serde = CMetrics::Serde.new
+          serde = CMetrics::Serde.new
           @collectors.each do |collector|
             begin
               collector.run
               collector.cmetrics.each do |key, cmetric|
-                @serde.concat(cmetric) if cmetric
+                serde.concat(cmetric) if cmetric
               end
             rescue => e
               $log.error(e.message)
             end
           end
           record = {
-            "cmetrics" => @serde.to_msgpack
+            "cmetrics" => serde.to_msgpack
           }
+          serde = nil
           es = OneEventStream.new(Fluent::EventTime.now, record)
           router.emit_stream(@tag, es)
         end

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

@@ -28,7 +28,7 @@ module Fluent
               data << to_readable_hash(metric)
             end
           rescue => e
-            raise Fluent::ParserError.new(e.message)
+            raise Fluent::Plugin::Parser::ParserError.new(e.message)
           end
           data.flatten
         end

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

@@ -26,29 +26,37 @@ module Fluent
           super(config)
 
           @metrics = {}
+          meminfo_path = File.join(@procfs_path, "meminfo")
+          File.readlines(meminfo_path).each do |line|
+            metric_name, name, _ = parse_meminfo_line(line)
+            @gauge = CMetrics::Gauge.new
+            @gauge.create("node", "memory", name, "Memory information field #{metric_name}.")
+            @metrics[metric_name.intern] = @gauge
+          end
         end
 
         def run
           meminfo_update
         end
 
+        def parse_meminfo_line(line)
+          name, value, unit = line.split
+          name.delete!(":")
+          if name.end_with?("(anon)") or name.end_with?("(file)")
+            name.sub!(/\((anon)\)|\((file)\)/, "_\\1\\2")
+          end
+          if unit
+            name << "_bytes"
+            value = value.to_f * 1024
+          end
+          ["node_memory_#{name}", name, value]
+        end
+
         def meminfo_update
           meminfo_path = File.join(@procfs_path, "meminfo")
           File.readlines(meminfo_path).each do |line|
-            name, value, unit = line.split
-            name.delete!(":")
-            if name.end_with?("(anon)") or name.end_with?("(file)")
-              name.sub!(/\((anon)\)|\((file)\)/, "_\\1\\2")
-            end
-            if unit
-              name << "_bytes"
-              value = value.to_f * 1024
-            end
-            metric_name = "node_memory_#{name}"
-            @gauge = CMetrics::Gauge.new
-            @gauge.create("node", "memory", name, "#{name}.")
-            @gauge.set(value.to_f)
-            @metrics[metric_name.intern] = @gauge
+            metric_name, _, value = parse_meminfo_line(line)
+            @metrics[metric_name.intern].set(value.to_f)
           end
         end
 

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

@@ -26,6 +26,18 @@ module Fluent
           super(config)
 
           @metrics = {}
+          RECEIVE_FIELDS.each_with_index do |field, index|
+            metric_name = "receive_#{field}_total"
+            @counter = CMetrics::Counter.new
+            @counter.create("node", "network", metric_name, "Network device statistic #{metric_name}.", ["device"])
+            @metrics[metric_name.intern] = @counter
+          end
+          TRANSMIT_FIELDS.each_with_index do |field, index|
+            metric_name = "transmit_#{field}_total"
+            @counter = CMetrics::Counter.new
+            @counter.create("node", "network", metric_name, "Network device statistic #{metric_name}.", ["device"])
+            @metrics[metric_name.intern] = @counter
+          end
         end
 
         def run
@@ -49,18 +61,6 @@ module Fluent
 
         def netdev_update
           netdev_path = File.join(@procfs_path, "net/dev")
-          RECEIVE_FIELDS.each_with_index do |field, index|
-            metric_name = "receive_#{field}_total"
-            @counter = CMetrics::Counter.new
-            @counter.create("node", "network", metric_name, "Network device statistic #{metric_name}.", ["device"])
-            @metrics[metric_name.intern] = @counter
-          end
-          TRANSMIT_FIELDS.each_with_index do |field, index|
-            metric_name = "transmit_#{field}_total"
-            @counter = CMetrics::Counter.new
-            @counter.create("node", "network", metric_name, "Network device statistic #{metric_name}.", ["device"])
-            @metrics[metric_name.intern] = @counter
-          end
           File.readlines(netdev_path).each_with_index do |line, index|
             # net/dev must be 3 columns
             if index == 0 and line.split("|").size != 3

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

@@ -28,6 +28,15 @@ module Fluent
           super(config)
 
           @metrics = {}
+          vmstat_path = File.join(@procfs_path, "vmstat")
+          File.readlines(vmstat_path).each do |line|
+            if VMSTAT_ENTRIES_REGEX.match?(line)
+              key, _ = line.split(' ', 2)
+              @untyped = CMetrics::Untyped.new
+              @untyped.create("node", "vmstat", key, "#{vmstat_path} information field #{key}.")
+              @metrics[key.intern] = @untyped
+            end
+          end
         end
 
         def run
@@ -39,10 +48,7 @@ module Fluent
           File.readlines(vmstat_path).each do |line|
             if VMSTAT_ENTRIES_REGEX.match?(line)
               key, value = line.split(' ', 2)
-              @untyped = CMetrics::Untyped.new
-              @untyped.create("node", "vmstat", key, "#{vmstat_path} information field #{key}.")
-              @untyped.set(value.to_f)
-              @metrics[key.intern] = @untyped
+              @metrics[key.intern].set(value.to_f)
             end
           end
         end

data/test/plugin/test_in_node_exporter_metrics.rb

@@ -391,7 +391,7 @@ class NodeExporterMetricsInputTest < Test::Unit::TestCase
         ))
         opts = []
         fields.each do |field|
-          opts << {"ns"=>"node", "ss"=>"memory", "name"=>field, "desc"=>"#{field}."}
+          opts << {"ns"=>"node", "ss"=>"memory", "name"=>field, "desc"=>"Memory information field node_memory_#{field}."}
         end
         assert_equal([
                        fields.size,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-node-exporter-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kentaro Hayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmetrics