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

Side by Side Diff: manifests/monitoringserver.pp

Issue 5459448122310656: Add rietveld to infrastructure (Closed)
Patch Set: Apply Changes Created Feb. 7, 2014, 5:16 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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 nagios_host {'filter4.adblockplus.org': use => 'generic-host'} 73 nagios_host {'filter4.adblockplus.org': use => 'generic-host'}
74 nagios_host {'filter5.adblockplus.org': use => 'generic-host'} 74 nagios_host {'filter5.adblockplus.org': use => 'generic-host'}
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 nagios_host {'issues1.adblockplus.org': use => 'generic-host'} 82 nagios_host {'issues1.adblockplus.org': use => 'generic-host'}
83 nagios_host {'codereview.adblockplus.org': use => 'generic-host'}
Felix Dahlke 2014/02/07 20:09:46 Should be codereview1 here as well. Also, we shoul
christian 2014/02/10 09:05:57 Done.
83 84
84 nagios_hostgroup {'all': members => '*'} 85 nagios_hostgroup {'all': members => '*'}
85 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, issues1.adbloc kplus.org'} 86 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, issues1.adbloc kplus.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, notification1. adblockplus.org, notification2.adblockplus.org'} 87 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'}
87 88
88 nagios_service {'current-load': 89 nagios_service {'current-load':
89 use => 'generic-service', 90 use => 'generic-service',
90 hostgroup_name => 'all', 91 hostgroup_name => 'all',
91 service_description => 'Current Load', 92 service_description => 'Current Load',
92 check_command => 'check_nrpe_1arg!check_load' 93 check_command => 'check_nrpe_1arg!check_load'
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 check_command => 'check_nrpe_1arg!check_connections', 157 check_command => 'check_nrpe_1arg!check_connections',
157 } 158 }
158 159
159 nagios_service {'memory': 160 nagios_service {'memory':
160 use => 'generic-service', 161 use => 'generic-service',
161 hostgroup_name => 'all', 162 hostgroup_name => 'all',
162 service_description => 'Memory', 163 service_description => 'Memory',
163 check_command => 'check_nrpe_1arg!check_memory', 164 check_command => 'check_nrpe_1arg!check_memory',
164 } 165 }
165 } 166 }
OLDNEW

Powered by Google App Engine
This is Rietveld