Commit bff2d1b3 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'sample-metrics-without-prometheus' into 'master'

Show sample metrics for an environment without prometheus

Closes #36255

See merge request gitlab-org/gitlab!22133
parents 9eaa9aa3 5c9237e7
......@@ -204,7 +204,11 @@ class Environment < ApplicationRecord
end
def has_metrics?
available? && prometheus_adapter&.configured?
available? && (prometheus_adapter&.configured? || has_sample_metrics?)
end
def has_sample_metrics?
!!ENV['USE_SAMPLE_METRICS']
end
def metrics
......
---
title: Show sample metrics for an environment without prometheus configured
merge_request: 22133
author:
type: added
......@@ -6,6 +6,7 @@ describe Environment, :use_clean_rails_memory_store_caching do
include ReactiveCachingHelpers
using RSpec::Parameterized::TableSyntax
include RepoHelpers
include StubENV
let(:project) { create(:project, :repository) }
......@@ -851,6 +852,52 @@ describe Environment, :use_clean_rails_memory_store_caching do
context 'without a monitoring service' do
it { is_expected.to be_falsy }
end
context 'when sample metrics are enabled' do
before do
stub_env('USE_SAMPLE_METRICS', 'true')
end
context 'with no prometheus adapter configured' do
before do
allow(environment.prometheus_adapter).to receive(:configured?).and_return(false)
end
it { is_expected.to be_truthy }
end
end
end
describe '#has_sample_metrics?' do
subject { environment.has_metrics? }
let(:project) { create(:project) }
context 'when sample metrics are enabled' do
before do
stub_env('USE_SAMPLE_METRICS', 'true')
end
context 'with no prometheus adapter configured' do
before do
allow(environment.prometheus_adapter).to receive(:configured?).and_return(false)
end
it { is_expected.to be_truthy }
end
context 'with the environment stopped' do
before do
environment.stop
end
it { is_expected.to be_falsy }
end
end
context 'when sample metrics are not enabled' do
it { is_expected.to be_falsy }
end
end
context 'when the environment is unavailable' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment