Delta Between Two Patch Sets: manifests/monitoringserver.pp
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Left Patch Set:
Created April 2, 2014, 2:05 p.m.
Right Patch Set: Converted Nagios site configuration and centralized error page configuration
Created April 10, 2014, 6:40 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« manifests/downloadserver.pp ('k')
|
manifests/statsserver.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 |
|---|---|
| (no file at all) | |
| 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 domain => 'monitoring.adblockplus.org', |
| 10 is_default => 'true', | |
| 10 htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', | 11 htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', |
| 11 admins => ['*'] | 12 admins => ['*'] |
| 12 } | 13 } |
| 13 | 14 |
| 14 if $::environment == 'development' { | 15 if $::environment == 'development' { |
| 15 nagios_contact {'root': | 16 nagios_contact {'root': |
| 16 service_notification_period => '24x7', | 17 service_notification_period => '24x7', |
| 17 host_notification_period => '24x7', | 18 host_notification_period => '24x7', |
| 18 service_notification_options => 'w,u,c,r', | 19 service_notification_options => 'w,u,c,r', |
| 19 host_notification_options => 'd,r', | 20 host_notification_options => 'd,r', |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 check_command => 'check_nrpe_1arg!check_connections', | 170 check_command => 'check_nrpe_1arg!check_connections', |
| 170 } | 171 } |
| 171 | 172 |
| 172 nagios_service {'memory': | 173 nagios_service {'memory': |
| 173 use => 'generic-service', | 174 use => 'generic-service', |
| 174 hostgroup_name => 'all', | 175 hostgroup_name => 'all', |
| 175 service_description => 'Memory', | 176 service_description => 'Memory', |
| 176 check_command => 'check_nrpe_1arg!check_memory', | 177 check_command => 'check_nrpe_1arg!check_memory', |
| 177 } | 178 } |
| 178 } | 179 } |
| LEFT | RIGHT |
« manifests/downloadserver.pp ('k')
|
manifests/statsserver.pp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
