fixed indicator.yml templating for plans and moved global total insta…

…nces as the first dashboard [#166239993] Co-authored-by: Gabriele Cipriano <[email protected]>
pivotal-cf · Jun 27, 2019 · 7487488 · 7487488
1 parent 70baccc
commit 7487488
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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