Volans has submitted this change and it was merged.
Change subject: icinga: fix variable re-assignement
......................................................................
icinga: fix variable re-assignement
Bug: T142085
Change-Id: Ia95bdc22bbc42434707dcf9a73c101a62c40f98b
---
M modules/raid/manifests/init.pp
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
Volans: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index e49cada..800ee80 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -44,13 +44,13 @@
command => "/usr/bin/sudo ${get_raid_status_megacli} -c",
}
- $service_description = 'MegaRAID'
+ $service_description_megaraid = 'MegaRAID'
nrpe::monitor_service { 'raid_megaraid':
- description => $service_description,
+ description => $service_description_megaraid,
nrpe_command => "${check_raid} megacli",
normal_check_interval => $normal_check_interval,
retry_check_interval => $retry_check_interval,
- event_handler =>
"raid_handler!megacli!${service_description}!${::site}",
+ event_handler =>
"raid_handler!megacli!${service_description_megaraid}!${::site}",
}
}
@@ -88,14 +88,14 @@
],
}
- $service_description = 'HP RAID'
+ $service_description_hp = 'HP RAID'
nrpe::monitor_service { 'raid_hpssacli':
- description => $service_description,
+ description => $service_description_hp,
nrpe_command =>
'/usr/local/lib/nagios/plugins/check_hpssacli',
timeout => 50, # can take > 10s on servers with lots
of disks
normal_check_interval => $normal_check_interval,
retry_check_interval => $retry_check_interval,
- event_handler =>
"raid_handler!hpssacli!${service_description}!${::site}",
+ event_handler =>
"raid_handler!hpssacli!${service_description_hp}!${::site}",
}
$get_raid_status_hpssacli =
'/usr/local/lib/nagios/plugins/get-raid-status-hpssacli'
@@ -127,13 +127,13 @@
before => Package['mpt-status'],
}
- $service_description = 'MPT RAID'
+ $service_description_mpt = 'MPT RAID'
nrpe::monitor_service { 'raid_mpt':
- description => $service_description,
+ description => $service_description_mpt,
nrpe_command => "${check_raid} mpt",
normal_check_interval => $normal_check_interval,
retry_check_interval => $retry_check_interval,
- event_handler =>
"raid_handler!mpt!${service_description}!${::site}",
+ event_handler =>
"raid_handler!mpt!${service_description_mpt}!${::site}",
}
nrpe::check { 'get_raid_status_mpt':
@@ -144,11 +144,11 @@
if 'md' in $raid {
# if there is an "md" RAID configured, mdadm is already installed
- $service_description = 'MD RAID'
+ $service_description_md = 'MD RAID'
nrpe::monitor_service { 'raid_md':
- description => $service_description,
+ description => $service_description_md,
nrpe_command => "${check_raid} md",
- event_handler =>
"raid_handler!md!${service_description}!${::site}",
+ event_handler =>
"raid_handler!md!${service_description_md}!${::site}",
}
nrpe::check { 'get_raid_status_md':
--
To view, visit https://gerrit.wikimedia.org/r/316749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia95bdc22bbc42434707dcf9a73c101a62c40f98b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
