Unified Diff: manifests/monitoringserver.pp
Issue 5302563972841472:
Merge filter and notification servers, have both tasks run on the same servers (Closed)
Patch Set: Stopped misusing is_default parameter
Created Jan. 30, 2014, 2:10 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« manifests/filterserver.pp ('K')
|
« manifests/filterserver.pp ('k')
|
manifests/nodes.pp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: manifests/monitoringserver.pp |
| =================================================================== |
| --- a/manifests/monitoringserver.pp |
| +++ b/manifests/monitoringserver.pp |
| @@ -77,18 +77,17 @@ node 'server4' { |
| 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' |
| } |
| @@ -131,17 +130,17 @@ node 'server4' { |
| 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', |
« manifests/filterserver.pp ('K')
|
« manifests/filterserver.pp ('k')
|
manifests/nodes.pp » ('j')
|
no next file with comments »
