Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367457 )
Change subject: Remove statistics::private role from stat1002
......................................................................
Remove statistics::private role from stat1002
All should be migrated to stat1005 now. This will allow us to umount /a
Bug: T171373
Change-Id: Ib7e6eae3d2aca12011a56a4036b812edd8812845
---
M manifests/site.pp
M modules/profile/manifests/statistics/private.pp
M modules/role/manifests/statistics/private.pp
3 files changed, 11 insertions(+), 27 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 2438389..754d1bb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2091,8 +2091,9 @@
# stat1002 is intended to be the private data analytics compute node.
# Users should not use it for app development.
# Data processing on this machine is fine.
+# NOTE: This node is being deprecated and decomissioned as part of T152712.
node 'stat1002.eqiad.wmnet' {
- role(statistics::private,
+ role(
# This is also a Hadoop client, and should
# have any special analytics system users on it
# for interacting with HDFS.
@@ -2122,6 +2123,8 @@
# Deploy wikimedia/discovery/analytics repository
# to this node.
elasticsearch::analytics)
+
+ include ::standard
}
# stat1003 is a general purpose number cruncher for
diff --git a/modules/profile/manifests/statistics/private.pp
b/modules/profile/manifests/statistics/private.pp
index d1c4acd..555d234 100644
--- a/modules/profile/manifests/statistics/private.pp
+++ b/modules/profile/manifests/statistics/private.pp
@@ -46,26 +46,10 @@
# rsync mediawiki logs from logging hosts
include ::statistics::rsync::mediawiki
- # TODO: Piecemeal migrate cron jobs from stat1002 -> stat1005: T152712
- if $::hostname == 'stat1002' {
- # TODO remove this after stat1002 is gone: T152712
+ # Discovery statistics generating scripts
+ # This needs work to move to stat1005: T170471
+ # include ::statistics::discovery
- # backup eventlogging logs.
- backup::set { 'a-eventlogging' : }
-
- # TODO: Otto believes this data and job are no longer being used.
- # Let's not migrate it to stat1005 unless someone needs it.
- # Although it is in the "private" profile, the dataset actually isn't
- # private. We just keep it here to spare adding a separate role.
- include ::statistics::aggregator::projectview
-
- # Discovery statistics generating scripts
- include ::statistics::discovery
- }
-
- # Else moved to stat1005
- else {
- # WMDE statistics scripts and cron jobs
- include ::statistics::wmde
- }
+ # WMDE statistics scripts and cron jobs
+ include ::statistics::wmde
}
diff --git a/modules/role/manifests/statistics/private.pp
b/modules/role/manifests/statistics/private.pp
index 8463f69..0a01e82 100644
--- a/modules/role/manifests/statistics/private.pp
+++ b/modules/role/manifests/statistics/private.pp
@@ -6,9 +6,6 @@
include ::profile::statistics::private
- # will be removed as part of T152712
- if $::hostname != 'stat1002' {
- # Run Hadoop/Hive reportupdater jobs here.
- include ::profile::reportupdater::jobs::hadoop
- }
+ # Run Hadoop/Hive reportupdater jobs here.
+ include ::profile::reportupdater::jobs::hadoop
}
--
To view, visit https://gerrit.wikimedia.org/r/367457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7e6eae3d2aca12011a56a4036b812edd8812845
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
