| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 nagios_host {'server_7.adblockplus.org': use => 'generic-host'} | 56 nagios_host {'server_7.adblockplus.org': use => 'generic-host'} |
| 57 nagios_host {'server_8.adblockplus.org': use => 'generic-host'} | 57 nagios_host {'server_8.adblockplus.org': use => 'generic-host'} |
| 58 nagios_host {'server_9.adblockplus.org': use => 'generic-host'} | 58 nagios_host {'server_9.adblockplus.org': use => 'generic-host'} |
| 59 nagios_host {'server_10.adblockplus.org': use => 'generic-host'} | 59 nagios_host {'server_10.adblockplus.org': use => 'generic-host'} |
| 60 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} | 60 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} |
| 61 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} | 61 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} |
| 62 nagios_host {'server_13.adblockplus.org': use => 'generic-host'} | 62 nagios_host {'server_13.adblockplus.org': use => 'generic-host'} |
| 63 nagios_host {'server_14.adblockplus.org': use => 'generic-host'} | 63 nagios_host {'server_14.adblockplus.org': use => 'generic-host'} |
| 64 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} | 64 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} |
| 65 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} | 65 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} |
| 66 nagios_host {'server_17.adblockplus.org': use => 'generic-host'} |
| 66 | 67 |
| 67 nagios_hostgroup {'all': members => '*'} | 68 nagios_hostgroup {'all': members => '*'} |
| 68 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server
_10.adblockplus.org, server_13.adblockplus.org, server_16.adblockplus.org'} | 69 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server
_10.adblockplus.org, server_13.adblockplus.org, server_16.adblockplus.org, serve
r_17.adblockplus.org'} |
| 69 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, server_1
1.adblockplus.org, server_12.adblockplus.org, server_14.adblockplus.org, server_
15.adblockplus.org'} | 70 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, server_1
1.adblockplus.org, server_12.adblockplus.org, server_14.adblockplus.org, server_
15.adblockplus.org'} |
| 70 | 71 |
| 71 nagios_service {'current-load': | 72 nagios_service {'current-load': |
| 72 use => 'generic-service', | 73 use => 'generic-service', |
| 73 hostgroup_name => 'all', | 74 hostgroup_name => 'all', |
| 74 service_description => 'Current Load', | 75 service_description => 'Current Load', |
| 75 check_command => 'check_nrpe_1arg!check_load' | 76 check_command => 'check_nrpe_1arg!check_load' |
| 76 } | 77 } |
| 77 | 78 |
| 78 nagios_service {'disk-space': | 79 nagios_service {'disk-space': |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 check_command => 'check_easylist_http' | 118 check_command => 'check_easylist_http' |
| 118 } | 119 } |
| 119 | 120 |
| 120 nagios_service {'bandwidth': | 121 nagios_service {'bandwidth': |
| 121 use => 'generic-service', | 122 use => 'generic-service', |
| 122 hostgroup_name => 'all', | 123 hostgroup_name => 'all', |
| 123 service_description => 'Bandwidth', | 124 service_description => 'Bandwidth', |
| 124 check_command => 'check_nrpe_1arg!check_bandwidth' | 125 check_command => 'check_nrpe_1arg!check_bandwidth' |
| 125 } | 126 } |
| 126 } | 127 } |
| OLD | NEW |