| OLD | NEW | 
|---|
| 1 node 'server4' { | 1 node 'server4' { | 
| 2   include base, ssh, puppetmaster | 2   include base, ssh, puppetmaster | 
| 3 | 3 | 
| 4   class {'nagios::client': | 4   class {'nagios::client': | 
| 5     server_address => 'monitoring.adblockplus.org' | 5     server_address => 'monitoring.adblockplus.org' | 
| 6   } | 6   } | 
| 7 | 7 | 
| 8   class {'nagios::server': | 8   class {'nagios::server': | 
| 9     vhost => 'monitoring.adblockplus.org', | 9     vhost => 'monitoring.adblockplus.org', | 
| 10     htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', | 10     htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 41     nagios_contactgroup {'admins': | 41     nagios_contactgroup {'admins': | 
| 42       alias => 'Nagios Administrators', | 42       alias => 'Nagios Administrators', | 
| 43       members => 'abp-admins' | 43       members => 'abp-admins' | 
| 44     } | 44     } | 
| 45   } | 45   } | 
| 46 | 46 | 
| 47   nagios_command {'check_easylist_http': | 47   nagios_command {'check_easylist_http': | 
| 48     command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H e
     asylist-downloads.adblockplus.org -u /easylist.txt -k "Accept-Encoding: gzip,def
     late" -e "HTTP/1.1 200 OK"' | 48     command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H e
     asylist-downloads.adblockplus.org -u /easylist.txt -k "Accept-Encoding: gzip,def
     late" -e "HTTP/1.1 200 OK"' | 
| 49   } | 49   } | 
| 50 | 50 | 
| 51   nagios_host {'www.adblockplus.org': use => 'generic-host'} |  | 
| 52   nagios_host {'server_1.adblockplus.org': use => 'generic-host'} | 51   nagios_host {'server_1.adblockplus.org': use => 'generic-host'} | 
| 53   nagios_host {'server_3.adblockplus.org': use => 'generic-host'} | 52   nagios_host {'server_3.adblockplus.org': use => 'generic-host'} | 
| 54   nagios_host {'server_4.adblockplus.org': use => 'generic-host'} | 53   nagios_host {'server_4.adblockplus.org': use => 'generic-host'} | 
| 55   nagios_host {'server_5.adblockplus.org': use => 'generic-host'} | 54   nagios_host {'server_5.adblockplus.org': use => 'generic-host'} | 
| 56   nagios_host {'server_6.adblockplus.org': use => 'generic-host'} | 55   nagios_host {'server_6.adblockplus.org': use => 'generic-host'} | 
| 57   nagios_host {'server_7.adblockplus.org': use => 'generic-host'} | 56   nagios_host {'server_7.adblockplus.org': use => 'generic-host'} | 
| 58   nagios_host {'server_8.adblockplus.org': use => 'generic-host'} | 57   nagios_host {'server_8.adblockplus.org': use => 'generic-host'} | 
| 59   nagios_host {'server_9.adblockplus.org': use => 'generic-host'} | 58   nagios_host {'server_9.adblockplus.org': use => 'generic-host'} | 
| 60 | 59 | 
| 61   nagios_hostgroup {'all': members => '*'} | 60   nagios_hostgroup {'all': members => '*'} | 
| 62   nagios_hostgroup {'http-servers': members => 'www.adblockplus.org, server_4.ad
     blockplus.org'} | 61   nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org'} | 
| 63   nagios_hostgroup {'filter-servers': members => 'server_1.adblockplus.org, serv
     er_3.adblockplus.org, server_5.adblockplus.org, server_6.adblockplus.org, server
     _7.adblockplus.org, server_8.adblockplus.org, server_9.adblockplus.org'} | 62   nagios_hostgroup {'filter-servers': members => 'server_1.adblockplus.org, serv
     er_3.adblockplus.org, server_5.adblockplus.org, server_6.adblockplus.org, server
     _7.adblockplus.org, server_8.adblockplus.org, server_9.adblockplus.org'} | 
| 64 | 63 | 
| 65   nagios_service {'current-load': | 64   nagios_service {'current-load': | 
| 66     use => 'generic-service', | 65     use => 'generic-service', | 
| 67     hostgroup_name => 'all', | 66     hostgroup_name => 'all', | 
| 68     service_description => 'Current Load', | 67     service_description => 'Current Load', | 
| 69     check_command => 'check_nrpe_1arg!check_load' | 68     check_command => 'check_nrpe_1arg!check_load' | 
| 70   } | 69   } | 
| 71 | 70 | 
| 72   nagios_service {'disk-space': | 71   nagios_service {'disk-space': | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 111     check_command => 'check_easylist_http' | 110     check_command => 'check_easylist_http' | 
| 112   } | 111   } | 
| 113 | 112 | 
| 114   nagios_service {'bandwidth': | 113   nagios_service {'bandwidth': | 
| 115     use => 'generic-service', | 114     use => 'generic-service', | 
| 116     hostgroup_name => 'all', | 115     hostgroup_name => 'all', | 
| 117     service_description => 'Bandwidth', | 116     service_description => 'Bandwidth', | 
| 118     check_command => 'check_nrpe_1arg!check_bandwidth' | 117     check_command => 'check_nrpe_1arg!check_bandwidth' | 
| 119   } | 118   } | 
| 120 } | 119 } | 
| OLD | NEW | 
|---|