Lcarr has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/52537


Change subject: removing cronspam on successful run, subscribing to correct 
files
......................................................................

removing cronspam on successful run, subscribing to correct files

Change-Id: I2a8a0de6e86d97a08680c3a2612ad43a013ad80a
---
M manifests/misc/icinga.pp
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/52537/1

diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index d285dbb..e286dba 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -803,6 +803,7 @@
        service { snmptt:
                ensure => running,
                hasstatus => false,
+               hasrestart => true,
                subscribe => [ File["/etc/snmp/snmptt.conf"],
                               File["/etc/init.d/snmptt"],
                               File["/etc/snmp/snmptrapd.conf"]];
@@ -811,7 +812,8 @@
        service { snmptrapd:
                ensure => running,
                hasstatus => false,
-               subscribe => File["/etc/init.d/snmptrapd"];
+               subscribe => [ File["/etc/init.d/snmptrapd"],
+                              File["/etc/snmp/snmptrapd.comf"]];
        }
 
        service { snmpd:
@@ -822,7 +824,7 @@
 
        # FIXME: smptt crashes periodically on precise
        cron { "restart_snmptt":
-               command => "service snmptt restart",
+               command => "service snmptt restart 2>&1",
                user => root,
                hour => [0, 4, 8, 12, 16, 20],
                minute => 7,

-- 
To view, visit https://gerrit.wikimedia.org/r/52537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a8a0de6e86d97a08680c3a2612ad43a013ad80a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to