Delta Between Two Patch Sets: manifests/monitoringserver.pp
Issue 11705024:
Added new notification servers (Closed)
Left Patch Set:
Created Sept. 19, 2013, 12:39 p.m.
Right 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.
« no previous file with change/comment
|
« Vagrantfile ('k')
|
manifests/notificationserver.pp » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} | 71 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} |
| 72 nagios_host {'server_19.adblockplus.org': use => 'generic-host'} | 72 nagios_host {'server_19.adblockplus.org': use => 'generic-host'} |
| 73 nagios_host {'server_20.adblockplus.org': use => 'generic-host'} | 73 nagios_host {'server_20.adblockplus.org': use => 'generic-host'} |
| 74 nagios_host {'server_21.adblockplus.org': use => 'generic-host'} | 74 nagios_host {'server_21.adblockplus.org': use => 'generic-host'} |
| 75 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'} | 76 nagios_host {'notification1.adblockplus.org': use => 'generic-host'} |
| 77 nagios_host {'notification2.adblockplus.org': use => 'generic-host'} | 77 nagios_host {'notification2.adblockplus.org': use => 'generic-host'} |
| 78 | 78 |
| 79 nagios_hostgroup {'all': members => '*'} | 79 nagios_hostgroup {'all': members => '*'} |
| 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'} | 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.dblockplus.org, notification2.dblock plus.org'} | 81 nagios_hostgroup {'notification-servers': members => 'server_17.adblockplus.or g, server_18.adblockplus.org, notification1.adblockplus.org, notification2.adblo ckplus.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'} | 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'} |
| 83 | 83 |
| 84 nagios_service {'current-load': | 84 nagios_service {'current-load': |
| 85 use => 'generic-service', | 85 use => 'generic-service', |
| 86 hostgroup_name => 'all', | 86 hostgroup_name => 'all', |
| 87 service_description => 'Current Load', | 87 service_description => 'Current Load', |
| 88 check_command => 'check_nrpe_1arg!check_load' | 88 check_command => 'check_nrpe_1arg!check_load' |
| 89 } | 89 } |
| 90 | 90 |
| 91 nagios_service {'disk-space': | 91 nagios_service {'disk-space': |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 } | 138 } |
| 139 | 139 |
| 140 nagios_service {'bandwidth': | 140 nagios_service {'bandwidth': |
| 141 use => 'generic-service', | 141 use => 'generic-service', |
| 142 hostgroup_name => 'all', | 142 hostgroup_name => 'all', |
| 143 service_description => 'Bandwidth', | 143 service_description => 'Bandwidth', |
| 144 check_command => 'check_nrpe_1arg!check_bandwidth', | 144 check_command => 'check_nrpe_1arg!check_bandwidth', |
| 145 first_notification_delay => '15' | 145 first_notification_delay => '15' |
| 146 } | 146 } |
| 147 } | 147 } |
| LEFT | RIGHT |
« Vagrantfile ('k')
|
manifests/notificationserver.pp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
