more tests

Author: yaacov

lib/prometheus/api_client/cadvisor.rb

@@ -57,9 +57,9 @@ def initialize(options = {})
       # A client with special labels for container cadvisor metrics
       class Container < CadvisorClient
         def initialize(options = {})
-          container_name = args[:container_name]
-          pod_name = args[:pod_name]
-          namespace = args[:namespace] || 'default'
+          container_name = options[:container_name]
+          pod_name = options[:pod_name]
+          namespace = options[:namespace] || 'default'
 
           @labels = "job=\"kubernetes-cadvisor\",namespace=\"#{namespace}\"," \
             "pod_name=\"#{pod_name}\",container_name=\"#{container_name}\""

spec/prometheus/api_client/cadvisor_spec.rb

@@ -10,9 +10,11 @@
 end
 
 describe Prometheus::ApiClient::Cadvisor do
-  token = 'topSecret'
+  token = 'toSecret'
   url = 'https://prometheus.example.com:443'
   instance = 'example.com'
+  pod_name = 'prometheus'
+  container_name = 'hawkular'
 
   describe 'Node' do
     it 'reads metrics' do
@@ -53,4 +55,86 @@
       end
     end
   end
+
+  describe 'Pod' do
+    it 'reads metrics' do
+      VCR.use_cassette('prometheus/api_client/cadvisor_pod') do # , record: :new_episodes) do
+        prometheus = Prometheus::ApiClient::Cadvisor::Pod.new(
+          pod_name:    pod_name,
+          url:         url,
+          credentials: { token: token },
+          options:     { verify_ssl: OpenSSL::SSL::VERIFY_NONE },
+        )
+
+        response = prometheus.query(
+          query: 'sum(container_cpu_usage_seconds_total)',
+          time: '2017-08-07T06:10:30.781Z',
+        )
+
+        expect(response).to be_a(Hash)
+      end
+    end
+
+    it 'reads metrics range' do
+      VCR.use_cassette('prometheus/api_client/cadvisor_pod') do # , record: :new_episodes) do
+        prometheus = Prometheus::ApiClient::Cadvisor::Pod.new(
+          pod_name:    pod_name,
+          url:         url,
+          credentials: { token: token },
+          options:     { verify_ssl: OpenSSL::SSL::VERIFY_NONE },
+        )
+
+        response = prometheus.query_range(
+          query: 'sum(container_cpu_usage_seconds_total)',
+          start: '2017-08-07T06:10:30.781Z',
+          end:   '2017-08-07T06:14:30.781Z',
+          step:  '120s',
+        )
+
+        expect(response).to be_a(Hash)
+      end
+    end
+  end
+
+  describe 'Container' do
+    it 'reads metrics' do
+      VCR.use_cassette('prometheus/api_client/cadvisor_container') do # , record: :new_episodes) do
+        prometheus = Prometheus::ApiClient::Cadvisor::Container.new(
+          container_name: container_name,
+          pod_name:       pod_name,
+          url:            url,
+          credentials:    { token: token },
+          options:        { verify_ssl: OpenSSL::SSL::VERIFY_NONE },
+        )
+
+        response = prometheus.query(
+          query: 'sum(container_cpu_usage_seconds_total)',
+          time: '2017-08-07T06:10:30.781Z',
+        )
+
+        expect(response).to be_a(Hash)
+      end
+    end
+
+    it 'reads metrics range' do
+      VCR.use_cassette('prometheus/api_client/cadvisor_container') do # , record: :new_episodes) do
+        prometheus = Prometheus::ApiClient::Cadvisor::Container.new(
+          container_name: container_name,
+          pod_name:       pod_name,
+          url:            url,
+          credentials:    { token: token },
+          options:        { verify_ssl: OpenSSL::SSL::VERIFY_NONE },
+        )
+
+        response = prometheus.query_range(
+          query: 'sum(container_cpu_usage_seconds_total)',
+          start: '2017-08-07T06:10:30.781Z',
+          end:   '2017-08-07T06:14:30.781Z',
+          step:  '120s',
+        )
+
+        expect(response).to be_a(Hash)
+      end
+    end
+  end
 end