Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138822
Change subject: Fix for $critical param on monitor_ganglia define
......................................................................
Fix for $critical param on monitor_ganglia define
monitor_ganglia is a wrapper for monitor_service, and passes many
parameters straight through to monitor_service. The $critical
parameter had been defined twice and used for different things.
This renames the $critical param passed to monitor_service to
$nagios_critical, which is the same name that monitor_graphite_threshold
uses.
Change-Id: I9f4bc069324d7baf930b8d34b3c1fe824b2ef74a
---
M manifests/nagios.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/138822/1
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index 8fc4282..d3c7647 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -313,7 +313,7 @@
# $retries
# $group
# $ensure
-# $critical
+# $nagios_critical - passed as $critical to monitor_service define
# $passive
# $freshness
# $normal_check_interval
@@ -323,8 +323,8 @@
define monitor_ganglia(
$description,
$metric,
- $warning,
- $critical,
+ $warning_threshold,
+ $critical_threshold,
$metric_host = $::fqdn,
$gmetad_host = 'nickel.wikimedia.org',
$gmetad_query_port = 8654,
@@ -332,7 +332,7 @@
$retries = 3,
$group = undef,
$ensure = present,
- $critical = 'false',
+ $nagios_critical = 'false',
$passive = 'false',
$freshness = 36000,
$normal_check_interval = 1,
@@ -369,7 +369,7 @@
check_command =>
"check_ganglia!${gmetad_host}!${gmetad_query_port}!${metric_host}!${metric}!${warning}!${critical}!${::ganglia::cname}",
retries => $retries,
group => $ganglia_group,
- critical => $critical,
+ critical => $nagios_critical,
passive => $passive,
freshness => $freshness,
normal_check_interval => $normal_check_interval,
--
To view, visit https://gerrit.wikimedia.org/r/138822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f4bc069324d7baf930b8d34b3c1fe824b2ef74a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
