Commit 0437e100 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '14740-rename-cluster_metrics_new-yml' into 'master'

Resolve "Rename cluster_metrics_new.yml"

Closes #14740

See merge request gitlab-org/gitlab!19243
parents e7a041ae 807e22ce
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
module Metrics module Metrics
module Dashboard module Dashboard
class ClusterDashboardService < ::Metrics::Dashboard::BaseService class ClusterDashboardService < ::Metrics::Dashboard::BaseService
CLUSTER_DASHBOARD_PATH = 'ee/config/prometheus/cluster_metrics_new.yml' CLUSTER_DASHBOARD_PATH = 'ee/config/prometheus/cluster_metrics.yml'
CLUSTER_DASHBOARD_NAME = 'Cluster' CLUSTER_DASHBOARD_NAME = 'Cluster'
SEQUENCE = [ SEQUENCE = [
......
...@@ -15,8 +15,7 @@ describe Metrics::Dashboard::ClusterDashboardService, :use_clean_rails_memory_st ...@@ -15,8 +15,7 @@ describe Metrics::Dashboard::ClusterDashboardService, :use_clean_rails_memory_st
end end
describe 'get_dashboard' do describe 'get_dashboard' do
let(:dashboard_path) { described_class::CLUSTER_DASHBOARD_PATH } let(:service_params) { [project, user, { cluster: cluster, cluster_type: :project }] }
let(:service_params) { [project, user, { cluster: cluster, cluster_type: :project, dashboard_path: dashboard_path }] }
let(:service_call) { described_class.new(*service_params).get_dashboard } let(:service_call) { described_class.new(*service_params).get_dashboard }
it_behaves_like 'valid dashboard service response' it_behaves_like 'valid dashboard service response'
......
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