hawkular-client 2.7.0 → 2.8.0

data/spec/integration/hello-world-definitions.json

@@ -38,8 +38,7 @@
       "actionId": "notify-to-admins",
       "properties": {
         "to": "admins@hawkular.org",
-        "cc": "developers@hawkular.org",
-        "description": "Notify by email to Admins with cc to Developers"
+        "cc": "developers@hawkular.org"
       }
     }
   ]

data/spec/integration/inventory_spec.rb

@@ -38,7 +38,7 @@ module Hawkular::Inventory::RSpec
         it 'Should Get Tenant For Explicit Credentials' do
           # get the client for given endpoint for given credentials
           creds = credentials
-          mock_inventory_client(VERSION) unless ENV['VCR_UPDATE'] == '1'
+          mock_inventory_client(VERSION) unless ENV['VCR_UPDATE'] == '1' || ENV['VCR_OFF'] == '1'
           options = { tenant: 'hawkular' }
           client = setup_inventory_client entrypoint, options
           tenant = client.get_tenant(creds)
@@ -47,7 +47,7 @@ module Hawkular::Inventory::RSpec
 
         it 'Should Get Tenant For Implicit Credentials' do
           creds = credentials
-          mock_inventory_client(VERSION) unless ENV['VCR_UPDATE'] == '1'
+          mock_inventory_client(VERSION) unless ENV['VCR_UPDATE'] == '1' || ENV['VCR_OFF'] == '1'
           options = { tenant: 'hawkular' }
           client = setup_inventory_client entrypoint, options
           tenant = client.get_tenant(creds)
@@ -109,6 +109,12 @@ module Hawkular::Inventory::RSpec
             @state[:feed_uuid] = feeds[0]
           end
 
+          record("Inventory/#{security_context}/inventory_#{x}_#{y}", @state.clone, 'Helpers/wait_for_wildfly') do
+            wait_while do
+              @client.list_resources_for_feed(@state[:feed_uuid]).length < 2
+            end
+          end if ENV['RUN_ON_LIVE_SERVER'] == '1'
+
           # create 1 URL resource and its metrics
           record("Inventory/#{security_context}/inventory_#{x}_#{y}", @state.clone, 'Helpers/create_url') do
             headers = {}
@@ -314,7 +320,7 @@ module Hawkular::Inventory::RSpec
         it 'Should list metrics of given metric type' do
           type_path = Hawkular::Inventory::CanonicalPath.new(
             feed_id: feed_id,
-            metric_type_id: hawk_escape_id('Total Space'))
+            metric_type_id: hawk_escape_id('Platform_File Store_Total Space'))
           metrics = @client.list_metrics_for_metric_type(type_path)
 
           expect(metrics.size).to be >= 2
@@ -592,7 +598,14 @@ module Hawkular::Inventory::RSpec
             end
 
             # wait for the data
-            sleep 5 if !WebSocketVCR.cassette || WebSocketVCR.cassette.recording?
+            wait_while do
+              [
+                !hash_include_all(new_resource_events, [id_1, id_2]),
+                !registered_feed_events.key?(new_feed_id),
+                !deleted_feed_events.key?(new_feed_id),
+                !new_resource_types_events.key?(resource_type_id)
+              ].any?
+            end
             [feed_deleted_closable, resource_type_closable, feeds_closable].each(&:close)
             expect(new_resource_events[id_1]).not_to be_nil
             expect(new_resource_events[id_1].properties['version']).to eq(1.0)
@@ -630,5 +643,5 @@ module Hawkular::Inventory::RSpec
         expect(feeds.size).to be(1)
       end
     end
-  end
+  end unless ENV['SKIP_SSL_WITHOUT_CERTIFICATE_TEST'] == '1'
 end

data/spec/integration/metric_spec.rb

@@ -9,12 +9,10 @@ SKIP_SECURE_CONTEXT.freeze
 
 # time constants
 t4h = 4 * 60 * 60 * 1000
-v16_version_string = '0.16.0.Final'
 
 # test contexts
 v8_context = :metrics_0_8_0
 services_context = :metrics_services
-v16_context = :metrics_0_16_0
 
 # ssl contexts
 SECURE_CONTEXT = :Secure
@@ -26,7 +24,7 @@ vcr_test_tenant_postfix = "-vcr-tenant-#{SecureRandom.uuid}".freeze
 security_contexts.each do |security_context|
   next if security_context == SECURE_CONTEXT && SKIP_SECURE_CONTEXT == '1'
 
-  [v8_context, services_context, v16_context].each do |metrics_context|
+  [v8_context, services_context].each do |metrics_context|
     if ENV['SKIP_V8_METRICS'] == '1' && metrics_context == v8_context
       puts 'skipping v8 metrics'
       next
