X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fd0e42f1be4a40605a01d715305bc0cf8bc6853a..1f7f5f735a865ae93fdcc1e8c9fd9526ad0efd01:/roles/base.rb?ds=sidebyside diff --git a/roles/base.rb b/roles/base.rb index f9cb68efc..d37a4097d 100644 --- a/roles/base.rb +++ b/roles/base.rb @@ -10,9 +10,6 @@ default_attributes( :jburgess => { :status => :administrator } } }, - :apt => { - :sources => ["openstreetmap"] - }, :munin => { :plugins => { :chrony => { @@ -22,11 +19,19 @@ default_attributes( }, :networking => { :roles => { - :internal => { :metric => 200, :zone => "loc" }, + :internal => { :metric => 200 }, :external => { :metric => 100 } }, :search => ["openstreetmap.org"] }, + :prometheus => { + :metrics => { + :exim_queue_limit => { + :help => "Mail queue alert level", + :metric => 50 + } + } + }, :sysctl => { :panic => { :comment => "Reboot automatically after a panic", @@ -44,9 +49,9 @@ default_attributes( :parameters => { "net.core.rmem_max" => "16777216", "net.core.wmem_max" => "16777216", - "net.ipv4.tcp_rmem" => "4096\t87380\t16777216", - "net.ipv4.tcp_wmem" => "4096\t65536\t16777216", - "net.ipv4.udp_mem" => "3145728\t4194304\t16777216" + "net.ipv4.tcp_rmem" => "4096 87380 16777216", + "net.ipv4.tcp_wmem" => "4096 65536 16777216", + "net.ipv4.udp_mem" => "3145728 4194304 16777216" } }, :network_backlog => { @@ -69,15 +74,14 @@ default_attributes( } }, :default_qdisc => { - :comment => "Use pfifo_fast as the default queuing discipline", + :comment => "Use fq as the default queuing discipline", :parameters => { - "net.core.default_qdisc" => "pfifo_fast" + "net.core.default_qdisc" => "fq" } }, :tune_cpu_scheduler => { :comment => "Tune CPU scheduler for server scheduling", :parameters => { - "kernel.sched_migration_cost_ns" => 50000000, "kernel.sched_autogroup_enabled" => 0 } } @@ -90,7 +94,8 @@ run_list( "recipe[chef]", "recipe[devices]", "recipe[hardware]", - "recipe[munin]", + "recipe[prometheus]", + "recipe[munin::plugins]", "recipe[networking]", "recipe[exim]", "recipe[ntp]",