| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 nagios_host {'server_17.adblockplus.org': use => 'generic-host'} |
| 67 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} | 67 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} |
| 68 nagios_host {'server_19.adblockplus.org': use => 'generic-host'} |
| 69 nagios_host {'server_20.adblockplus.org': use => 'generic-host'} |
| 68 | 70 |
| 69 nagios_hostgroup {'all': members => '*'} | 71 nagios_hostgroup {'all': members => '*'} |
| 70 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, server_18.adblockplus.org'} | 72 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, server_18.adblockplus.org, server_19.adblockplus.org, serv
er_20.adblockplus.org'} |
| 71 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'} | 73 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, server_19.adblockplus.org, server_20.adblockplus.org'} |
| 72 | 74 |
| 73 nagios_service {'current-load': | 75 nagios_service {'current-load': |
| 74 use => 'generic-service', | 76 use => 'generic-service', |
| 75 hostgroup_name => 'all', | 77 hostgroup_name => 'all', |
| 76 service_description => 'Current Load', | 78 service_description => 'Current Load', |
| 77 check_command => 'check_nrpe_1arg!check_load' | 79 check_command => 'check_nrpe_1arg!check_load' |
| 78 } | 80 } |
| 79 | 81 |
| 80 nagios_service {'disk-space': | 82 nagios_service {'disk-space': |
| 81 use => 'generic-service', | 83 use => 'generic-service', |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 check_command => 'check_easylist_http' | 121 check_command => 'check_easylist_http' |
| 120 } | 122 } |
| 121 | 123 |
| 122 nagios_service {'bandwidth': | 124 nagios_service {'bandwidth': |
| 123 use => 'generic-service', | 125 use => 'generic-service', |
| 124 hostgroup_name => 'all', | 126 hostgroup_name => 'all', |
| 125 service_description => 'Bandwidth', | 127 service_description => 'Bandwidth', |
| 126 check_command => 'check_nrpe_1arg!check_bandwidth' | 128 check_command => 'check_nrpe_1arg!check_bandwidth' |
| 127 } | 129 } |
| 128 } | 130 } |
| OLD | NEW |