Download as
Browse Code »

Commit e0172c8ca7ed794462e09e2924077a6449dc196e

Authored by Antonio Terceiro
1 parent 302ba989
Exists in master and in 85 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, 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
Rakefile
  Diff comments   View file @e0172c8
... ... @@ -53,6 +53,7 @@ ips ||= YAML.load_file(ips_file)
53 53 config ||= YAML.load_file(config_file)
54 54 firewall ||= File.open(iptables_file).read
55 55 $nodes.each do |node|
  56 + node.data['environment'] = $SPB_ENV
56 57 node.data['config'] = config
57 58 node.data['peers'] = ips
58 59 node.data['firewall'] = firewall
... ...
cookbooks/munin/templates/hosts.conf.erb
  Diff comments   View file @e0172c8
1 1 <% node['peers'].each do |hostname,ip| %>
2   -[<%= hostname %>]
  2 +[SPB_<%= node['environment'] %>;<%= hostname %>]
3 3 address <%= ip %>
4 4 <% end %>
... ...
monitoring/Rakefile
  Diff comments   View file @e0172c8
... ... @@ -11,5 +11,6 @@ require &#39;chake&#39;
11 11  
12 12 ips = YAML.load_file('config/prod/ips.yaml')
13 13 $nodes.each do |node|
  14 + node.data['environment'] = 'prod'
14 15 node.data['peers'] = ips
15 16 end
... ...