fluent-plugin-kubernetes-metrics 1.1.9 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a468c7d27e43160d49e2313a68a04d407ad7c73c52ecbb8b9e2c0f82d53da1
-  data.tar.gz: 684f325072be6527f3e81173e99958f6a5dcb8ce977836da8ab2199f3b89c91d
+  metadata.gz: 11ae3ba83383e096cdcfc581bf50d68f832c51887e6855180cbdee1edd49ddcd
+  data.tar.gz: 9556c5b920f6b1b375fefd39916ffd28ee3938daeed6879595c76f6ed4b00bed
 SHA512:
-  metadata.gz: 5f0b516d906d32c4e00920c536ea1fd5e94ef54b630b2c3287868073b0fb9c553ac5e3f3d04ab78cb3af54c763a66927b369dd3b71c67777c81146ab566fafba
-  data.tar.gz: 232a8c3fbd93881bd68e4b6a4fae34fa396050d9dbc9d8ae627afad12e3df55149f679720f7082ea042a847c543cab881ad197a301e466427bd8ee3c270ce091
+  metadata.gz: d27837d1f6a1dbaf59d08d3c5e2b815ff7f841431ffdae1a1ff535d3a689330ebc66b63b7d8626129e2a5745c11ac84886f8afc56885bac77253a2b2c3af30d6
+  data.tar.gz: cae074b32b2b7ee35e93b37990ced26a69c96760f5e0a94e0875f2d731a1491d3638e4782062087e4ef183709b3c28c984c376a681a9cadd37dcc89c1159bcc3

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.9)
+    fluent-plugin-kubernetes-metrics (1.1.12)
       fluentd (>= 1.9.1)
-      kubeclient (~> 4.6.0)
+      kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
       oj (~> 3.10.2)
 
@@ -12,23 +12,23 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.4)
+    fluentd (1.14.6)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.2.2, < 3.0.0)
+      serverengine (>= 2.2.5, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
@@ -49,14 +49,17 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.8.0)
     json (2.6.1)
-    kubeclient (4.6.0)
+    jsonpath (1.1.0)
+      multi_json
+    kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    msgpack (1.4.2)
+    msgpack (1.5.1)
     multi_json (1.14.1)
     netrc (0.11.0)
     oj (3.10.18)
@@ -70,7 +73,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    serverengine (2.2.4)
+    serverengine (2.2.5)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.16.1)
@@ -83,17 +86,17 @@ GEM
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     webrick (1.7.0)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.2)
 
 PLATFORMS
   ruby
@@ -107,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.3.5
+   2.3.12

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.12

data/fluent-plugin-kubernetes-metrics.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit', '~> 3.3.0'
   spec.add_development_dependency 'webmock', '~> 3.5.1'
   spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
+  spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
   spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
   spec.add_runtime_dependency 'oj', '~> 3.10.2'
 end

data/lib/fluent/plugin/in_kubernetes_metrics.rb

@@ -576,8 +576,42 @@ module Fluent
 
         unless pod['startTime'].nil?
           emit_uptime tag: tag, start_time: pod['startTime'], labels: labels
-          emit_cpu_metrics tag: tag, metrics: pod['cpu'], labels: labels if pod['cpu'] unless pod['cpu'].nil?
-          emit_memory_metrics tag: tag, metrics: pod['memory'], labels: labels if pod['memory'] unless pod['memory'].nil?
+          if pod['cpu'].nil?
+            if pod['containers'].nil? or Array(pod['containers']).empty?
+              log.warn "Summary API response has no pod cpu metrics information"
+            else
+              usageNanoCores = 0
+              usageCoreNanoSeconds = 0
+              time = nil
+              Array(pod['containers']).each do |container|
+                time = container['time'] unless container['time'].nil?
+                usageNanoCores += container['usageNanoCores']
+                usageCoreNanoSeconds += container['usageCoreNanoSeconds']
+              end
+              pod['cpu'] = { 'time' => time, 'usageNanoCores' => usageNanoCores, 'usageCoreNanoSeconds' => usageCoreNanoSeconds }
+            end
+          end
+          emit_cpu_metrics tag: tag, metrics: pod['cpu'], labels: labels unless pod['cpu'].nil?
+          if pod['memory'].nil?
+            if pod['containers'].nil? or Array(pod['containers']).empty?
+              log.warn "Summary API response has no pod memory metrics information"
+            else
+              Array(pod['containers']).each do |container|
+                time = nil
+                memory_metrics = {}
+                %w[availableBytes usageBytes workingSetBytes rssBytes pageFaults majorPageFaults].each do |name|
+                  time = container['time'] unless container['time'].nil?
+                  if value = metrics[name]
+                    memory_metrics[name] = 0 if memory_metrics[name].nil?
+                    memory_metrics[name] += value 
+                  end
+                end
+              end
+              memory_metrics['time'] = time
+              pod['memory'] = memory_metrics
+            end
+          end
+          emit_memory_metrics tag: tag, metrics: pod['memory'], labels: labels unless pod['memory'].nil?
           emit_network_metrics tag: tag, metrics: pod['network'], labels: labels unless pod['network'].nil?
           emit_fs_metrics tag: "#{tag}.ephemeral-storage", metrics: pod['ephemeral-storage'], labels: labels unless pod['ephemeral-storage'].nil?
           unless pod['volume'].nil?
@@ -595,6 +629,7 @@ module Fluent
 
       def emit_metrics(metrics)
         emit_node_metrics(metrics['node']) unless metrics['node'].nil?
+        log.warn "Summary API received empty pods info" if (metrics['pods'].nil? or metrics['pods'].empty?)
         Array(metrics['pods']).each &method(:emit_pod_metrics).curry.call(metrics['node']['nodeName']) unless metrics['pods'].nil?
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.12
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement