Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/182800
Change subject: monitoring: fix a bunch of indentation warnings
......................................................................
monitoring: fix a bunch of indentation warnings
fixes various compiler warnings about incorrect
indentation in the monitoring module
Change-Id: Ib2615dce4fc90e19b3aae09fda3f68131676bc03
---
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/service.pp
2 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/182800/1
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index c3d9014..0e5bbf3 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -24,15 +24,15 @@
# Export the nagios host instance
@@nagios_host { $title:
- ensure => $ensure,
- target => '/etc/nagios/puppet_hosts.cfg',
- host_name => $title,
- address => $ip_address,
- hostgroups => $hostgroup,
- check_command => 'check_ping!500,20%!2000,100%',
- check_period => '24x7',
- max_check_attempts => 2,
- contact_groups => $critical ? {
+ ensure => $ensure,
+ target => '/etc/nagios/puppet_hosts.cfg',
+ host_name => $title,
+ address => $ip_address,
+ hostgroups => $hostgroup,
+ check_command => 'check_ping!500,20%!2000,100%',
+ check_period => '24x7',
+ max_check_attempts => 2,
+ contact_groups => $critical ? {
'true' => 'admins,sms',
default => $contact_group,
},
diff --git a/modules/monitoring/manifests/service.pp
b/modules/monitoring/manifests/service.pp
index a2bab62..5bb6bcc 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -26,40 +26,40 @@
# Export the nagios service instance
@@nagios_service { "${::hostname} ${title}":
- ensure => $ensure,
- target => "${config_dir}/puppet_checks.d/${host}.cfg",
- host_name => $host,
- servicegroups => $servicegroups,
- service_description => $description,
- check_command => $check_command,
- max_check_attempts => $retries,
- normal_check_interval => $normal_check_interval,
- retry_check_interval => $retry_check_interval,
- check_period => '24x7',
- notification_interval => $critical ? {
+ ensure => $ensure,
+ target => "${config_dir}/puppet_checks.d/${host}.cfg",
+ host_name => $host,
+ servicegroups => $servicegroups,
+ service_description => $description,
+ check_command => $check_command,
+ max_check_attempts => $retries,
+ normal_check_interval => $normal_check_interval,
+ retry_check_interval => $retry_check_interval,
+ check_period => '24x7',
+ notification_interval => $critical ? {
'true' => 240,
default => 0,
},
- notification_period => '24x7',
- notification_options => 'c,r,f',
- contact_groups => $critical ? {
+ notification_period => '24x7',
+ notification_options => 'c,r,f',
+ contact_groups => $critical ? {
'true' => 'admins,sms',
default => $contact_group,
},
- passive_checks_enabled => 1,
- active_checks_enabled => $passive ? {
+ passive_checks_enabled => 1,
+ active_checks_enabled => $passive ? {
'true' => 0,
default => 1,
},
- is_volatile => $passive ? {
+ is_volatile => $passive ? {
'true' => 1,
default => 0,
},
- check_freshness => $passive ? {
+ check_freshness => $passive ? {
'true' => 1,
default => 0,
},
- freshness_threshold => $passive ? {
+ freshness_threshold => $passive ? {
'true' => $freshness,
default => undef,
},
--
To view, visit https://gerrit.wikimedia.org/r/182800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2615dce4fc90e19b3aae09fda3f68131676bc03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
