Skip to content

Commit

Permalink
Merge pull request #257 from yaacov/default-to-force-legacy-metrics-c…
Browse files Browse the repository at this point in the history
…ollector

Default to force Hawkular legacy metrics collector
(cherry picked from commit ee971de)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1591429
cben authored and simaishi committed Jun 18, 2018

Unverified

This user has not yet uploaded their public signing key.
1 parent 6824468 commit 158c9f7
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion config/settings.yml
Original file line number Diff line number Diff line change
@@ -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: {}
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 158c9f7

Please sign in to comment.