Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131945
Change subject: Pass the correct arguments to check_ganglia.
......................................................................
Pass the correct arguments to check_ganglia.
Our queries to ganglia were missing the 'cluster' parameter that
check_ganglia uses to query gmetad, resulting in us getting back from
gmetad all data for all metrics, and not only the ones for the desired
cluster/host combination as check_ganglia was passing 'None' as the
cluster name.
For example:
$ echo '/Miscellaneous eqiad/fluorine' | nc nickel.wikimedia.org 8654 \
| wc -c
1066388
$ echo '/None/fluorine' | nc nickel.wikimedia.org 8654 | wc -c
23567370
This should reduce a lot the stress on memory on neon.
Change-Id: I72fa213f41ecff0d3b6a8a6274c76ecdcff53953
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M manifests/nagios.pp
M templates/icinga/checkcommands.cfg.erb
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/131945/1
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index feba9e7..24dea38 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -332,11 +332,12 @@
# $ARG4$ -m ganglia metric name
# $ARG5$ -w warning threshold
# $ARG6$ -c critical threshold
+ # $ARG7$ -C ganglia cluster name
monitor_service { $title:
ensure => $ensure,
description => $description,
- check_command =>
"check_ganglia!${gmetad_host}!${gmetad_query_port}!${metric_host}!${metric}!${warning}!${critical}",
+ check_command =>
"check_ganglia!${gmetad_host}!${gmetad_query_port}!${metric_host}!${metric}!${warning}!${critical}!{$::ganglia::cname}",
retries => $retries,
group => $group,
critical => $critical,
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index 11f5d57..9db9b0e 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -446,7 +446,7 @@
# check arbitrary ganglia metric values
define command{
command_name check_ganglia
- command_line $USER1$/check_ganglia -q -g $ARG1$ -p $ARG2$ -H $ARG3$
-m '$ARG4$' -w '$ARG5$' -c '$ARG6$'
+ command_line $USER1$/check_ganglia -q -g $ARG1$ -p $ARG2$ -H $ARG3$
-m '$ARG4$' -w '$ARG5$' -c '$ARG6$' -C '$ARG7$'
}
# percona mysql checks
--
To view, visit https://gerrit.wikimedia.org/r/131945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72fa213f41ecff0d3b6a8a6274c76ecdcff53953
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
