X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3190c464bc2e27816da4c90d6e212fb9e2a09d0e..6e1a30e28068b34daa9715bd49c93b6a759feff0:/cookbooks/munin/templates/default/munin.conf.erb diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb index f204de2a0..7175d6866 100644 --- a/cookbooks/munin/templates/default/munin.conf.erb +++ b/cookbooks/munin/templates/default/munin.conf.erb @@ -1,5 +1,11 @@ # DO NOT EDIT - This file is being maintained by Chef +# Set maximum number of update processes to run at once +max_processes 64 + +# Use rrdcached +rrdcached_socket /var/run/rrdcached.sock + # Configure alert targets contact.admins.command mail -s "Munin Notification" admins@openstreetmap.org contact.null.command cat > /dev/null @@ -17,7 +23,7 @@ unknown_limit 144 update no <% end -%> <% if client[:networking][:roles][:external][:zone] == "ucl" -%> - address <%= client.internal_ipaddress %> + address <%= client.internal_ipaddress || client.external_ipaddress %> <% elsif client[:networking][:roles][:external][:zone] == "ic" -%> address <%= client.internal_ipaddress || client.external_ipaddress %> <% elsif client.external_ipaddress -%>