Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337002 )
Change subject: varnish: remove varnish::monitoring::ganglia
......................................................................
varnish: remove varnish::monitoring::ganglia
Change-Id: I73e02b4ebeba7be93b10dfdce3c76b02ac9de3ab
---
M modules/role/manifests/cache/base.pp
M modules/varnish/files/varnish-backend-restart
M modules/varnish/files/varnish-frontend-restart
M modules/varnish/manifests/common.pp
D modules/varnish/manifests/monitoring/ganglia.pp
5 files changed, 3 insertions(+), 30 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index 2417bcc..1e0fc2d 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -19,13 +19,6 @@
description => "${cache_cluster} Varnish cache server",
}
- # Ganglia monitoring
- if $::standard::has_ganglia {
- class { 'varnish::monitoring::ganglia':
- varnish_instances => [ '', 'frontend' ],
- }
- }
-
# Only production needs system perf tweaks and NFS client disable
if $::realm == 'production' {
include role::cache::perf
diff --git a/modules/varnish/files/varnish-backend-restart
b/modules/varnish/files/varnish-backend-restart
index 32c1240..6276e38 100644
--- a/modules/varnish/files/varnish-backend-restart
+++ b/modules/varnish/files/varnish-backend-restart
@@ -19,9 +19,8 @@
sleep 10
-# Fix VSM files permissions and restart ganglia
+# Fix VSM files permissions
chmod 644 /var/lib/varnish/*/*.vsm
-/usr/sbin/service ganglia-monitor restart
sleep 5
diff --git a/modules/varnish/files/varnish-frontend-restart
b/modules/varnish/files/varnish-frontend-restart
index 92dd6d8..27cd2e1 100644
--- a/modules/varnish/files/varnish-frontend-restart
+++ b/modules/varnish/files/varnish-frontend-restart
@@ -16,9 +16,8 @@
sleep 5
-# Fix VSM files permissions and restart ganglia
+# Fix VSM files permissions
chmod 644 /var/lib/varnish/*/*.vsm
-/usr/sbin/service ganglia-monitor restart
sleep 5
diff --git a/modules/varnish/manifests/common.pp
b/modules/varnish/manifests/common.pp
index 2ff6987..620484b 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -1,7 +1,7 @@
class varnish::common {
require ::varnish::packages
- # Mount /var/lib/ganglia as tmpfs to avoid Linux flushing mlocked
+ # Mount /var/lib/varnish as tmpfs to avoid Linux flushing mlocked
# shm memory to disk
mount { '/var/lib/varnish':
ensure => mounted,
diff --git a/modules/varnish/manifests/monitoring/ganglia.pp
b/modules/varnish/manifests/monitoring/ganglia.pp
deleted file mode 100644
index 0b06546..0000000
--- a/modules/varnish/manifests/monitoring/ganglia.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class varnish::monitoring::ganglia($varnish_instances=['']) {
- file { '/usr/lib/ganglia/python_modules/varnish.py':
- ensure => absent,
- }
-
- file { '/etc/ganglia/conf.d/varnish.pyconf':
- ensure => absent,
- notify => Service['ganglia-monitor'],
- }
-
- file { '/usr/local/sbin/check-gmond-restart':
- ensure => absent,
- }
-
- file { '/etc/cron.d/check-gmond-restart':
- ensure => absent,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/337002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73e02b4ebeba7be93b10dfdce3c76b02ac9de3ab
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
