Ottomata has uploaded a new change for review. (
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, 50 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/364806/1
diff --git a/manifests/site.pp b/manifests/site.pp
index c8fe6c4..c058479 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2076,56 +2076,11 @@
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
- # have any special analytics system users on it
- # for interacting with HDFS.
- analytics_cluster::users,
-
- # Include Hadoop and other analytics cluster
- # clients so that analysts can access Hadoop
- # from here.
- analytics_cluster::client,
-
- # 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,
-
- # Set up a read only rsync module to allow access
- # to public data generated by the Analytics Cluster.
- analytics_cluster::rsyncd,
-
- # 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
+ role(statistics::private)
}
# 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..7889428 100644
--- a/modules/profile/manifests/statistics/private.pp
+++ b/modules/profile/manifests/statistics/private.pp
@@ -28,6 +28,15 @@
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 +59,41 @@
# 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
+
+
+ # TODO: These should move to a profile.
+
+ # stat1002 is also a Hadoop client, and should
+ # have any special analytics system users on it
+ # for interacting with HDFS.
+ include role::analytics_cluster::users
+
+ # Include Hadoop and other analytics cluster
+ # clients so that analysts can access Hadoop
+ # from here.
+ include role::analytics_cluster::client
+
+ # Include analytics/refinery deployment target.
+ include role::analytics_cluster::refinery
+
+ # Include analytics/refinery checks that send email about
+ # webrequest partitions faultyness.
+ include role::analytics_cluster::refinery::job::data_check
+
+ # Include analytics/refinery/source guard checks
+ # Disabled due to T166937
+ # analytics_cluster::refinery::job::guard,
+
+ # Set up a read only rsync module to allow access
+ # to public data generated by the Analytics Cluster.
+ include role::analytics_cluster::rsyncd,
+
+ # Deploy wikimedia/discovery/analytics repository
+ # to this node.
+ include role::elasticsearch::analytics
}
--
To view, visit https://gerrit.wikimedia.org/r/364806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fb259a1a5ab1618349944b68186c8965396cf10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
