Ottomata has submitted this change and it was merged.
Change subject: including misc::statistics::wikistats in
role::statistics::private.
......................................................................
including misc::statistics::wikistats in role::statistics::private.
Change-Id: I0c0057e829c35fe4d13c09808f9bad6c3495a44c
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
2 files changed, 22 insertions(+), 15 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 68bc50b..e3f8b8f 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -98,17 +98,6 @@
include misc::statistics::packages::python
}
-# packages needed for wikistats (stats.wikimedia.org generation code)
-class misc::statistics::packages::wikistats {
- package { [
- 'libjson-xs-perl',
- 'libtemplate-perl',
- 'libnet-patricia-perl',
- 'libregexp-assemble-perl',
- ]:
- ensure => 'installed',
- }
-}
# Packages needed for various python stuffs
# on statistics servers.
@@ -146,6 +135,7 @@
}
}
+
# clones mediawiki core at /a/mediawiki/core
# and ensures that it is at the latest revision.
# RT 2162
@@ -163,6 +153,22 @@
}
}
+# wikistats configuration for generating
+# stat.wikimedia.org data.
+#
+# TODO: puppetize clone of wikistats?
+class misc::statistics::wikistats {
+ # Perl packages needed for wikistats
+ package { [
+ 'libjson-xs-perl',
+ 'libtemplate-perl',
+ 'libnet-patricia-perl',
+ 'libregexp-assemble-perl',
+ ]:
+ ensure => 'installed',
+ }
+}
+
# RT-2163
class misc::statistics::plotting {
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 7c79ebb..f4e70b3 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -25,9 +25,7 @@
# generate gerrit stats from stat1.
misc::statistics::gerrit_stats,
# rsync logs from logging hosts over to stat1
- misc::statistics::rsync::jobs,
- # packages needed for wikistats stats generation
- misc::statistics::packages::wikistats
+ misc::statistics::rsync::jobs
}
class role::statistics::www inherits role::statistics {
@@ -58,5 +56,8 @@
generic::pythonpip,
misc::udp2log::udp_filter,
# rsync logs from logging hosts
- misc::statistics::rsync::jobs
+ misc::statistics::rsync::jobs,
+ # wikistats code is run here to
+ # generate stats.wikimedia.org data
+ misc::statistics::wikistats
}
--
To view, visit https://gerrit.wikimedia.org/r/72114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c0057e829c35fe4d13c09808f9bad6c3495a44c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
