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

Unified Diff: manifests/monitoringserver.pp

Issue 11705024: Added new notification servers (Closed)
Patch Set: Created Sept. 19, 2013, 12:39 p.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 | « Vagrantfile ('k') | manifests/notificationserver.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: manifests/monitoringserver.pp
===================================================================
--- a/manifests/monitoringserver.pp
+++ b/manifests/monitoringserver.pp
@@ -43,16 +43,20 @@ node 'server4' {
members => 'abp-admins'
}
}
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"'
+ }
+
nagios_host {'server_1.adblockplus.org': use => 'generic-host'}
nagios_host {'server_3.adblockplus.org': use => 'generic-host'}
nagios_host {'server_4.adblockplus.org': use => 'generic-host'}
nagios_host {'server_5.adblockplus.org': use => 'generic-host'}
nagios_host {'server_6.adblockplus.org': use => 'generic-host'}
nagios_host {'server_7.adblockplus.org': use => 'generic-host'}
nagios_host {'server_8.adblockplus.org': use => 'generic-host'}
nagios_host {'server_9.adblockplus.org': use => 'generic-host'}
@@ -64,19 +68,22 @@ node 'server4' {
nagios_host {'server_15.adblockplus.org': use => 'generic-host'}
nagios_host {'server_16.adblockplus.org': use => 'generic-host'}
nagios_host {'server_17.adblockplus.org': use => 'generic-host'}
nagios_host {'server_18.adblockplus.org': use => 'generic-host'}
nagios_host {'server_19.adblockplus.org': use => 'generic-host'}
nagios_host {'server_20.adblockplus.org': use => 'generic-host'}
nagios_host {'server_21.adblockplus.org': use => 'generic-host'}
nagios_host {'server_22.adblockplus.org': use => 'generic-host'}
+ nagios_host {'notification1.adblockplus.org': use => 'generic-host'}
+ nagios_host {'notification2.adblockplus.org': use => 'generic-host'}
nagios_hostgroup {'all': members => '*'}
- nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server_10.adblockplus.org, server_13.adblockplus.org, server_16.adblockplus.org, server_17.adblockplus.org, server_18.adblockplus.org, server_19.adblockplus.org, server_20.adblockplus.org, server_21.adblockplus.org, server_22.adblockplus.org'}
+ nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server_10.adblockplus.org, server_13.adblockplus.org, server_16.adblockplus.org, server_19.adblockplus.org, server_20.adblockplus.org, server_21.adblockplus.org, server_22.adblockplus.org'}
+ nagios_hostgroup {'notification-servers': members => 'server_17.adblockplus.org, server_18.adblockplus.org, notification1.dblockplus.org, notification2.dblockplus.org'}
nagios_hostgroup {'filter-servers': members => 'server_1.adblockplus.org, server_3.adblockplus.org, server_5.adblockplus.org, server_6.adblockplus.org, server_7.adblockplus.org, server_8.adblockplus.org, server_9.adblockplus.org, server_11.adblockplus.org, server_12.adblockplus.org, server_14.adblockplus.org, server_15.adblockplus.org, server_19.adblockplus.org, server_20.adblockplus.org'}
nagios_service {'current-load':
use => 'generic-service',
hostgroup_name => 'all',
service_description => 'Current Load',
check_command => 'check_nrpe_1arg!check_load'
}
@@ -118,16 +125,23 @@ node 'server4' {
nagios_service {'easylist-http':
use => 'generic-service',
hostgroup_name => 'filter-servers',
service_description => 'HTTP',
check_command => 'check_easylist_http'
}
+ nagios_service {'notification-http':
+ use => 'generic-service',
+ hostgroup_name => 'notification-servers',
+ 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',
first_notification_delay => '15'
}
}
« no previous file with comments | « Vagrantfile ('k') | manifests/notificationserver.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld