Dzahn has submitted this change and it was merged.
Change subject: ganglia/netmon1001: rm ganglia::deprecated::collector
......................................................................
ganglia/netmon1001: rm ganglia::deprecated::collector
Well, it's called "deprecated" already since a while
(before we upgraded ganglia hosts to jessie).
And now our goal is to kill ganglia and also we want to
upgrade netmon1001 eventually, so simplifying that should
also be good.
We don't actually use that here, do we?
Change-Id: I6dfa05bc87ea39407873c82ea69c511627cbcdae
---
M manifests/site.pp
D modules/ganglia/manifests/deprecated/collector.pp
2 files changed, 0 insertions(+), 53 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 30abac2..e51ab2f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2308,7 +2308,6 @@
role(rancid::server, librenms, servermon::wmf, torrus, smokeping)
include standard
include passwords::network
- include ganglia::deprecated::collector
include base::firewall
interface::add_ip6_mapped { 'main': }
diff --git a/modules/ganglia/manifests/deprecated/collector.pp
b/modules/ganglia/manifests/deprecated/collector.pp
deleted file mode 100644
index 8832483..0000000
--- a/modules/ganglia/manifests/deprecated/collector.pp
+++ /dev/null
@@ -1,52 +0,0 @@
-# == Class ganglia::deprecated::collector
-# Ganglia gmetad config. Do not use this!
-
-class ganglia::deprecated::collector {
- system::role { 'ganglia::collector': description => 'Ganglia gmetad
aggregator' }
-
- package { 'gmetad':
- ensure => present,
- }
-
- $gridname = 'Wikimedia'
- $authority_url = 'http://ganglia.wikimedia.org'
- case $::hostname {
- # netmon1001 runs gmetad to get varnish data into torrus
- # unlike other servers, netmon1001 uses the default rrd_rootdir
- /^netmon1001$/: {
- $data_sources = {
- 'Upload caches eqiad' => 'cp1048.eqiad.wmnet
cp1062.eqiad.wmnet'
- }
- $rra_sizes = '"RRA:AVERAGE:0:1:4032" "RRA:AVERAGE:0.17:6:2016"
"RRA:MAX:0.17:6:2016" "RRA:AVERAGE:0.042:288:732" "RRA:MAX:0.042:288:732"'
- }
- default: {
- fail('ganglia::deprecated::collector is deprecated and only
applied to netmon1001')
- }
- }
-
- file { '/etc/ganglia/gmetad.conf':
- ensure => present,
- require => Package['gmetad'],
- content => template('ganglia/deprecated/gmetad.conf.erb'),
- mode => '0444',
- }
-
- service { 'gmetad':
- ensure => running,
- require => File['/etc/ganglia/gmetad.conf'],
- subscribe => File['/etc/ganglia/gmetad.conf'],
- hasstatus => false,
- }
-
- ferm::service { 'gmetad_netmon1001_xml':
- proto => 'tcp',
- port => '8653',
- srange => '@resolve((cp1048.eqiad.wmnet cp1062.eqiad.wmnet))',
- }
-
- ferm::service { 'gmetad_netmon1001':
- proto => 'tcp',
- port => '8654',
- srange => '@resolve((cp1048.eqiad.wmnet cp1062.eqiad.wmnet))',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/315890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6dfa05bc87ea39407873c82ea69c511627cbcdae
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
