| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 nagios_host {'server_3.adblockplus.org': use => 'generic-host'} | 52 nagios_host {'server_3.adblockplus.org': use => 'generic-host'} |
| 53 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} | 53 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} |
| 54 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} | 54 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} |
| 55 nagios_host {'server_6.adblockplus.org': use => 'generic-host'} | 55 nagios_host {'server_6.adblockplus.org': use => 'generic-host'} |
| 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 | 63 |
| 63 nagios_hostgroup {'all': members => '*'} | 64 nagios_hostgroup {'all': members => '*'} |
| 64 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server
_10.adblockplus.org'} | 65 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server
_10.adblockplus.org, server_13.adblockplus.org'} |
| 65 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'} | 66 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'} |
| 66 | 67 |
| 67 nagios_service {'current-load': | 68 nagios_service {'current-load': |
| 68 use => 'generic-service', | 69 use => 'generic-service', |
| 69 hostgroup_name => 'all', | 70 hostgroup_name => 'all', |
| 70 service_description => 'Current Load', | 71 service_description => 'Current Load', |
| 71 check_command => 'check_nrpe_1arg!check_load' | 72 check_command => 'check_nrpe_1arg!check_load' |
| 72 } | 73 } |
| 73 | 74 |
| 74 nagios_service {'disk-space': | 75 nagios_service {'disk-space': |
| 75 use => 'generic-service', | 76 use => 'generic-service', |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 check_command => 'check_easylist_http' | 114 check_command => 'check_easylist_http' |
| 114 } | 115 } |
| 115 | 116 |
| 116 nagios_service {'bandwidth': | 117 nagios_service {'bandwidth': |
| 117 use => 'generic-service', | 118 use => 'generic-service', |
| 118 hostgroup_name => 'all', | 119 hostgroup_name => 'all', |
| 119 service_description => 'Bandwidth', | 120 service_description => 'Bandwidth', |
| 120 check_command => 'check_nrpe_1arg!check_bandwidth' | 121 check_command => 'check_nrpe_1arg!check_bandwidth' |
| 121 } | 122 } |
| 122 } | 123 } |
| OLD | NEW |