Faidon Liambotis has submitted this change and it was merged.
Change subject: ganglia: export $cname when ganglia_new is used
......................................................................
ganglia: export $cname when ganglia_new is used
Currently, this happens:
- esams (& codfw) hosts include ganglia, but this actually includes
ganglia_new being used and $::ganglia::cname is never exposed.
- monitoring::ganglia uses $::ganglia::cname for passing $ARG7, which in
turn passes the -C argument to check_ganglia. This is empty for esams
hosts.
- check_ganglia uses -C (and -H, because of -q) as an argument to pass
to gmetad's query interface (/cluster/hostname).
- For esams hosts, gmetad gets passed "//hostname" and instead of
returning nothing, returns the full XML dump of every host instead
(currently weighting 34MB).
=> icinga queries esams text caches by fetching 34MB 52 times every 5
minutes. Ugh.
Hack this around by re-exporting ganglia_new's $cname to
$::ganglia::cname. This is ugly, but a quick hack to fix a much bigger
problem.
Change-Id: I37d8ea79498bac46db983f2ea532c86034bc1e6e
---
M manifests/ganglia.pp
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 66a531f..e2ec36c 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -24,6 +24,9 @@
class { 'ganglia_new::monitor':
cluster => $ganglia_cluster,
}
+
+ # FIXME: ugly, but without it bad things happen with check_ganglia
+ $cname = $ganglia_new::monitor::cname
} else {
if ! $::cluster {
$cluster = 'misc'
--
To view, visit https://gerrit.wikimedia.org/r/182233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37d8ea79498bac46db983f2ea532c86034bc1e6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
