From b2ab3728e8d3dd1d74dae5834793dd7642d1328e Mon Sep 17 00:00:00 2001 From: harshit-splunk <89519921+harshit-splunk@users.noreply.github.com> Date: Mon, 17 Jan 2022 17:33:42 +0530 Subject: [PATCH 1/2] converted divisor to float for cpu metrics --- lib/fluent/plugin/in_kubernetes_metrics.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fluent/plugin/in_kubernetes_metrics.rb b/lib/fluent/plugin/in_kubernetes_metrics.rb index 1face14..261192c 100644 --- a/lib/fluent/plugin/in_kubernetes_metrics.rb +++ b/lib/fluent/plugin/in_kubernetes_metrics.rb @@ -315,7 +315,7 @@ def emit_cpu_metrics(tag:, metrics:, labels:) unless metrics['time'].nil? time = parse_time metrics['time'] if usage_rate = metrics['usageNanoCores'] - router.emit generate_tag("#{tag}.cpu.usage_rate"), time, labels.merge('value' => usage_rate / 1_000_000) + router.emit generate_tag("#{tag}.cpu.usage_rate"), time, labels.merge('value' => usage_rate / 1_000_000.0) end if usage = metrics['usageNanoCores'] router.emit generate_tag("#{tag}.cpu.usage"), time, labels.merge('value' => usage) @@ -416,13 +416,13 @@ def emit_stats_breakdown(stats) def emit_cpu_metrics_stats(tag:, metrics:, labels:, time:) if cpu_usage_total = metrics['usage']['total'] - router.emit generate_tag("#{tag}.cpu.usage.total"), time, labels.merge('value' => cpu_usage_total / 1_000_000) + router.emit generate_tag("#{tag}.cpu.usage.total"), time, labels.merge('value' => cpu_usage_total / 1_000_000.0) end if cpu_usage_user = metrics['usage']['user'] - router.emit generate_tag("#{tag}.cpu.usage.user"), time, labels.merge('value' => cpu_usage_user / 1_000_000) + router.emit generate_tag("#{tag}.cpu.usage.user"), time, labels.merge('value' => cpu_usage_user / 1_000_000.0) end if cpu_usage_system = metrics['usage']['system'] - router.emit generate_tag("#{tag}.cpu.usage.system"), time, labels.merge('value' => cpu_usage_system / 1_000_000) + router.emit generate_tag("#{tag}.cpu.usage.system"), time, labels.merge('value' => cpu_usage_system / 1_000_000.0) end if cpu_cfs_periods = metrics['cfs']['periods'] From 2abefe89d30508362a1198a645659a755cd2bbae Mon Sep 17 00:00:00 2001 From: harshit-splunk <89519921+harshit-splunk@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:13:03 +0530 Subject: [PATCH 2/2] updated unit test --- test/plugin/test_in_kubernetes_metrics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plugin/test_in_kubernetes_metrics.rb b/test/plugin/test_in_kubernetes_metrics.rb index 7ae81a2..cc99f96 100644 --- a/test/plugin/test_in_kubernetes_metrics.rb +++ b/test/plugin/test_in_kubernetes_metrics.rb @@ -115,7 +115,7 @@ def create_driver(conf = CONFIG) assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'], @@hash_map_test['kube.node.cpu.usage'][2]['value'] assert_not_nil @@hash_map_test.key?('kube.node.cpu.usage_rate') - assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'] / 1_000_000, @@hash_map_test['kube.node.cpu.usage_rate'][2]['value'] + assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'] / 1_000_000.0, @@hash_map_test['kube.node.cpu.usage_rate'][2]['value'] end test 'test_emit_memory_metrics' do