Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364806 )
Change subject: Move more stuff into profile::statistics::private
......................................................................
Move more stuff into profile::statistics::private
Bug: T152712
Change-Id: I1fb259a1a5ab1618349944b68186c8965396cf10
---
M manifests/site.pp
M modules/profile/manifests/statistics/private.pp
2 files changed, 21 insertions(+), 24 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index c8fe6c4..9ac72e9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2076,16 +2076,12 @@
role(failoid)
}
+# 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.
node 'stat1002.eqiad.wmnet' {
- # stat1002 is intended to be the private
- # webrequest access log storage host.
- # Users should not use it for app development.
- # Data processing on this machine is fine.
-
- # Include classes needed for storing and crunching
- # private data on stat1002.
role(statistics::private,
- # stat1002 is also a Hadoop client, and should
+ # This is also a Hadoop client, and should
# have any special analytics system users on it
# for interacting with HDFS.
analytics_cluster::users,
@@ -2097,9 +2093,11 @@
# Include analytics/refinery deployment target.
analytics_cluster::refinery,
+
# Include analytics/refinery checks that send email about
# webrequest partitions faultyness.
analytics_cluster::refinery::job::data_check,
+
# Include analytics/refinery/source guard checks
# Disabled due to T166937
# analytics_cluster::refinery::job::guard,
@@ -2110,22 +2108,8 @@
# Deploy wikimedia/discovery/analytics repository
# to this node.
- elasticsearch::analytics)
-
- include ::standard
-
- # Include the MySQL research password at
- # /etc/mysql/conf.d/analytics-research-client.cnf
- # and only readable by users in the
- # analytics-privatedata-users group.
- statistics::mysql_credentials { 'analytics-research':
- group => 'analytics-privatedata-users',
- }
-
- # The eventlogging code is useful for scripting
- # EventLogging consumers. Install this on
- # stat1002, but don't run any daemons.
- include ::eventlogging
+ elasticsearch::analytics
+ )
}
# 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 401a736..3530960 100644
--- a/modules/profile/manifests/statistics/private.pp
+++ b/modules/profile/manifests/statistics/private.pp
@@ -28,6 +28,14 @@
group => 'statistics-privatedata-users',
}
+ # Include the MySQL research password at
+ # /etc/mysql/conf.d/analytics-research-client.cnf
+ # and only readable by users in the
+ # analytics-privatedata-users group.
+ statistics::mysql_credentials { 'analytics-research':
+ group => 'analytics-privatedata-users',
+ }
+
# eventlogging logs are not private, but they
# are here for convenience
include ::statistics::rsync::eventlogging
@@ -50,4 +58,9 @@
# 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
+
+ # The eventlogging code is useful for scripting
+ # EventLogging consumers. Install this,
+ # but don't run any daemons.
+ include ::eventlogging
}
--
To view, visit https://gerrit.wikimedia.org/r/364806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fb259a1a5ab1618349944b68186c8965396cf10
Gerrit-PatchSet: 4
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
