set default alert blacklist

yourabi · yourabi · commit dadcde537eef · 2014-09-07T23:40:03.000-07:00
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,5 +1,5 @@
 default[:monit][:notify_email]          = "notify@example.com"
-default[:monit][:alert_blacklist]       = []
+default[:monit][:alert_blacklist]       = %w( action, instance, pid, ppid )
 
 default[:monit][:logfile]               = 'syslog facility log_daemon'
 
diff --git a/templates/default/monitrc.erb b/templates/default/monitrc.erb
@@ -31,7 +31,7 @@ set mail-format {
   message: <%= @node[:monit][:mail_format][:message] %>
 }
 
-set alert <%= @node[:monit][:notify_email] %><%= " NOT ON { #{@node[:monit][:alert_blacklist]} }" unless @node[:monit][:alert_blacklist].empty? %>
+set alert <%= @node[:monit][:notify_email] %><%= " NOT ON { #{@node[:monit][:alert_blacklist]join(", ")} }" unless @node[:monit][:alert_blacklist].empty? %>
 
 set httpd port <%= @node[:monit][:port] %>
   <%= "use address #{@node[:monit][:address]}" if @node[:monit][:address] %>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ set mail-format {`
`31`	`31`	`message: <%= @node[:monit][:mail_format][:message] %>`
`32`	`32`	`}`
`33`	`33`
`34`		`-set alert <%= @node[:monit][:notify_email] %><%= " NOT ON { #{@node[:monit][:alert_blacklist]} }" unless @node[:monit][:alert_blacklist].empty? %>`
	`34`	`+set alert <%= @node[:monit][:notify_email] %><%= " NOT ON { #{@node[:monit][:alert_blacklist]join(", ")} }" unless @node[:monit][:alert_blacklist].empty? %>`
`35`	`35`
`36`	`36`	`set httpd port <%= @node[:monit][:port] %>`
`37`	`37`	`<%= "use address #{@node[:monit][:address]}" if @node[:monit][:address] %>`