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

Side by Side Diff: manifests/monitoringserver.pp

Issue 5302563972841472: Merge filter and notification servers, have both tasks run on the same servers (Closed)
Patch Set: Created Jan. 30, 2014, 11:49 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 nagios_host {'filter6.adblockplus.org': use => 'generic-host'} 75 nagios_host {'filter6.adblockplus.org': use => 'generic-host'}
76 nagios_host {'filtermaster1.adblockplus.org': use => 'generic-host'} 76 nagios_host {'filtermaster1.adblockplus.org': use => 'generic-host'}
77 nagios_host {'notification1.adblockplus.org': use => 'generic-host'} 77 nagios_host {'notification1.adblockplus.org': use => 'generic-host'}
78 nagios_host {'notification2.adblockplus.org': use => 'generic-host'} 78 nagios_host {'notification2.adblockplus.org': use => 'generic-host'}
79 nagios_host {'update1.adblockplus.org': use => 'generic-host'} 79 nagios_host {'update1.adblockplus.org': use => 'generic-host'}
80 nagios_host {'web1.adblockplus.org': use => 'generic-host'} 80 nagios_host {'web1.adblockplus.org': use => 'generic-host'}
81 nagios_host {'stats1.adblockplus.org': use => 'generic-host'} 81 nagios_host {'stats1.adblockplus.org': use => 'generic-host'}
82 82
83 nagios_hostgroup {'all': members => '*'} 83 nagios_hostgroup {'all': members => '*'}
84 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server _10.adblockplus.org, server_16.adblockplus.org, download1.adblockplus.org, updat e1.adblockplus.org, web1.adblockplus.org, stats1.adblockplus.org'} 84 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server _10.adblockplus.org, server_16.adblockplus.org, download1.adblockplus.org, updat e1.adblockplus.org, web1.adblockplus.org, stats1.adblockplus.org'}
85 nagios_hostgroup {'notification-servers': members => 'notification1.adblockplu s.org, notification2.adblockplus.org'} 85 nagios_hostgroup {'filter-servers': members => 'server_5.adblockplus.org, serv er_6.adblockplus.org, server_7.adblockplus.org, server_11.adblockplus.org, serve r_12.adblockplus.org, server_15.adblockplus.org, server_19.adblockplus.org, filt er1.adblockplus.org, filter2.adblockplus.org, filter3.adblockplus.org, filter4.a dblockplus.org, filter5.adblockplus.org, filter6.adblockplus.org, notification1. adblockplus.org, notification2.adblockplus.org'}
86 nagios_hostgroup {'filter-servers': members => 'server_5.adblockplus.org, serv er_6.adblockplus.org, server_7.adblockplus.org, server_11.adblockplus.org, serve r_12.adblockplus.org, server_15.adblockplus.org, server_19.adblockplus.org, filt er1.adblockplus.org, filter2.adblockplus.org, filter3.adblockplus.org, filter4.a dblockplus.org, filter5.adblockplus.org, filter6.adblockplus.org'}
87 86
88 nagios_service {'current-load': 87 nagios_service {'current-load':
89 use => 'generic-service', 88 use => 'generic-service',
90 hostgroup_name => 'all', 89 hostgroup_name => 'all',
91 service_description => 'Current Load', 90 service_description => 'Current Load',
92 check_command => 'check_nrpe_1arg!check_load' 91 check_command => 'check_nrpe_1arg!check_load'
93 } 92 }
94 93
95 nagios_service {'disk-space': 94 nagios_service {'disk-space':
96 use => 'generic-service', 95 use => 'generic-service',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 128
130 nagios_service {'easylist-http': 129 nagios_service {'easylist-http':
131 use => 'generic-service', 130 use => 'generic-service',
132 hostgroup_name => 'filter-servers', 131 hostgroup_name => 'filter-servers',
133 service_description => 'HTTP', 132 service_description => 'HTTP',
134 check_command => 'check_easylist_http' 133 check_command => 'check_easylist_http'
135 } 134 }
136 135
137 nagios_service {'notification-http': 136 nagios_service {'notification-http':
138 use => 'generic-service', 137 use => 'generic-service',
139 hostgroup_name => 'notification-servers', 138 hostgroup_name => 'filter-servers',
140 service_description => 'HTTP', 139 service_description => 'HTTP',
141 check_command => 'check_notification_http' 140 check_command => 'check_notification_http'
142 } 141 }
143 142
144 nagios_service {'bandwidth': 143 nagios_service {'bandwidth':
145 use => 'generic-service', 144 use => 'generic-service',
146 hostgroup_name => 'all', 145 hostgroup_name => 'all',
147 service_description => 'Bandwidth', 146 service_description => 'Bandwidth',
148 check_command => 'check_nrpe_timeout!check_bandwidth!20', 147 check_command => 'check_nrpe_timeout!check_bandwidth!20',
149 first_notification_delay => '15' 148 first_notification_delay => '15'
150 } 149 }
151 150
152 nagios_service {'connections': 151 nagios_service {'connections':
153 use => 'generic-service', 152 use => 'generic-service',
154 hostgroup_name => 'all', 153 hostgroup_name => 'all',
155 service_description => 'Connections', 154 service_description => 'Connections',
156 check_command => 'check_nrpe_1arg!check_connections', 155 check_command => 'check_nrpe_1arg!check_connections',
157 } 156 }
158 157
159 nagios_service {'memory': 158 nagios_service {'memory':
160 use => 'generic-service', 159 use => 'generic-service',
161 hostgroup_name => 'all', 160 hostgroup_name => 'all',
162 service_description => 'Memory', 161 service_description => 'Memory',
163 check_command => 'check_nrpe_1arg!check_memory', 162 check_command => 'check_nrpe_1arg!check_memory',
164 } 163 }
165 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld