Side by Side Diff: manifests/monitoringserver.pp
Issue 11439212:
Add server21 as updateserver (Closed)
Patch Set:
Created Aug. 16, 2013, 12:32 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Vagrantfile ('k')
|
manifests/nodes.pp » ('j')
|
modules/updateserver/files/update.adblockplus.org » ('J')
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')
| OLD | NEW |
|---|---|
| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} | 60 nagios_host {'server_11.adblockplus.org': use => 'generic-host'} |
| 61 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} | 61 nagios_host {'server_12.adblockplus.org': use => 'generic-host'} |
| 62 nagios_host {'server_13.adblockplus.org': use => 'generic-host'} | 62 nagios_host {'server_13.adblockplus.org': use => 'generic-host'} |
| 63 nagios_host {'server_14.adblockplus.org': use => 'generic-host'} | 63 nagios_host {'server_14.adblockplus.org': use => 'generic-host'} |
| 64 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} | 64 nagios_host {'server_15.adblockplus.org': use => 'generic-host'} |
| 65 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} | 65 nagios_host {'server_16.adblockplus.org': use => 'generic-host'} |
| 66 nagios_host {'server_17.adblockplus.org': use => 'generic-host'} | 66 nagios_host {'server_17.adblockplus.org': use => 'generic-host'} |
| 67 nagios_host {'server_18.adblockplus.org': use => 'generic-host'} | 67 nagios_host {'server_18.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_20.adblockplus.org': use => 'generic-host'} | 69 nagios_host {'server_20.adblockplus.org': use => 'generic-host'} |
| 70 nagios_host {'server_21.adblockplus.org': use => 'generic-host'} | |
| 70 | 71 |
| 71 nagios_hostgroup {'all': members => '*'} | 72 nagios_hostgroup {'all': members => '*'} |
| 72 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'} | 73 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'} |
| 73 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'} | 74 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'} |
| 74 | 75 |
| 75 nagios_service {'current-load': | 76 nagios_service {'current-load': |
| 76 use => 'generic-service', | 77 use => 'generic-service', |
| 77 hostgroup_name => 'all', | 78 hostgroup_name => 'all', |
| 78 service_description => 'Current Load', | 79 service_description => 'Current Load', |
| 79 check_command => 'check_nrpe_1arg!check_load' | 80 check_command => 'check_nrpe_1arg!check_load' |
| 80 } | 81 } |
| 81 | 82 |
| 82 nagios_service {'disk-space': | 83 nagios_service {'disk-space': |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 121 check_command => 'check_easylist_http' | 122 check_command => 'check_easylist_http' |
| 122 } | 123 } |
| 123 | 124 |
| 124 nagios_service {'bandwidth': | 125 nagios_service {'bandwidth': |
| 125 use => 'generic-service', | 126 use => 'generic-service', |
| 126 hostgroup_name => 'all', | 127 hostgroup_name => 'all', |
| 127 service_description => 'Bandwidth', | 128 service_description => 'Bandwidth', |
| 128 check_command => 'check_nrpe_1arg!check_bandwidth' | 129 check_command => 'check_nrpe_1arg!check_bandwidth' |
| 129 } | 130 } |
| 130 } | 131 } |
| OLD | NEW |
« no previous file with comments
|
« Vagrantfile ('k')
|
manifests/nodes.pp » ('j')
|
modules/updateserver/files/update.adblockplus.org » ('J')
