fluent-plugin-kubernetes-metrics 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a468c7d27e43160d49e2313a68a04d407ad7c73c52ecbb8b9e2c0f82d53da1
-  data.tar.gz: 684f325072be6527f3e81173e99958f6a5dcb8ce977836da8ab2199f3b89c91d
+  metadata.gz: 7cba1f817de8b2ebcb68a6f96dcb0776105c9330ed7b7e6d46888bd1fe2a8290
+  data.tar.gz: 79b5be5e27f54edad68981e9f48f8827fe698c93584115287ea41b594591e928
 SHA512:
-  metadata.gz: 5f0b516d906d32c4e00920c536ea1fd5e94ef54b630b2c3287868073b0fb9c553ac5e3f3d04ab78cb3af54c763a66927b369dd3b71c67777c81146ab566fafba
-  data.tar.gz: 232a8c3fbd93881bd68e4b6a4fae34fa396050d9dbc9d8ae627afad12e3df55149f679720f7082ea042a847c543cab881ad197a301e466427bd8ee3c270ce091
+  metadata.gz: 4d4fd43d51357507698126408a618d38e81d7a5a9a956a3aafe4c46521b9d95bf22d680c52fca119d9c3f236b60dcdf028368948cc258981a64e34cd0f1e4ce8
+  data.tar.gz: 03ff9d6abf9511af983f52c1083062bc389fd976e0baf3045609df3a81e833e8ae2c787c5078870921a76246c37f3f2e01c3e20270ba0e0ca502aaa7105d8011

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.9)
+    fluent-plugin-kubernetes-metrics (1.1.10)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -19,7 +19,7 @@ GEM
     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
@@ -56,7 +56,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    msgpack (1.4.2)
+    msgpack (1.4.4)
     multi_json (1.14.1)
     netrc (0.11.0)
     oj (3.10.18)
@@ -70,7 +70,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)
@@ -107,4 +107,4 @@ DEPENDENCIES
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.3.5
+   2.3.9

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

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.10
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,5 +181,5 @@ specification_version: 4
 summary: A fluentd input plugin that collects kubernetes cluster metrics.
 test_files:
 - test/helper.rb
-- test/plugin/test_missing_timestamps.rb
 - test/plugin/test_in_kubernetes_metrics.rb
+- test/plugin/test_missing_timestamps.rb