Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: manifests/monitoringserver.pp

Issue 12375002: Implement more detailed bandwidth monitoring (Closed)
Patch Set: Increased socket timeout and offloaded time calculations to tcpdump Created Oct. 9, 2013, 7:36 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | modules/nagios/files/check_bandwidth » ('j') | modules/nagios/files/check_bandwidth » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: manifests/monitoringserver.pp
===================================================================
--- a/manifests/monitoringserver.pp
+++ b/manifests/monitoringserver.pp
@@ -39,16 +39,20 @@ node 'server4' {
}
nagios_contactgroup {'admins':
alias => 'Nagios Administrators',
members => 'abp-admins'
}
}
+ nagios_command {'check_nrpe_timeout':
+ command_line => '/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ -t $ARG2$'
+ }
+
nagios_command {'check_easylist_http':
command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H easylist-downloads.adblockplus.org -u /easylist.txt -k "Accept-Encoding: gzip,deflate" -e "HTTP/1.1 200 OK"'
}
nagios_command {'check_notification_http':
command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H notification.adblockplus.org -u /notification.json -k "Accept-Encoding: gzip,deflate" -e "HTTP/1.1 200 OK"'
}
@@ -134,17 +138,17 @@ node 'server4' {
service_description => 'HTTP',
check_command => 'check_notification_http'
}
nagios_service {'bandwidth':
use => 'generic-service',
hostgroup_name => 'all',
service_description => 'Bandwidth',
- check_command => 'check_nrpe_1arg!check_bandwidth',
+ 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
first_notification_delay => '15'
}
nagios_service {'connections':
use => 'generic-service',
hostgroup_name => 'all',
service_description => 'Connections',
check_command => 'check_nrpe_1arg!check_connections',
« no previous file with comments | « no previous file | modules/nagios/files/check_bandwidth » ('j') | modules/nagios/files/check_bandwidth » ('J')

Powered by Google App Engine
This is Rietveld