@@ -39,7 +37,6 @@ security_contexts.each do |security_context|
     next if security_context == SECURE_CONTEXT && metrics_context == v8_context
 
     setup_options = {
-      mocked_version: metrics_context == :metrics_services ? nil : v16_version_string,
       type: security_context
     }.freeze
 
@@ -54,8 +51,12 @@ security_contexts.each do |security_context|
         end + example.description
       end
 
+      before(:all) do
+        @admin_token = ENV['ADMIN_TOKEN'] || SecureRandom.uuid
+      end
+
       let(:vcr_bindings) do
-        { id: @random_id, vcr_test_tenant: vcr_test_tenant }
+        { id: @random_id, vcr_test_tenant: vcr_test_tenant, admin_token: @admin_token }
       end
 
       around(:each) do |example|
@@ -84,12 +85,17 @@ security_contexts.each do |security_context|
         end
       end
 
-      describe 'Tenants', run_for: [v8_context, services_context, v16_context] do
+      describe 'Tenants', run_for: [v8_context, services_context] do
         before(:all) do
-          if metrics_context == v8_context
-            setup_v8_client
-          else
-            setup_client(setup_options)
+          options = setup_options.merge admin_token: @admin_token
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'Tenants/setup_client') do
+            if metrics_context == v8_context
+              setup_v8_client
+            else
+              setup_client(options)
+            end
           end
         end
 
@@ -101,7 +107,7 @@ security_contexts.each do |security_context|
         end
       end
 
-      describe 'No Tenant', run_for: [services_context, v16_context] do
+      describe 'No Tenant', run_for: [services_context] do
         it 'Should fail' do
           setup_client_without_tenant(setup_options)
           begin
@@ -114,22 +120,28 @@ security_contexts.each do |security_context|
         end
       end
 
-      describe 'Mixed metrics', run_for: [v8_context, services_context, v16_context] do
+      describe 'Mixed metrics', run_for: [v8_context, services_context] do
         before(:all) do
-          if metrics_context == v8_context
-            setup_v8_client tenant: vcr_test_tenant
-          else
-            setup_client(setup_options)
+          options = setup_options.merge(tenant: vcr_test_tenant)
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'Mixed_metrics/setup_client') do
+            if metrics_context == v8_context
+              setup_v8_client tenant: vcr_test_tenant
+            else
+              setup_client(setup_options)
+            end
           end
         end
 
-        it 'Should requests raw data for multiple metrics', :skip_auto_vcr, run_for: [services_context, v16_context] do
+        it 'Should requests raw data for multiple metrics', :skip_auto_vcr, run_for: [services_context] do
           id1 = SecureRandom.uuid
           id2 = SecureRandom.uuid
           id3 = SecureRandom.uuid
+          id4 = SecureRandom.uuid
 
           ids = [id1, id2, id3]
-          bindings = { id1: id1, id2: id2, id3: id3 }
+          bindings = { id1: id1, id2: id2, id3: id3, id4: id4 }
           example = proc do
             @client = setup_client(setup_options.merge tenant: vcr_test_tenant)
 
