From dd31327e1424cc1fd0013702bdd64f412c21ea8b Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Fri, 5 Aug 2022 18:04:39 +0000 Subject: [PATCH 1/3] fix bug --- source/plugins/ruby/KubernetesApiClient.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/plugins/ruby/KubernetesApiClient.rb b/source/plugins/ruby/KubernetesApiClient.rb index 9e1ea467cb..361f40a7e9 100644 --- a/source/plugins/ruby/KubernetesApiClient.rb +++ b/source/plugins/ruby/KubernetesApiClient.rb @@ -751,8 +751,12 @@ def getMetricNumericValue(metricName, metricVal) metricValue.chomp!("k") metricValue = Float(metricValue) * 1000.0 ** 1 elsif (metricValue.end_with?("m")) + #original value before downcase ending with M is megabyte and value ending with m is milli-byte metricValue.chomp!("m") - metricValue = Float(metricValue) * 1000.0 ** 2 + if (metricVal.end_with?("M")) + metricValue = Float(metricValue) * 1000.0 ** 2 + else + metricValue = Float(metricValue) / 1000.0 elsif (metricValue.end_with?("g")) metricValue.chomp!("g") metricValue = Float(metricValue) * 1000.0 ** 3 From 843a2815d30f8d358e88e1fe03466029030d7510 Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Fri, 5 Aug 2022 18:40:36 +0000 Subject: [PATCH 2/3] add vuln --- .trivyignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.trivyignore b/.trivyignore index 91ee2f5bb5..b2bc7a04d7 100644 --- a/.trivyignore +++ b/.trivyignore @@ -7,3 +7,4 @@ CVE-2022-1996 #dpkg vulnerability in ubuntu CVE-2022-1304 +CVE-2022-2509 \ No newline at end of file From c7296fb1266489d440fdacb1c00b02bb6e86b9eb Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Fri, 5 Aug 2022 19:26:34 +0000 Subject: [PATCH 3/3] fix bug --- source/plugins/ruby/KubernetesApiClient.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/source/plugins/ruby/KubernetesApiClient.rb b/source/plugins/ruby/KubernetesApiClient.rb index 361f40a7e9..eab3604710 100644 --- a/source/plugins/ruby/KubernetesApiClient.rb +++ b/source/plugins/ruby/KubernetesApiClient.rb @@ -757,6 +757,7 @@ def getMetricNumericValue(metricName, metricVal) metricValue = Float(metricValue) * 1000.0 ** 2 else metricValue = Float(metricValue) / 1000.0 + end elsif (metricValue.end_with?("g")) metricValue.chomp!("g") metricValue = Float(metricValue) * 1000.0 ** 3