Mark Bergsma has submitted this change and it was merged.
Change subject: Split gmetad hosts and aggregator hosts
......................................................................
Split gmetad hosts and aggregator hosts
Change-Id: I7353649ae155bebee14b8805b8cd4dcf2436a2c3
---
M modules/ganglia_new/manifests/configuration.pp
M modules/ganglia_new/manifests/monitor.pp
M modules/ganglia_new/manifests/monitor/config.pp
M modules/ganglia_new/templates/gmond.conf.erb
4 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index 8e8c6a8..63f6602 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -120,6 +120,11 @@
'production': {
$url = "http://ganglia.wikimedia.org";
$gmetad_hosts = [ "208.80.152.15", "208.80.154.150" ]
+ $aggregator_hosts = {
+ 'pmtpa' => [ "208.80.152.15", "208.80.154.150"
],
+ 'eqiad' => [ "208.80.152.15", "208.80.154.150"
],
+ 'esams' => [ "91.198.174.113" ]
+ }
$base_port = 8649
$id_prefix = {
pmtpa => 0,
@@ -131,6 +136,10 @@
'labs': {
$url = "http://ganglia.wmflabs.org";
$gmetad_hosts = [ "10.4.0.79"]
+ $aggregator_hosts = {
+ 'pmtpa' => [ "10.4.0.79" ],
+ 'eqiad' => [ "10.4.0.79" ],
+ }
$base_port = 8649
$id_prefix = {
pmtpa => 0,
diff --git a/modules/ganglia_new/manifests/monitor.pp
b/modules/ganglia_new/manifests/monitor.pp
index 226f7c8..ce0c041 100644
--- a/modules/ganglia_new/manifests/monitor.pp
+++ b/modules/ganglia_new/manifests/monitor.pp
@@ -15,6 +15,7 @@
production => "${desc} ${::site}",
labs => $::instanceproject
}
+ $aggregator_hosts =
$ganglia_new::configuration::aggregator_hosts[$::site]
$override_hostname = $::realm ? {
production => undef,
labs => $::instancename
@@ -23,6 +24,7 @@
class { "ganglia_new::monitor::config":
gmond_port => $gmond_port,
cname => $cname,
+ aggregator_hosts => $aggregator_hosts,
override_hostname => $override_hostname
}
}
\ No newline at end of file
diff --git a/modules/ganglia_new/manifests/monitor/config.pp
b/modules/ganglia_new/manifests/monitor/config.pp
index 3fc0895..140e10e 100644
--- a/modules/ganglia_new/manifests/monitor/config.pp
+++ b/modules/ganglia_new/manifests/monitor/config.pp
@@ -1,4 +1,4 @@
-class ganglia_new::monitor::config($gmond_port, $cname,
$override_hostname=undef) {
+class ganglia_new::monitor::config($gmond_port, $cname, $aggregator_hosts,
$override_hostname=undef) {
require ganglia_new::monitor::packages
$aggregator = false
diff --git a/modules/ganglia_new/templates/gmond.conf.erb
b/modules/ganglia_new/templates/gmond.conf.erb
index 3ff7b5d..e55810f 100644
--- a/modules/ganglia_new/templates/gmond.conf.erb
+++ b/modules/ganglia_new/templates/gmond.conf.erb
@@ -35,7 +35,7 @@
}
<% if not aggregator -%>
-<% scope.lookupvar("ganglia_new::configuration::gmetad_hosts").each do |host|
-%>
+<% aggregator_hosts.each do |host| -%>
udp_send_channel {
host = <%= host %>
port = <%= gmond_port %>
--
To view, visit https://gerrit.wikimedia.org/r/61003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7353649ae155bebee14b8805b8cd4dcf2436a2c3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
