Faidon has uploaded a new change for review. https://gerrit.wikimedia.org/r/66248
Change subject: Revert "Disable the gmond apache_status module on ceph hosts" ...................................................................... Revert "Disable the gmond apache_status module on ceph hosts" This reverts commit 6df245c031f5906ae8723755920e5087f2616219. Change-Id: I7919f8a20b49b3c25d5d4085ce3769649b40bbcb --- M manifests/ganglia.pp M manifests/role/ceph.pp 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/66248/1 diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index e840f8c..fdf553a 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -307,7 +307,7 @@ "Bits caches eqiad" => "arsenic.wikimedia.org niobium.wikimedia.org", "Upload caches eqiad" => "cp1021.eqiad.wmnet cp1022.eqiad.wmnet", "SSL cluster eqiad" => "ssl1001.wikimedia.org ssl1002.wikimedia.org", - "Ceph eqiad" => "ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet", + "Swift eqiad" => "ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet", "Text squids eqiad" => "cp1001.eqiad.wmnet cp1002.eqiad.wmnet", "Search eqiad" => "search1001.eqiad.wmnet search1002.eqiad.wmnet", "Decommissioned servers esams" => "knsq1.esams.wikimedia.org", diff --git a/manifests/role/ceph.pp b/manifests/role/ceph.pp index bae280e..74ca2a1 100644 --- a/manifests/role/ceph.pp +++ b/manifests/role/ceph.pp @@ -100,14 +100,14 @@ check_command => 'check_http_url!ms-fe.eqiad.wmnet!/monitoring/backend', } -# file { '/usr/lib/ganglia/python_modules/apache_status.py': -# source => 'puppet:///files/ganglia/plugins/apache_status.py', -# notify => Service['gmond'], -# } -# -# file { '/etc/ganglia/conf.d/apache_status.pyconf': -# source => 'puppet:///files/ganglia/plugins/apache_status.pyconf', -# notify => Service['gmond'], -# } + file { '/usr/lib/ganglia/python_modules/apache_status.py': + source => 'puppet:///files/ganglia/plugins/apache_status.py', + notify => Service['gmond'], + } + + file { '/etc/ganglia/conf.d/apache_status.pyconf': + source => 'puppet:///files/ganglia/plugins/apache_status.pyconf', + notify => Service['gmond'], + } } } -- To view, visit https://gerrit.wikimedia.org/r/66248 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7919f8a20b49b3c25d5d4085ce3769649b40bbcb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits