Download as
Browse Code »

Commit e0172c8ca7ed794462e09e2924077a6449dc196e

Authored by Antonio Terceiro
1 parent 302ba989
Exists in master and in 62 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

munin: display environment name in host group

Showing 3 changed files with 3 additions and 1 deletions   Show diff stats
@@ -53,6 +53,7 @@ ips ||= YAML.load_file(ips_file) @@ -53,6 +53,7 @@ ips ||= YAML.load_file(ips_file)
53 config ||= YAML.load_file(config_file) 53 config ||= YAML.load_file(config_file)
54 firewall ||= File.open(iptables_file).read 54 firewall ||= File.open(iptables_file).read
55 $nodes.each do |node| 55 $nodes.each do |node|
  56 + node.data['environment'] = $SPB_ENV
56 node.data['config'] = config 57 node.data['config'] = config
57 node.data['peers'] = ips 58 node.data['peers'] = ips
58 node.data['firewall'] = firewall 59 node.data['firewall'] = firewall
cookbooks/munin/templates/hosts.conf.erb
  Diff comments   View file @e0172c8
1 <% node['peers'].each do |hostname,ip| %> 1 <% node['peers'].each do |hostname,ip| %>
2 -[<%= hostname %>] 2 +[SPB_<%= node['environment'] %>;<%= hostname %>]
3 address <%= ip %> 3 address <%= ip %>
4 <% end %> 4 <% end %>
monitoring/Rakefile
  Diff comments   View file @e0172c8
@@ -11,5 +11,6 @@ require &#39;chake&#39; @@ -11,5 +11,6 @@ require &#39;chake&#39;
11 11
12 ips = YAML.load_file('config/prod/ips.yaml') 12 ips = YAML.load_file('config/prod/ips.yaml')
13 $nodes.each do |node| 13 $nodes.each do |node|
  14 + node.data['environment'] = 'prod'
14 node.data['peers'] = ips 15 node.data['peers'] = ips
15 end 16 end