Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369835 )
Change subject: webperf: Move statsv monitoring from 'webperf' to
'webperf::statsv'
......................................................................
webperf: Move statsv monitoring from 'webperf' to 'webperf::statsv'
The base class is just for the user/group/directory, it doesn't
make sense for a specific service's monitoring to be ensured for
any class (e.g. webperf::navtiming) that wants to run a webperf
process.
It all works out now because the three webperf services run on
the same node, but this may be changing.
Also makes some minor documentation fixes.
Bug: T158837
Change-Id: Icf006f551ac6ae398fb543dd9f50e25d495dec45
---
M modules/webperf/manifests/init.pp
M modules/webperf/manifests/navtiming.pp
M modules/webperf/manifests/statsv.pp
3 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/webperf/manifests/init.pp
b/modules/webperf/manifests/init.pp
index dfc5262..a6deb91 100644
--- a/modules/webperf/manifests/init.pp
+++ b/modules/webperf/manifests/init.pp
@@ -1,7 +1,7 @@
# == Class: webperf
#
-# This Puppet module provisions a set of client-side performance
-# monitoring scripts for Wikimedia sites.
+# This base class provides a user, group, and working directory for
+# webperf processes.
#
class webperf {
group { 'webperf':
@@ -19,10 +19,5 @@
file { '/srv/webperf':
ensure => directory,
- }
-
- nrpe::monitor_service { 'statsv':
- description => 'statsv process',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C python
-a statsv',
}
}
diff --git a/modules/webperf/manifests/navtiming.pp
b/modules/webperf/manifests/navtiming.pp
index 24a7036..02e4500 100644
--- a/modules/webperf/manifests/navtiming.pp
+++ b/modules/webperf/manifests/navtiming.pp
@@ -39,6 +39,7 @@
}
file { '/lib/systemd/system/navtiming.service':
+ # uses $endpoint, $eventlogging_path, $statsd_host, $statsd_port
content => template('webperf/navtiming.systemd.erb'),
notify => Service['navtiming'],
}
diff --git a/modules/webperf/manifests/statsv.pp
b/modules/webperf/manifests/statsv.pp
index 2ff2763..320c045 100644
--- a/modules/webperf/manifests/statsv.pp
+++ b/modules/webperf/manifests/statsv.pp
@@ -28,4 +28,9 @@
provider => 'systemd',
subscribe => File['/lib/systemd/system/statsv.service'],
}
+
+ nrpe::monitor_service { 'statsv':
+ description => 'statsv process',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C python
-a statsv',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/369835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf006f551ac6ae398fb543dd9f50e25d495dec45
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
