Merge filter and notification servers, have both tasks run on the same servers

manifests/monitoringserver.pp

 node 'server4' {
   include base, ssh, puppetmaster
 
   class {'nagios::client':
     server_address => 'monitoring.adblockplus.org'
   }
 
   class {'nagios::server':
     vhost => 'monitoring.adblockplus.org',
     htpasswd_source => 'puppet:///modules/private/nagios-htpasswd',
@@ skipping 64 matching lines @@
   nagios_host {'filter6.adblockplus.org': use => 'generic-host'}
   nagios_host {'filtermaster1.adblockplus.org': use => 'generic-host'}
   nagios_host {'notification1.adblockplus.org': use => 'generic-host'}
   nagios_host {'notification2.adblockplus.org': use => 'generic-host'}
   nagios_host {'update1.adblockplus.org': use => 'generic-host'}
   nagios_host {'web1.adblockplus.org': use => 'generic-host'}
   nagios_host {'stats1.adblockplus.org': use => 'generic-host'}
 
   nagios_hostgroup {'all': members => '*'}
   nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server_10.adblockplus.org, server_16.adblockplus.org, download1.adblockplus.org, update1.adblockplus.org, web1.adblockplus.org, stats1.adblockplus.org'}
-  nagios_hostgroup {'notification-servers': members => 'notification1.adblockplus.org, notification2.adblockplus.org'}
-  nagios_hostgroup {'filter-servers': members => 'server_5.adblockplus.org, server_6.adblockplus.org, server_7.adblockplus.org, server_11.adblockplus.org, server_12.adblockplus.org, server_15.adblockplus.org, server_19.adblockplus.org, filter1.adblockplus.org, filter2.adblockplus.org, filter3.adblockplus.org, filter4.adblockplus.org, filter5.adblockplus.org, filter6.adblockplus.org'}
+  nagios_hostgroup {'filter-servers': members => 'server_5.adblockplus.org, server_6.adblockplus.org, server_7.adblockplus.org, server_11.adblockplus.org, server_12.adblockplus.org, server_15.adblockplus.org, server_19.adblockplus.org, filter1.adblockplus.org, filter2.adblockplus.org, filter3.adblockplus.org, filter4.adblockplus.org, filter5.adblockplus.org, filter6.adblockplus.org, notification1.adblockplus.org, notification2.adblockplus.org'}
 
   nagios_service {'current-load':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Current Load',
     check_command => 'check_nrpe_1arg!check_load'
   }
 
   nagios_service {'disk-space':
     use => 'generic-service',
@@ skipping 32 matching lines @@
 
   nagios_service {'easylist-http':
     use => 'generic-service',
     hostgroup_name => 'filter-servers',
     service_description => 'HTTP',
     check_command => 'check_easylist_http'
   }
 
   nagios_service {'notification-http':
     use => 'generic-service',
-    hostgroup_name => 'notification-servers',
+    hostgroup_name => 'filter-servers',
     service_description => 'HTTP',
     check_command => 'check_notification_http'
   }
 
   nagios_service {'bandwidth':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Bandwidth',
     check_command => 'check_nrpe_timeout!check_bandwidth!20',
     first_notification_delay => '15'
   }
 
   nagios_service {'connections':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Connections',
     check_command => 'check_nrpe_1arg!check_connections',
   }
 
   nagios_service {'memory':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Memory',
     check_command => 'check_nrpe_1arg!check_memory',
   }
 }