@@ -146,7 +158,10 @@ security_contexts.each do |security_context|
               availabilities: [
                 { id: id1, data: [{ value: 'up' }] },
                 { id: id2, data: [{ value: 'down' }] },
-                { id: id3, data: [{ value: 'up' }] }
+                { id: id3, data: [{ value: 'up' }] },
+                { id: id4, data: [{ value: 'up', timestamp: 10_000 },
+                                  { value: 'down', timestamp: 100_000 },
+                                  { value: 'admin', timestamp: 1_000_000 }] }
               ],
               gauges: [
                 { id: id1, data: [{ value: 1.1 }] },
@@ -158,7 +173,8 @@ security_contexts.each do |security_context|
             c_metrics = @client.counters.raw_data(ids)
             g_metrics = @client.gauges.raw_data(ids)
             a_metrics = @client.avail.raw_data(ids)
-
+            # also check the get_data way of fetching avail data, with params
+            a_metric  = @client.avail.get_data(id4, starts: 100, ends: 2_000_000, distinct: 'true', order: 'ASC')
             expect(c_metrics.size).to be 3
             expect(c_metrics).to include(
               { 'id' => id1, 'data' => [{ 'timestamp' => a_kind_of(Integer), 'value' => 1 }] },
@@ -179,6 +195,13 @@ security_contexts.each do |security_context|
               { 'id' => id2, 'data' => [{ 'timestamp' => a_kind_of(Integer), 'value' => 'down' }] },
               { 'id' => id3, 'data' => [{ 'timestamp' => a_kind_of(Integer), 'value' => 'up' }] }
             )
+
+            expect(a_metric.size).to be 3
+            expect(a_metric).to include(
+              { 'timestamp' => 10_000, 'value' => 'up' },
+              { 'timestamp' => 100_000, 'value' => 'down' },
+              { 'timestamp' => 1_000_000, 'value' => 'admin' }
+            )
           end
           record("Metrics/#{security_context}/#{metrics_context}",
                  vcr_bindings.merge(bindings),
@@ -276,10 +299,15 @@ security_contexts.each do |security_context|
       describe 'Counter metrics' do
         before(:all) do
           @tenant = vcr_test_tenant
-          if metrics_context == v8_context
-            setup_v8_client tenant: @tenant
-          else
-            setup_client(setup_options.merge(tenant: @tenant))
+          options = setup_options.merge(tenant: @tenant)
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'Counter_metrics/setup_client') do
+            if metrics_context == v8_context
+              setup_v8_client tenant: @tenant
+            else
+              setup_client(setup_options.merge(tenant: @tenant))
+            end
           end
         end
 
@@ -329,7 +357,7 @@ security_contexts.each do |security_context|
         end
 
         # limit and order were introduced in 0.11.0 => skipping for 0.8.0
-        it 'Should get metrics with limit and order', run_for: [services_context, v16_context], skip_auto_vcr: true do
+        it 'Should get metrics with limit and order', run_for: [services_context], skip_auto_vcr: true do
           now = @client.now
           minus10 = now - 10
           minus20 = now - 20
@@ -435,10 +463,15 @@ security_contexts.each do |security_context|
       describe 'Availability metrics' do
         before(:all) do
           @tenant = vcr_test_tenant
-          if metrics_context == v8_context
-            setup_v8_client tenant: @tenant
-          else
-            setup_client(setup_options.merge(tenant: @tenant))
+          options = setup_options.merge(tenant: @tenant)
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'Availability_metrics/setup_client') do
+            if metrics_context == v8_context
+              setup_v8_client tenant: @tenant
+            else
+              setup_client(setup_options.merge(tenant: @tenant))
+            end
           end
         end
 
@@ -462,7 +495,7 @@ security_contexts.each do |security_context|
           expect { @client.avail.get_data(@random_id, percentiles: 50) }.to raise_error(ArgumentError)
         end
 
-        it 'Should group contiguous values', :skip_auto_vcr, run_for: [services_context, v16_context] do
+        it 'Should group contiguous values', :skip_auto_vcr, run_for: [services_context] do
           now = @client.now
           minus10 = now - 10
           minus20 = now - 20
@@ -497,16 +530,31 @@ security_contexts.each do |security_context|
 
       describe 'Gauge metrics' do
         hawkular_tenant_id = 'hawkular'.freeze
-        hawkular_feed_id = 'af0ea377-80f4-4567-af45-105eaa808b92'.freeze
-        hawkular_mem_id = "MI~R~[#{hawkular_feed_id}/platform~/OPERATING_SYSTEM=#{hawkular_feed_id}"\
-                          '_OperatingSystem/MEMORY=Memory]~MT~Total Memory'.freeze
+
+        let(:inventory_client) do
+          inventory_entrypoint = entrypoint(security_context, 'inventory')
+          setup_inventory_client(inventory_entrypoint, tenant: hawkular_tenant_id)
+        end
+
+        let(:hawkular_feed_id) do
+          inventory_client.list_feeds.first
+        end
+
+        let(:hawkular_mem_id) do
+          "MI~R~[#{hawkular_feed_id}/platform~/OPERATING_SYSTEM=#{hawkular_feed_id}"\
+                          '_OperatingSystem/MEMORY=Memory]~MT~Platform_Memory_Total Memory'
+        end
 
         before(:all) do
           @tenant = vcr_test_tenant
-          if metrics_context == v8_context
-            setup_v8_client tenant: @tenant
-          else
-            setup_client(setup_options.merge(tenant: @tenant))
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 setup_options.merge(tenant: @tenant),
+                 'Gauge_metrics/setup_client') do
+            if metrics_context == v8_context
+              setup_v8_client tenant: @tenant
+            else
+              setup_client(setup_options.merge(tenant: @tenant))
+            end
           end
         end
 
@@ -587,7 +635,7 @@ security_contexts.each do |security_context|
         end
 
         it 'Should return platform memory def', :skip_auto_vcr, run_for: [services_context] do
-          bindings = { mem_id: hawkular_mem_id, tenant: hawkular_tenant_id }
+          bindings = { tenant: hawkular_tenant_id }
           example = proc do
             if metrics_context == v8_context
               setup_v8_client tenant: hawkular_tenant_id
