Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/136830
Change subject: Move Apache gmond module to ::apache::monitoring
......................................................................
Move Apache gmond module to ::apache::monitoring
Change-Id: I0a82975dc30fc3709adc5a75049490574a8938a1
---
M manifests/role/mediawiki.pp
R modules/apache/files/apache_status.py
R modules/apache/files/apache_status.pyconf
A modules/apache/manifests/monitoring.pp
M modules/protoproxy/manifests/ganglia.pp
5 files changed, 24 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/136830/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index a159b67..27ff1d9 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -64,6 +64,7 @@
# This class installs everything necessary for an apache webserver
class role::mediawiki::webserver($maxclients="40") {
include ::mediawiki
+ include ::apache::monitoring
include role::mediawiki::common
class { '::mediawiki::web':
@@ -82,22 +83,6 @@
}
}
- ## ganglia module for apache webservers
- file { '/usr/lib/ganglia/python_modules/apache_status.py':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/ganglia/plugins/apache_status.py',
- notify => Service['gmond'],
- }
-
- file { '/etc/ganglia/conf.d/apache_status.pyconf':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/ganglia/plugins/apache_status.pyconf',
- notify => Service['gmond'],
- }
}
## prod role classes
diff --git a/files/ganglia/plugins/apache_status.py
b/modules/apache/files/apache_status.py
similarity index 100%
rename from files/ganglia/plugins/apache_status.py
rename to modules/apache/files/apache_status.py
diff --git a/files/ganglia/plugins/apache_status.pyconf
b/modules/apache/files/apache_status.pyconf
similarity index 100%
rename from files/ganglia/plugins/apache_status.pyconf
rename to modules/apache/files/apache_status.pyconf
diff --git a/modules/apache/manifests/monitoring.pp
b/modules/apache/manifests/monitoring.pp
new file mode 100644
index 0000000..2f495ae
--- /dev/null
+++ b/modules/apache/manifests/monitoring.pp
@@ -0,0 +1,22 @@
+# == Class: apache::monitoring
+#
+# Provisions a Ganglia metric module for monitoring Apache.
+#
+class apache::monitoring {
+ file { '/usr/lib/ganglia/python_modules/apache_status.py':
+ source => 'puppet:///modules/apache/apache_status.py',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['ganglia-monitor'],
+ }
+
+ file { '/etc/ganglia/conf.d/apache_status.pyconf':
+ source => 'puppet:///modules/apache/apache_status.pyconf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => File['/usr/lib/ganglia/python_modules/apache_status.py'],
+ notify => Service['gmond'],
+ }
+}
diff --git a/modules/protoproxy/manifests/ganglia.pp
b/modules/protoproxy/manifests/ganglia.pp
index d33ea4c..a462517 100644
--- a/modules/protoproxy/manifests/ganglia.pp
+++ b/modules/protoproxy/manifests/ganglia.pp
@@ -2,15 +2,7 @@
# Ganglia monitoring
class protoproxy::ganglia {
-
- 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'];
- }
+ include ::apache::monitoring
# Dummy site to provide a status to Ganglia
nginx::site { 'localhost':
--
To view, visit https://gerrit.wikimedia.org/r/136830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a82975dc30fc3709adc5a75049490574a8938a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
