From: Tom Hughes <tom@compton.nu>
Date: Mon, 21 Sep 2015 22:12:21 +0000 (+0100)
Subject: Filter out FailedOpenDevice messages from areca controllers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2b39085d5ec6eb471f1d88ffb6d00822584bf7a0?ds=sidebyside

Filter out FailedOpenDevice messages from areca controllers
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index d976e89dc..331fc8fe2 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -409,6 +409,13 @@ end
 if disks.count > 0
   package "smartmontools"
 
+  template "/usr/local/bin/smartd-mailer" do
+    source "smartd-mailer.erb"
+    owner "root"
+    group "root"
+    mode 0755
+  end
+
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
diff --git a/cookbooks/hardware/templates/default/smartd-mailer.erb b/cookbooks/hardware/templates/default/smartd-mailer.erb
new file mode 100644
index 000000000..589759dea
--- /dev/null
+++ b/cookbooks/hardware/templates/default/smartd-mailer.erb
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# DO NOT EDIT - This file is being maintained by Chef
+
+case "$SMARTD_DEVICETYPE" in
+    areca,*) [ "$SMARTD_FAILTYPE" = "FailedOpenDevice" ] && exit 0
+esac
+
+exec mail -s "$SMARTD_SUBJECT" $SMARTD_ADDRESS <<EOF
+$SMARTD_FULLMESSAGE
+EOF
diff --git a/cookbooks/hardware/templates/default/smartd.conf.erb b/cookbooks/hardware/templates/default/smartd.conf.erb
index b4f2aeb5f..e0d86831a 100644
--- a/cookbooks/hardware/templates/default/smartd.conf.erb
+++ b/cookbooks/hardware/templates/default/smartd.conf.erb
@@ -2,8 +2,8 @@
   
 <% @disks.each do |disk| -%>
 <% if disk[:driver] -%>
-/dev/<%= disk[:device] %> -d <%= disk[:driver] %>,<%= disk[:id] %> -s S/../../7/02 -m admins@openstreetmap.org
+/dev/<%= disk[:device] %> -d <%= disk[:driver] %>,<%= disk[:id] %> -s S/../../7/02 -m admins@openstreetmap.org -M exec /usr/local/bin/smartd-mailer
 <% else -%>
-/dev/<%= disk[:device] %> -s S/../../7/02 -m admins@openstreetmap.org
+/dev/<%= disk[:device] %> -s S/../../7/02 -m admins@openstreetmap.org -M exec /usr/local/bin/smartd-mailer
 <% end -%>
 <% end -%>