diff --git a/Rakefile b/Rakefile index cec91b2..88acd6b 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ Rake::TestTask.new(:test) do |t| t.libs.push("lib", "test") t.test_files = FileList["test/**/test_*.rb"] t.verbose = true - t.warning = true + t.warning = false end task default: [:test] diff --git a/test/helper.rb b/test/helper.rb index 3c3bf09..fca3652 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -34,8 +34,9 @@ def stub_k8s_requests stub_kubelet_summary_api stub_k8s_proxy_summary_api stub_metrics_cadvisor - stub_metrics_stats stub_k8s_proxy_cadvisor_api + stub_metrics_stats + stub_metrics_proxy_stats end def stub_k8s_proxy_summary_api @@ -78,7 +79,7 @@ def stub_k8s_proxy_cadvisor_api stub_request(:get, "#{k8s_url}/v1/nodes/generics-aws-node-name:10255/proxy/metrics/cadvisor") .to_return(body: f.read) }.close -end + end def stub_metrics_stats open(File.expand_path('../stats.json', __FILE__)).tap { |f| @@ -87,11 +88,26 @@ def stub_metrics_stats }.close end - def get_parsed_string + def stub_metrics_proxy_stats + open(File.expand_path('../stats.json', __FILE__)).tap { |f| + stub_request(:get, "#{k8s_url}/v1/nodes/generics-aws-node-name:10255/proxy/stats/") + .to_return(body: f.read) + }.close + end + + def get_unit_parsed_string parsed_string = nil open(File.expand_path('../unit.json', __FILE__)).tap { |f| parsed_string = f.read() }.close parsed_string end + + def get_stats_parsed_string + get_stats_parsed_string = nil + open(File.expand_path('../stats.json', __FILE__)).tap { |f| + get_stats_parsed_string = f.read() + }.close + get_stats_parsed_string + end end \ No newline at end of file diff --git a/test/plugin/test_in_kubernetes_metrics.rb b/test/plugin/test_in_kubernetes_metrics.rb index cfbd2ad..03e3cb9 100644 --- a/test/plugin/test_in_kubernetes_metrics.rb +++ b/test/plugin/test_in_kubernetes_metrics.rb @@ -30,7 +30,8 @@ class KubernetesMetricsInputTest < Test::Unit::TestCase setup do Fluent::Test.setup - @@parsed_string = JSON.parse(get_parsed_string) + @@parsed_unit_string = JSON.parse(get_unit_parsed_string) + @@parsed_string2 = JSON.parse(get_stats_parsed_string) stub_k8s_requests @@ -67,10 +68,10 @@ def create_driver(conf = CONFIG) puts 'Test: test_emit_cpu_metrics' assert_not_nil @@hash_map_test.find('kube.node.cpu.usage') - assert_equal @@parsed_string['node']['cpu']['usageNanoCores'], @@hash_map_test['kube.node.cpu.usage'][2]["value"] + assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'], @@hash_map_test['kube.node.cpu.usage'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.cpu.usage_rate') - assert_equal @@parsed_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, @@hash_map_test['kube.node.cpu.usage_rate'][2]["value"] end @@ -78,22 +79,22 @@ def create_driver(conf = CONFIG) puts 'Test: test_emit_memory_metrics' assert_not_nil @@hash_map_test.find('kube.node.memory.available_bytes') - assert_equal @@parsed_string['node']['memory']['availableBytes'], @@hash_map_test['kube.node.memory.available_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['availableBytes'], @@hash_map_test['kube.node.memory.available_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.memory.usage_bytes') - assert_equal @@parsed_string['node']['memory']['usageBytes'], @@hash_map_test['kube.node.memory.usage_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['usageBytes'], @@hash_map_test['kube.node.memory.usage_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.memory.working_set_bytes') - assert_equal @@parsed_string['node']['memory']['workingSetBytes'], @@hash_map_test['kube.node.memory.working_set_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['workingSetBytes'], @@hash_map_test['kube.node.memory.working_set_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.memory.rss_bytes') - assert_equal @@parsed_string['node']['memory']['rssBytes'], @@hash_map_test['kube.node.memory.rss_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['rssBytes'], @@hash_map_test['kube.node.memory.rss_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.memory.page_faults') - assert_equal @@parsed_string['node']['memory']['pageFaults'], @@hash_map_test['kube.node.memory.page_faults'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['pageFaults'], @@hash_map_test['kube.node.memory.page_faults'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.memory.major_page_faults') - assert_equal @@parsed_string['node']['memory']['majorPageFaults'], @@hash_map_test['kube.node.memory.major_page_faults'][2]["value"] + assert_equal @@parsed_unit_string['node']['memory']['majorPageFaults'], @@hash_map_test['kube.node.memory.major_page_faults'][2]["value"] end @@ -101,16 +102,16 @@ def create_driver(conf = CONFIG) puts 'Test: test_emit_network_metrics' assert_not_nil @@hash_map_test.find('kube.node.network.rx_bytes') - assert_equal @@parsed_string['node']['network']['rxBytes'], @@hash_map_test['kube.node.network.rx_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['network']['rxBytes'], @@hash_map_test['kube.node.network.rx_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.network.rx_errors') - assert_equal @@parsed_string['node']['network']['rxErrors'], @@hash_map_test['kube.node.network.rx_errors'][2]["value"] + assert_equal @@parsed_unit_string['node']['network']['rxErrors'], @@hash_map_test['kube.node.network.rx_errors'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.network.tx_bytes') - assert_equal @@parsed_string['node']['network']['txBytes'], @@hash_map_test['kube.node.network.tx_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['network']['txBytes'], @@hash_map_test['kube.node.network.tx_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.network.tx_errors') - assert_equal @@parsed_string['node']['network']['txErrors'], @@hash_map_test['kube.node.network.tx_errors'][2]["value"] + assert_equal @@parsed_unit_string['node']['network']['txErrors'], @@hash_map_test['kube.node.network.tx_errors'][2]["value"] end @@ -118,22 +119,22 @@ def create_driver(conf = CONFIG) puts 'Test: test_emit_fs_metrics' assert_not_nil @@hash_map_test.find('kube.node.fs.available_bytes') - assert_equal @@parsed_string['node']['fs']['availableBytes'], @@hash_map_test['kube.node.fs.available_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['availableBytes'], @@hash_map_test['kube.node.fs.available_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.capacity_bytes') - assert_equal @@parsed_string['node']['fs']['capacityBytes'], @@hash_map_test['kube.node.fs.capacity_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['capacityBytes'], @@hash_map_test['kube.node.fs.capacity_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.used_bytes') - assert_equal @@parsed_string['node']['fs']['usedBytes'], @@hash_map_test['kube.node.fs.used_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['usedBytes'], @@hash_map_test['kube.node.fs.used_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes_free') - assert_equal @@parsed_string['node']['fs']['inodesFree'], @@hash_map_test['kube.node.fs.inodes_free'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['inodesFree'], @@hash_map_test['kube.node.fs.inodes_free'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes') - assert_equal @@parsed_string['node']['fs']['inodes'], @@hash_map_test['kube.node.fs.inodes'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['inodes'], @@hash_map_test['kube.node.fs.inodes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes_used') - assert_equal @@parsed_string['node']['fs']['inodesUsed'], @@hash_map_test['kube.node.fs.inodes_used'][2]["value"] + assert_equal @@parsed_unit_string['node']['fs']['inodesUsed'], @@hash_map_test['kube.node.fs.inodes_used'][2]["value"] end @@ -141,22 +142,22 @@ def create_driver(conf = CONFIG) puts 'Test: test_emit_fs_imagefs_metrics' assert_not_nil @@hash_map_test.find('kube.node.fs.available_bytes') - assert_equal @@parsed_string['node']['runtime']['imageFs']['availableBytes'], @@hash_map_test['kube.node.imagefs.available_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['availableBytes'], @@hash_map_test['kube.node.imagefs.available_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.capacity_bytes') - assert_equal @@parsed_string['node']['runtime']['imageFs']['capacityBytes'], @@hash_map_test['kube.node.imagefs.capacity_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['capacityBytes'], @@hash_map_test['kube.node.imagefs.capacity_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.used_bytes') - assert_equal @@parsed_string['node']['runtime']['imageFs']['usedBytes'], @@hash_map_test['kube.node.imagefs.used_bytes'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['usedBytes'], @@hash_map_test['kube.node.imagefs.used_bytes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes_free') - assert_equal @@parsed_string['node']['runtime']['imageFs']['inodesFree'], @@hash_map_test['kube.node.imagefs.inodes_free'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['inodesFree'], @@hash_map_test['kube.node.imagefs.inodes_free'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes') - assert_equal @@parsed_string['node']['runtime']['imageFs']['inodes'], @@hash_map_test['kube.node.imagefs.inodes'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['inodes'], @@hash_map_test['kube.node.imagefs.inodes'][2]["value"] assert_not_nil @@hash_map_test.find('kube.node.fs.inodes_used') - assert_equal @@parsed_string['node']['runtime']['imageFs']['inodesUsed'], @@hash_map_test['kube.node.imagefs.inodes_used'][2]["value"] + assert_equal @@parsed_unit_string['node']['runtime']['imageFs']['inodesUsed'], @@hash_map_test['kube.node.imagefs.inodes_used'][2]["value"] end @@ -167,5 +168,25 @@ def create_driver(conf = CONFIG) events = d.events assert_not_nil events end + + end + + sub_test_case "node_stats_tests" do + + test 'test_stats_cpu_usage' do + puts 'Test: test_stats_cpu_usage' + + # assert_not_nil @@hash_map_test.find('kube.container.cpu.usage') + # assert_equal @@parsed_string2["stats"][0]["cpu"]["usage"]["total"], @@hash_map_test['kube.container.cpu.usage'][2]["value"] + + puts @@parsed_string2["stats"][0]["cpu"]["usage"]["total"].inspect + + # puts @@hash_map_test['kube.container.cpu.usage'][2]["value"].inspect + + end + end + + # end + end \ No newline at end of file