[1915] in Moira Commits
/svn/moira r4054 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Sun Oct 2 11:55:54 2011
Date: Sun, 2 Oct 2011 11:55:43 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201110021555.p92FthLg025211@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2011-10-02 11:55:43 -0400 (Sun, 02 Oct 2011)
New Revision: 4054
Modified:
trunk/moira/gen/nagios-cluster.gen
Log:
Respect printer statuses, and add support for ipacl service.
Modified: trunk/moira/gen/nagios-cluster.gen
===================================================================
--- trunk/moira/gen/nagios-cluster.gen 2011-09-29 12:30:54 UTC (rev 4053)
+++ trunk/moira/gen/nagios-cluster.gen 2011-10-02 15:55:43 UTC (rev 4054)
@@ -116,8 +116,9 @@
print OUT "\n### Printers\n\n";
$sth0 = $dbh->prepare("SELECT UNIQUE m.name FROM machine m, printers p " .
- "WHERE (p.type = 'DORM' OR p.type ='CLUSTER') " .
- "AND p.mach_id = m.mach_id AND m.status=1")
+ "WHERE (p.type = 'DORM' OR p.type ='CLUSTER') " .
+ "AND p.mach_id = m.mach_id AND m.status=1 " .
+ "AND (p.status = 1 OR p.status = 4)")
|| exit $MR_DBMS_ERR;
$sth0->execute || exit $MR_DBMS_ERR;
@@ -147,6 +148,12 @@
use hpjd-service
}
+define service{
+ host_name $name
+ contact_groups noone
+ use ipacl-service
+ }
+
END
}
