Alexandros Kosiaris has submitted this change and it was merged.

Change subject: ganglia: Remove neon as a gmetad allowed host
......................................................................


ganglia: Remove neon as a gmetad allowed host

neon no longer queries ganglia for anything. check_ganglia is dead

Change-Id: Ie509bfae574ea9e1c20e0f700127f1c4251efe28
---
M modules/ganglia/manifests/configuration.pp
M modules/ganglia/templates/deprecated/gmetad.conf.erb
M modules/role/manifests/ganglia/web.pp
3 files changed, 2 insertions(+), 7 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/ganglia/manifests/configuration.pp 
b/modules/ganglia/manifests/configuration.pp
index 5c914f2..721548e 100644
--- a/modules/ganglia/manifests/configuration.pp
+++ b/modules/ganglia/manifests/configuration.pp
@@ -4,11 +4,7 @@
     $clusters = hiera('ganglia_clusters')
 
     $url = 'http://ganglia.wikimedia.org'
-    # 208.80.154.14 is neon (icinga).
-    # It is not actually a gmetad host, but it should
-    # be allowed to query gmond instances for use by
-    # neon/icinga.
-    $gmetad_hosts = [ '208.80.154.53', '208.80.154.14' ]
+    $gmetad_hosts = [ '208.80.154.53']
     $aggregator_hosts = {
         'eqiad' => [ ipresolve('carbon.wikimedia.org') ],
         'esams' => [ ipresolve('bast3001.wikimedia.org') ],
diff --git a/modules/ganglia/templates/deprecated/gmetad.conf.erb 
b/modules/ganglia/templates/deprecated/gmetad.conf.erb
index 9fc3bae..df6ba9d 100644
--- a/modules/ganglia/templates/deprecated/gmetad.conf.erb
+++ b/modules/ganglia/templates/deprecated/gmetad.conf.erb
@@ -97,7 +97,7 @@
 # is always trusted. 
 # default: There is no default value
 # trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org
-trusted_hosts 208.80.152.165 208.80.154.149 208.80.154.14 10.64.32.13 
#bastions, neon, terbium
+trusted_hosts 208.80.152.165 208.80.154.149 10.64.32.13 #bastions, terbium
 
#-------------------------------------------------------------------------------
 # If you want any host which connects to the gmetad XML to receive
 # data, then set this value to "on"
diff --git a/modules/role/manifests/ganglia/web.pp 
b/modules/role/manifests/ganglia/web.pp
index 7b09929..de99f86 100644
--- a/modules/role/manifests/ganglia/web.pp
+++ b/modules/role/manifests/ganglia/web.pp
@@ -34,7 +34,6 @@
         rrdcached_socket => $gmetad_socket,
         trusted_hosts    => [
                         '208.80.154.149', # bast1001
-                        '208.80.154.14', # neon
                         '10.64.32.13', # terbium
                         ],
         data_sources     => $role::ganglia::config::data_sources,

-- 
To view, visit https://gerrit.wikimedia.org/r/315254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie509bfae574ea9e1c20e0f700127f1c4251efe28
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to