diff --git a/config/settings.yml b/config/settings.yml index 52462456d2..932e689d09 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -80,6 +80,6 @@ :metrics_path: "/hawkular/metrics" :prometheus_open_timeout: 5 :prometheus_request_timeout: 30 - :hawkular_force_legacy: false + :hawkular_force_legacy: true :ems_refresh_worker: :ems_refresh_worker_kubernetes: {} diff --git a/spec/models/manageiq/providers/kubernetes/container_manager/metrics_capture_spec.rb b/spec/models/manageiq/providers/kubernetes/container_manager/metrics_capture_spec.rb index ac674b93ea..4c8a97ec29 100644 --- a/spec/models/manageiq/providers/kubernetes/container_manager/metrics_capture_spec.rb +++ b/spec/models/manageiq/providers/kubernetes/container_manager/metrics_capture_spec.rb @@ -2,13 +2,13 @@ before do # @miq_server is required for worker_settings to work @miq_server = EvmSpecHelper.local_miq_server(:is_master => true) - @hawkular_force_legacy_settings = { + @hawkular_force_legacy_settings_false = { :workers => { :worker_base => { :queue_worker_base => { :ems_metrics_collector_worker => { :ems_metrics_collector_worker_kubernetes => { - :hawkular_force_legacy => true + :hawkular_force_legacy => false } } } @@ -84,6 +84,7 @@ end it "detect hawkular metrics provider without m metric endpoint" do + stub_settings_merge(@hawkular_force_legacy_settings_false) allow_any_instance_of(described_class::HawkularCaptureContext) .to receive(:m_endpoint?) .and_return(false) @@ -100,6 +101,7 @@ end it "detect hawkular metrics provider" do + stub_settings_merge(@hawkular_force_legacy_settings_false) allow_any_instance_of(described_class::HawkularCaptureContext) .to receive(:m_endpoint?) .and_return(true) @@ -116,7 +118,6 @@ end it "detect hawkular metrics provider, force legacy collector" do - stub_settings_merge(@hawkular_force_legacy_settings) allow_any_instance_of(described_class::HawkularCaptureContext) .to receive(:m_endpoint?) .and_return(true)