Command line printer manipulation client, and build goo.

[moira.git] / gen / nagios-colo.gen

diff --git a/gen/nagios-colo.gen b/gen/nagios-colo.gen
index 2c9780fe5a46b92fb92919c453ecb0bbe371fa81..8c0f914819b60a0800df2f7e9d7c6e3365232469 100755 (executable)
--- a/gen/nagios-colo.gen
+++ b/gen/nagios-colo.gen
@@ -26,7 +26,7 @@ while (($root_list_id, $hostname) = $sth0->fetchrow_array) {
     print OUT "# This file is automatically generated by Moira.  Do not edit.\n";
     $sth = $dbh->prepare("SELECT m.name FROM machine m, imembers i " .
                         "WHERE i.list_id = " . $dbh->quote($root_list_id) .
-                        "AND i.member_type = 'MACHINE' " .
+                        "AND i.member_type = 'MACHINE' AND m.status = 1 " .
                         "AND i.member_id = m.mach_id AND i.direct = 1 ORDER BY m.name") 
        || exit $MR_DBMS_ERR;
     $sth->execute;
@@ -40,18 +40,19 @@ define host{
        host_name               $name
        alias                   $name
        address                 $name
+       contact_groups          colo,dost
        use                     generic-host
        }
 
 define service{
        host_name               $name
-       contact_groups          ops
+       contact_groups          colo
        use                     ping-service
        }
 
 define hostescalation{
         host_name               $name
-        contact_groups          ops,dost
+        contact_groups          colo,dost-mail
         first_notification      2
         last_notification       0
         notification_interval   0
@@ -59,7 +60,7 @@ define hostescalation{
 
 define serviceescalation{
         host_name               $name
-        contact_groups          ops,dost
+        contact_groups          colo,dost-mail
         service_description     PING
         first_notification      2
         last_notification       0
@@ -74,7 +75,6 @@ END
 define hostgroup{
         hostgroup_name          colo-hosts
         alias                   colo-hosts
-        contact_groups          dost
 END
 
 print OUT "\tmembers\t\t\t";