@@ -608,7 +656,7 @@ security_contexts.each do |security_context|
         end
 
         it 'Should return platform memory', :skip_auto_vcr, run_for: [services_context] do
-          bindings = { mem_id: hawkular_mem_id, tenant: hawkular_tenant_id }
+          bindings = { tenant: hawkular_tenant_id }
           example = proc do
             # this id depends on OS and the feed id
             if metrics_context == v8_context
@@ -638,6 +686,115 @@ security_contexts.each do |security_context|
           expect(data).not_to be_nil
         end
       end
+
+      describe 'String metrics', run_for: [services_context] do
+        before(:each) do
+          @tenant = vcr_test_tenant
+          options = setup_options.merge(tenant: @tenant)
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'String_metrics/setup_client') do
+            setup_client(options)
+          end
+        end
+
+        it 'Should create string definition using MetricDefinition' do
+          create_metric_using_md @client.strings, @random_id
+        end
+
+        it 'Should create string definition using Hash' do
+          create_metric_using_hash @client.strings, @random_id, @tenant
+        end
+
+        it 'Should push metric data to non-existing string' do
+          push_data_to_non_existing_metric @client.strings, { value: 'Hello world' }, @random_id
+        end
+
+        it 'Should push metric data to existing string', :skip_auto_vcr do
+          now = @client.now
+          ends = now - t4h
+          starts = now - (2 * t4h)
+          now10 = now - 10
+          now20 = now - 20
+          now30 = now - 30
+          bindings = { id: @random_id, ends: ends, starts: starts, now10: now10, now20: now20, now30: now30 }
+          example = proc do
+            # create gauge
+            @client.strings.create(id: @random_id)
+
+            # push 3  values with timestamps
+            @client.strings.push_data(@random_id,
+                                      [
+                                        { value: 'Value1', timestamp: now30 },
+                                        { value: 'Value2', timestamp: now20 },
+                                        { value: 'Value3', timestamp: now10 }
+                                      ])
+
+            data = @client.strings.get_data(@random_id)
+            expect(data.size).to be 3
+
+            # push one value without timestamp (which means now)
+            @client.strings.push_data(@random_id, value: 'Now')
+            data = @client.strings.get_data(@random_id)
+            expect(data.size).to be 4
+
+            # retrieve values from past
+            data = @client.strings.get_data(@random_id, starts: starts, ends: ends)
+            expect(data.empty?).to be true
+          end
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 vcr_bindings.merge(bindings),
+                 cassette_name,
+                 example: example)
+        end
+      end
+
+      describe 'All Tags for metrics', run_for: [services_context] do
+        before(:each) do
+          @tenant = 'all_tags_tenant'
+          options = setup_options.merge(tenant: @tenant)
+          record("Metrics/#{security_context}/#{metrics_context}",
+                 options,
+                 'Tags_Metrics/setup_client') do
+            setup_client(options)
+          end
+        end
+
+        it 'Should fetch all metric tags for metrics definitions' do
+          tags_m1 = {
+            tag1: 'value1',
+            tag2: 'value2',
+            tag3: 'value3'
+          }
+
+          tags_m2 = {
+            tag1: 'value1',
+            tag4: 'value4',
+            tag5: 'value5'
+          }
+
+          tags_m3 = {
+            tag1: 'value1',
+            tag4: 'value4',
+            tag5: 'value5.1'
+          }
+
+          create_metric_using_md @client.gauges, 'metric_1', tags_m1
+          create_metric_using_md @client.avail, 'metric_2', tags_m2
+          create_metric_using_md @client.counters, 'metric_2', tags_m3
+          create_metric_using_md @client.counters, 'metric_3', {}
+
+          expected_result = [
+            { 'tag1' => 'value1' },
+            { 'tag2' => 'value2' },
+            { 'tag3' => 'value3' },
+            { 'tag4' => 'value4' },
+            { 'tag5' => 'value5' },
+            { 'tag5' => 'value5.1' }
+          ]
+          expect(@client.tags.to_set).to eql(expected_result.to_set)
+        end
+      end
     end
   end
 
@@ -646,7 +803,11 @@ security_contexts.each do |security_context|
   context security_context do
     describe 'Metric ID with special characters' do
       before(:all) do
-        setup_client(type: security_context, tenant: vcr_test_tenant)
+        record("Metrics/#{security_context}/ID_with_special_characters",
+               { tenant: vcr_test_tenant },
+               'setup_client') do
+          setup_client(type: security_context, tenant: vcr_test_tenant)
+        end
       end
 
       around(:each) do |example|