Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60859
Change subject: Rename $site_port_prefix to $id_prefix, and use it for gmond
instance IDs as well
......................................................................
Rename $site_port_prefix to $id_prefix, and use it for gmond instance IDs as
well
Change-Id: I83366d7d8fe7a5b0f161bb851f75cc54fabd0832
---
M modules/ganglia_new/manifests/configuration.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/60859/1
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index 4fd18e4..8e8c6a8 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -121,7 +121,7 @@
$url = "http://ganglia.wikimedia.org";
$gmetad_hosts = [ "208.80.152.15", "208.80.154.150" ]
$base_port = 8649
- $site_port_prefix = {
+ $id_prefix = {
pmtpa => 0,
eqiad => 1000,
esams => 3000,
@@ -132,7 +132,7 @@
$url = "http://ganglia.wmflabs.org";
$gmetad_hosts = [ "10.4.0.79"]
$base_port = 8649
- $site_port_prefix = {
+ $id_prefix = {
pmtpa => 0,
eqiad => 0,
}
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 73d43b4..eb8ea64 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -11,9 +11,9 @@
} else {
$sites = $ganglia_new::configuration::default_sites
}
- $id = $ganglia_new::configuration::clusters[$cluster]['id']
+ $id = $ganglia_new::configuration::clusters[$cluster]['id'] +
$ganglia_new::configuration::id_prefix[$site]
$desc = $ganglia_new::configuration::clusters[$cluster]['name']
- $portnr = $ganglia_new::configuration::base_port +
$ganglia_new::configuration::site_port_prefix[$site] + $id
+ $portnr = $ganglia_new::configuration::base_port + $id
$gmond_port = $::realm ? {
production => $portnr,
labs => $::project_gid
--
To view, visit https://gerrit.wikimedia.org/r/60859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83366d7d8fe7a5b0f161bb851f75cc54fabd0832
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
