Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345578 )
Change subject: Remove unused statistics::rsync::webrequest class from
statistics::private
......................................................................
Remove unused statistics::rsync::webrequest class from statistics::private
Change-Id: I437fadf6d79c1d83dfafb1d84432ca80a272711c
---
M modules/role/manifests/statistics/private.pp
D modules/statistics/manifests/rsync/webrequest.pp
2 files changed, 0 insertions(+), 53 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/statistics/private.pp
b/modules/role/manifests/statistics/private.pp
index fbdcf50..e454868 100644
--- a/modules/role/manifests/statistics/private.pp
+++ b/modules/role/manifests/statistics/private.pp
@@ -10,9 +10,6 @@
# include stuff common to statistics compute nodes
include ::statistics::compute
- # rsync webrequest logs from logging hosts
- include ::statistics::rsync::webrequest
-
# rsync mediawiki logs from logging hosts
include ::statistics::rsync::mediawiki
diff --git a/modules/statistics/manifests/rsync/webrequest.pp
b/modules/statistics/manifests/rsync/webrequest.pp
deleted file mode 100644
index c9d2f83..0000000
--- a/modules/statistics/manifests/rsync/webrequest.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# == Class statistics::rsync::webrequest
-#
-# Sets up daily cron jobs to rsync log files from remote
-# logging hosts to a local destination for further processing.
-#
-class statistics::rsync::webrequest {
- Class['::statistics'] -> Class['::statistics::rsync::webrequest']
- $working_path = $::statistics::working_path
-
- # Make sure destination directories exist.
- # Too bad I can't do this with recurse => true.
- # See: https://projects.puppetlabs.com/issues/86
- # for a much too long discussion on why I can't.
- file { [
- "${working_path}/aft",
- "${working_path}/aft/archive",
- "${working_path}/public-datasets",
- ]:
- ensure => 'directory',
- owner => 'stats',
- group => 'wikidev',
- mode => '0775',
- }
-
- # Make sure destination directories exist.
- # Too bad I can't do this with recurse => true.
- # See: https://projects.puppetlabs.com/issues/86
- # for a much too long discussion on why I can't.
- file { [
- "${working_path}/squid",
- "${working_path}/squid/archive",
- # Moving away from "squid" nonmenclature for
- # webrequest logs. New generated log
- # files will be rsynced into /a/log.
- "${working_path}/log",
- "${working_path}/log/webrequest",
- ]:
- ensure => directory,
- owner => 'stats',
- group => 'wikidev',
- mode => '0755',
- }
-
- # all webrequest archive logs from hdfs
- statistics::rsync_job { 'hdfs_webrequest_archive':
- source => 'stat1002.eqiad.wmnet::hdfs-archive/webrequest/*',
- destination => "${working_path}/log/webrequest/archive",
- retention_days => 90, # Pruning after 90 days as those logs contain
private data.
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/345578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I437fadf6d79c1d83dfafb1d84432ca80a272711c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
