From 74874882dbcc8b3630958ed0dce5c83f4cf8a810 Mon Sep 17 00:00:00 2001 From: Felisia Martini Date: Thu, 27 Jun 2019 16:21:17 +0100 Subject: [PATCH] fixed indicator.yml templating for plans and moved global total instances as the first dashboard [#166239993] Co-authored-by: Gabriele Cipriano --- jobs/broker/templates/indicators.yml.erb | 4 ++-- spec/indicators_spec.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jobs/broker/templates/indicators.yml.erb b/jobs/broker/templates/indicators.yml.erb index 311afa42f..b0e89681a 100644 --- a/jobs/broker/templates/indicators.yml.erb +++ b/jobs/broker/templates/indicators.yml.erb @@ -24,7 +24,7 @@ def render_plan_indicators if all_plans_indicators.empty? "" else - "- #{all_plans_indicators.to_yaml}" + "#{all_plans_indicators.to_yaml.gsub("---\n", "")}" end end @@ -106,4 +106,4 @@ layout: sections: - title: Service Instance Quotas description: Indicators monitoring service instance quota - indicators: <%= all_plans_indicators.map { |indicator| indicator['name']} << "global_total_instances" %> + indicators: <%= ["global_total_instances"] | all_plans_indicators.map { |indicator| indicator['name']} %> diff --git a/spec/indicators_spec.rb b/spec/indicators_spec.rb index 2f02d39c0..b26be129d 100644 --- a/spec/indicators_spec.rb +++ b/spec/indicators_spec.rb @@ -68,6 +68,7 @@ sections = rendered_template['layout']['sections'] expect(sections).to include a_hash_including('indicators' => include('global_total_instances', 'dedicated_vm_total_instances', 'dedicated_high_mem_vm_total_instances',)) + expect(sections).to include a_hash_including('indicators' => start_with('global_total_instances')) end end