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

Delta Between Two Patch Sets: manifests/monitoringserver.pp

Issue 5143068516810752: Added new stats server and user counter page (Closed)
Left Patch Set: Created Dec. 20, 2013, 11:05 a.m.
Right Patch Set: Centralized stats processing Created Dec. 20, 2013, 3:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« manifests/downloadserver.pp ('K') | « manifests/filterserver.pp ('k') | manifests/notificationserver.pp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 nagios_host {'server_4.adblockplus.org': use => 'generic-host'} 59 nagios_host {'server_4.adblockplus.org': use => 'generic-host'}
60 nagios_host {'server_5.adblockplus.org': use => 'generic-host'} 60 nagios_host {'server_5.adblockplus.org': use => 'generic-host'}
61 nagios_host {'server_6.adblockplus.org': use => 'generic-host'} 61 nagios_host {'server_6.adblockplus.org': use => 'generic-host'}
62 nagios_host {'server_7.adblockplus.org': use => 'generic-host'} 62 nagios_host {'server_7.adblockplus.org': use => 'generic-host'}
63 nagios_host {'server_10.adblockplus.org': use => 'generic-host'} 63 nagios_host {'server_10.adblockplus.org': use => 'generic-host'}
64 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} 64 nagios_host {'server_11.adblockplus.org': use => 'generic-host'}
65 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} 65 nagios_host {'server_12.adblockplus.org': use => 'generic-host'}
66 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} 66 nagios_host {'server_15.adblockplus.org': use => 'generic-host'}
67 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} 67 nagios_host {'server_16.adblockplus.org': use => 'generic-host'}
68 nagios_host {'server_19.adblockplus.org': use => 'generic-host'} 68 nagios_host {'server_19.adblockplus.org': use => 'generic-host'}
69 nagios_host {'server_22.adblockplus.org': use => 'generic-host'}
70 nagios_host {'download1.adblockplus.org': use => 'generic-host'} 69 nagios_host {'download1.adblockplus.org': use => 'generic-host'}
71 nagios_host {'filter1.adblockplus.org': use => 'generic-host'} 70 nagios_host {'filter1.adblockplus.org': use => 'generic-host'}
72 nagios_host {'filter2.adblockplus.org': use => 'generic-host'} 71 nagios_host {'filter2.adblockplus.org': use => 'generic-host'}
73 nagios_host {'filter3.adblockplus.org': use => 'generic-host'} 72 nagios_host {'filter3.adblockplus.org': use => 'generic-host'}
74 nagios_host {'filter4.adblockplus.org': use => 'generic-host'} 73 nagios_host {'filter4.adblockplus.org': use => 'generic-host'}
75 nagios_host {'filter5.adblockplus.org': use => 'generic-host'} 74 nagios_host {'filter5.adblockplus.org': use => 'generic-host'}
76 nagios_host {'filter6.adblockplus.org': use => 'generic-host'} 75 nagios_host {'filter6.adblockplus.org': use => 'generic-host'}
77 nagios_host {'filtermaster1.adblockplus.org': use => 'generic-host'} 76 nagios_host {'filtermaster1.adblockplus.org': use => 'generic-host'}
78 nagios_host {'notification1.adblockplus.org': use => 'generic-host'} 77 nagios_host {'notification1.adblockplus.org': use => 'generic-host'}
79 nagios_host {'notification2.adblockplus.org': use => 'generic-host'} 78 nagios_host {'notification2.adblockplus.org': use => 'generic-host'}
80 nagios_host {'update1.adblockplus.org': use => 'generic-host'} 79 nagios_host {'update1.adblockplus.org': use => 'generic-host'}
81 nagios_host {'web1.adblockplus.org': use => 'generic-host'} 80 nagios_host {'web1.adblockplus.org': use => 'generic-host'}
82 nagios_host {'stats1.adblockplus.org': use => 'generic-host'} 81 nagios_host {'stats1.adblockplus.org': use => 'generic-host'}
83 82
84 nagios_hostgroup {'all': members => '*'} 83 nagios_hostgroup {'all': members => '*'}
85 nagios_hostgroup {'http-servers': members => 'server_4.adblockplus.org, server _10.adblockplus.org, server_16.adblockplus.org, server_22.adblockplus.org, downl oad1.adblockplus.org, update1.adblockplus.org, web1.adblockplus.org, stats1.adbl ockplus.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'}
86 nagios_hostgroup {'notification-servers': members => 'notification1.adblockplu s.org, notification2.adblockplus.org'} 85 nagios_hostgroup {'notification-servers': members => 'notification1.adblockplu s.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'} 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'}
88 87
89 nagios_service {'current-load': 88 nagios_service {'current-load':
90 use => 'generic-service', 89 use => 'generic-service',
91 hostgroup_name => 'all', 90 hostgroup_name => 'all',
92 service_description => 'Current Load', 91 service_description => 'Current Load',
93 check_command => 'check_nrpe_1arg!check_load' 92 check_command => 'check_nrpe_1arg!check_load'
94 } 93 }
95 94
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 check_command => 'check_nrpe_1arg!check_connections', 156 check_command => 'check_nrpe_1arg!check_connections',
158 } 157 }
159 158
160 nagios_service {'memory': 159 nagios_service {'memory':
161 use => 'generic-service', 160 use => 'generic-service',
162 hostgroup_name => 'all', 161 hostgroup_name => 'all',
163 service_description => 'Memory', 162 service_description => 'Memory',
164 check_command => 'check_nrpe_1arg!check_memory', 163 check_command => 'check_nrpe_1arg!check_memory',
165 } 164 }
166 } 165 }
LEFTRIGHT
« manifests/filterserver.pp ('k') | manifests/notificationserver.pp » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld