Left: | ||
Right: |
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 26 matching lines...) Expand all Loading... | |
37 host_notification_commands => 'notify-host-by-email', | 37 host_notification_commands => 'notify-host-by-email', |
38 email => 'admins@adblockplus.org' | 38 email => 'admins@adblockplus.org' |
39 } | 39 } |
40 | 40 |
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_nrpe_timeout': | |
48 command_line => '/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG 1$ -t $ARG2$' | |
49 } | |
50 | |
47 nagios_command {'check_easylist_http': | 51 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"' | 52 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 } | 53 } |
50 | 54 |
51 nagios_command {'check_notification_http': | 55 nagios_command {'check_notification_http': |
52 command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H n otification.adblockplus.org -u /notification.json -k "Accept-Encoding: gzip,defl ate" -e "HTTP/1.1 200 OK"' | 56 command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H n otification.adblockplus.org -u /notification.json -k "Accept-Encoding: gzip,defl ate" -e "HTTP/1.1 200 OK"' |
53 } | 57 } |
54 | 58 |
55 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} | 59 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} |
56 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} | 60 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
132 use => 'generic-service', | 136 use => 'generic-service', |
133 hostgroup_name => 'notification-servers', | 137 hostgroup_name => 'notification-servers', |
134 service_description => 'HTTP', | 138 service_description => 'HTTP', |
135 check_command => 'check_notification_http' | 139 check_command => 'check_notification_http' |
136 } | 140 } |
137 | 141 |
138 nagios_service {'bandwidth': | 142 nagios_service {'bandwidth': |
139 use => 'generic-service', | 143 use => 'generic-service', |
140 hostgroup_name => 'all', | 144 hostgroup_name => 'all', |
141 service_description => 'Bandwidth', | 145 service_description => 'Bandwidth', |
142 check_command => 'check_nrpe_1arg!check_bandwidth', | 146 check_command => 'check_nrpe_timeout!check_bandwidth!20', |
Felix Dahlke
2013/10/10 08:29:08
Why does this need a timeout now?
Wladimir Palant
2013/10/10 09:37:46
There is always a timeout, the default is 10 secon
| |
143 first_notification_delay => '15' | 147 first_notification_delay => '15' |
144 } | 148 } |
145 | 149 |
146 nagios_service {'connections': | 150 nagios_service {'connections': |
147 use => 'generic-service', | 151 use => 'generic-service', |
148 hostgroup_name => 'all', | 152 hostgroup_name => 'all', |
149 service_description => 'Connections', | 153 service_description => 'Connections', |
150 check_command => 'check_nrpe_1arg!check_connections', | 154 check_command => 'check_nrpe_1arg!check_connections', |
151 } | 155 } |
152 | 156 |
153 nagios_service {'memory': | 157 nagios_service {'memory': |
154 use => 'generic-service', | 158 use => 'generic-service', |
155 hostgroup_name => 'all', | 159 hostgroup_name => 'all', |
156 service_description => 'Memory', | 160 service_description => 'Memory', |
157 check_command => 'check_nrpe_1arg!check_memory', | 161 check_command => 'check_nrpe_1arg!check_memory', |
158 } | 162 } |
159 } | 163 } |
OLD | NEW |