Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328599 )
Change subject: ganglia: switch eqiad aggregator from carbon to install1001
......................................................................
ganglia: switch eqiad aggregator from carbon to install1001
We want to stop using carbon for this. In codfw we use
install2001 for it, so it seems to makes sense to also
use install1001 for eqiad.
Bug: T123733
Bug: T132757
Change-Id: Ib2db17637711e5ae22ee4c07dcb558e6b13dca27
---
M hieradata/eqiad.yaml
M manifests/site.pp
M modules/ganglia/manifests/configuration.pp
3 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index ccf9c4c..37ca9a9 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -24,7 +24,7 @@
#
# Ganglia
#
-ganglia_aggregators: carbon.wikimedia.org:9649
+ganglia_aggregators: install1001.wikimedia.org:9649
# Eventlogging
eventlogging_host: 10.64.32.167 # eventlog1001
diff --git a/manifests/site.pp b/manifests/site.pp
index 00b474a..9cae403 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -234,11 +234,6 @@
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
-
- class { 'ganglia::monitor::aggregator':
- sites => 'eqiad',
- }
-
}
# cerium, praseodymium and xenon are Cassandra test hosts
@@ -1318,6 +1313,10 @@
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
+
+ class { 'ganglia::monitor::aggregator':
+ sites => 'eqiad',
+ }
}
node 'install2001.wikimedia.org' {
diff --git a/modules/ganglia/manifests/configuration.pp
b/modules/ganglia/manifests/configuration.pp
index 721548e..2576e83 100644
--- a/modules/ganglia/manifests/configuration.pp
+++ b/modules/ganglia/manifests/configuration.pp
@@ -6,7 +6,7 @@
$url = 'http://ganglia.wikimedia.org'
$gmetad_hosts = [ '208.80.154.53']
$aggregator_hosts = {
- 'eqiad' => [ ipresolve('carbon.wikimedia.org') ],
+ 'eqiad' => [ ipresolve('install1001.wikimedia.org') ],
'esams' => [ ipresolve('bast3001.wikimedia.org') ],
'codfw' => [ ipresolve('install2001.wikimedia.org') ],
'ulsfo' => [ ipresolve('bast4001.wikimedia.org') ],
--
To view, visit https://gerrit.wikimedia.org/r/328599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2db17637711e5ae22ee4c07dcb558e6b13dca27
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
