Changes for Nagios 3.

diff --git a/gen/nagios-colo.gen b/gen/nagios-colo.gen
index c98c5ea7b6e472686a7d4f081209fec3bba90734..8c0f914819b60a0800df2f7e9d7c6e3365232469 100755 (executable)
--- a/gen/nagios-colo.gen
+++ b/gen/nagios-colo.gen
@@ -40,6 +40,7 @@ define host{
        host_name               $name
        alias                   $name
        address                 $name
+       contact_groups          colo,dost
        use                     generic-host
        }
 
@@ -74,7 +75,6 @@ END
 define hostgroup{
         hostgroup_name          colo-hosts
         alias                   colo-hosts
-        contact_groups          colo,dost
 END
 
 print OUT "\tmembers\t\t\t";

diff --git a/gen/nagios-printers.gen b/gen/nagios-printers.gen
index 88d3d656ea90756f0c44fdb0044c183ace1ba943..adb48d28d44d34dcdcc7c0160bbcb3fbf4b15bc3 100755 (executable)
--- a/gen/nagios-printers.gen
+++ b/gen/nagios-printers.gen
@@ -33,6 +33,7 @@ define host{
        host_name               $name
        alias                   $name
        address                 $name
+       contact_groups          ops-printers
        use                     generic-host
        }
 
@@ -82,7 +83,6 @@ print OUT <<END;
 define hostgroup{
         hostgroup_name          printers
         alias                   printers
-        contact_groups          ops-printers
 END
 
 print OUT "\tmembers\t\t";

diff --git a/gen/nagios-wsh.gen b/gen/nagios-wsh.gen
index c33e559b235c95375f0e4b0329892608285f5e4e..caf7abf883583c17785bdfdb5ecf76bcf030afbc 100755 (executable)
--- a/gen/nagios-wsh.gen
+++ b/gen/nagios-wsh.gen
@@ -40,6 +40,7 @@ define host{
        host_name               $name
        alias                   $name
        address                 $name
+       contact_groups          wsh
        use                     generic-host
        }
 
@@ -208,7 +209,6 @@ END
 define hostgroup{
         hostgroup_name          wsh-hosts
         alias                   wsh-hosts
-        contact_groups          wsh
 END
 
 print OUT "\tmembers\t\t\t";