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

Side by Side Diff: manifests/monitoringserver.pp

Issue 11705024: Added new notification servers (Closed)
Patch Set: Fixed typos Created Sept. 19, 2013, 12:42 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Vagrantfile ('k') | manifests/notificationserver.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 30 matching lines...) Expand all
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_easylist_http': 47 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"' 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"'
49 } 49 }
50 50
51 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"'
53 }
54
51 nagios_host {'server_1.adblockplus.org': use => 'generic-host'} 55 nagios_host {'server_1.adblockplus.org': use => 'generic-host'}
52 nagios_host {'server_3.adblockplus.org': use => 'generic-host'} 56 nagios_host {'server_3.adblockplus.org': use => 'generic-host'}
53 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} 57 nagios_host {'server_4.adblockplus.org': use => 'generic-host'}
54 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} 58 nagios_host {'server_5.adblockplus.org': use => 'generic-host'}
55 nagios_host {'server_6.adblockplus.org': use => 'generic-host'} 59 nagios_host {'server_6.adblockplus.org': use => 'generic-host'}
56 nagios_host {'server_7.adblockplus.org': use => 'generic-host'} 60 nagios_host {'server_7.adblockplus.org': use => 'generic-host'}
57 nagios_host {'server_8.adblockplus.org': use => 'generic-host'} 61 nagios_host {'server_8.adblockplus.org': use => 'generic-host'}
58 nagios_host {'server_9.adblockplus.org': use => 'generic-host'} 62 nagios_host {'server_9.adblockplus.org': use => 'generic-host'}
59 nagios_host {'server_10.adblockplus.org': use => 'generic-host'} 63 nagios_host {'server_10.adblockplus.org': use => 'generic-host'}
60 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} 64 nagios_host {'server_11.adblockplus.org': use => 'generic-host'}
61 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} 65 nagios_host {'server_12.adblockplus.org': use => 'generic-host'}
62 nagios_host {'server_13.adblockplus.org': use => 'generic-host'} 66 nagios_host {'server_13.adblockplus.org': use => 'generic-host'}
63 nagios_host {'server_14.adblockplus.org': use => 'generic-host'} 67 nagios_host {'server_14.adblockplus.org': use => 'generic-host'}
64 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} 68 nagios_host {'server_15.adblockplus.org': use => 'generic-host'}
65 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} 69 nagios_host {'server_16.adblockplus.org': use => 'generic-host'}
66 nagios_host {'server_17.adblockplus.org': use => 'generic-host'} 70 nagios_host {'server_17.adblockplus.org': use => 'generic-host'}
67 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} 71 nagios_host {'server_18.adblockplus.org': use => 'generic-host'}
68 nagios_host {'server_19.adblockplus.org': use => 'generic-host'} 72 nagios_host {'server_19.adblockplus.org': use => 'generic-host'}
69 nagios_host {'server_20.adblockplus.org': use => 'generic-host'} 73 nagios_host {'server_20.adblockplus.org': use => 'generic-host'}
70 nagios_host {'server_21.adblockplus.org': use => 'generic-host'} 74 nagios_host {'server_21.adblockplus.org': use => 'generic-host'}
71 nagios_host {'server_22.adblockplus.org': use => 'generic-host'} 75 nagios_host {'server_22.adblockplus.org': use => 'generic-host'}
76 nagios_host {'notification1.adblockplus.org': use => 'generic-host'}
77 nagios_host {'notification2.adblockplus.org': use => 'generic-host'}
72 78
73 nagios_hostgroup {'all': members => '*'} 79 nagios_hostgroup {'all': members => '*'}
74 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, server_21.adblockplus.org, server_22.adblockplus.org'} 80 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server _10.adblockplus.org, server_13.adblockplus.org, server_16.adblockplus.org, serve r_19.adblockplus.org, server_20.adblockplus.org, server_21.adblockplus.org, serv er_22.adblockplus.org'}
81 nagios_hostgroup {'notification-servers': members => 'server_17.adblockplus.or g, server_18.adblockplus.org, notification1.adblockplus.org, notification2.adblo ckplus.org'}
75 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'} 82 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'}
76 83
77 nagios_service {'current-load': 84 nagios_service {'current-load':
78 use => 'generic-service', 85 use => 'generic-service',
79 hostgroup_name => 'all', 86 hostgroup_name => 'all',
80 service_description => 'Current Load', 87 service_description => 'Current Load',
81 check_command => 'check_nrpe_1arg!check_load' 88 check_command => 'check_nrpe_1arg!check_load'
82 } 89 }
83 90
84 nagios_service {'disk-space': 91 nagios_service {'disk-space':
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 check_command => 'check_http' 123 check_command => 'check_http'
117 } 124 }
118 125
119 nagios_service {'easylist-http': 126 nagios_service {'easylist-http':
120 use => 'generic-service', 127 use => 'generic-service',
121 hostgroup_name => 'filter-servers', 128 hostgroup_name => 'filter-servers',
122 service_description => 'HTTP', 129 service_description => 'HTTP',
123 check_command => 'check_easylist_http' 130 check_command => 'check_easylist_http'
124 } 131 }
125 132
133 nagios_service {'notification-http':
134 use => 'generic-service',
135 hostgroup_name => 'notification-servers',
136 service_description => 'HTTP',
137 check_command => 'check_notification_http'
138 }
139
126 nagios_service {'bandwidth': 140 nagios_service {'bandwidth':
127 use => 'generic-service', 141 use => 'generic-service',
128 hostgroup_name => 'all', 142 hostgroup_name => 'all',
129 service_description => 'Bandwidth', 143 service_description => 'Bandwidth',
130 check_command => 'check_nrpe_1arg!check_bandwidth', 144 check_command => 'check_nrpe_1arg!check_bandwidth',
131 first_notification_delay => '15' 145 first_notification_delay => '15'
132 } 146 }
133 } 147 }
OLDNEW
« no previous file with comments | « Vagrantfile ('k') | manifests/notificationserver.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld