X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d7f96f8db950795e4a75a2ccc1d7c99587da4afc..16c9e170f6e1df8c3618615410367f2fe89c41b1:/roles/base.rb?ds=sidebyside diff --git a/roles/base.rb b/roles/base.rb index 310b2ddf1..2a4f732a5 100644 --- a/roles/base.rb +++ b/roles/base.rb @@ -10,20 +10,21 @@ default_attributes( :jburgess => { :status => :administrator } } }, - :munin => { - :plugins => { - :chrony => { - :systime => { :warning => "100", :critical => "250" } - } - } - }, :networking => { :roles => { - :internal => { :metric => 200, :zone => "loc" }, - :external => { :metric => 100, :zone => "osm" } + :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", @@ -41,9 +42,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 => { @@ -66,18 +67,22 @@ default_attributes( } }, :default_qdisc => { - :comment => "Use fq as the default queuing discipline and cubic for congestion control", + :comment => "Use fq as the default queuing discipline", :parameters => { - "net.core.default_qdisc" => "fq", - "net.ipv4.tcp_congestion_control" => "cubic" + "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 } + }, + :default_console_log_level => { + :comment => "Set console log level defaults", + :parameters => { + "kernel.printk" => "4 4 1 7" + } } } ) @@ -89,7 +94,6 @@ run_list( "recipe[devices]", "recipe[hardware]", "recipe[prometheus]", - "recipe[munin::plugins]", "recipe[networking]", "recipe[exim]", "recipe[ntp]",