Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392865 )
Change subject: Add statistics::explorer role to stat1004 to install R and
other packages
......................................................................
Add statistics::explorer role to stat1004 to install R and other packages
Bug: T181094
Change-Id: Iac141e8d52f3fd4f763189fc40a1c3acf390c38c
---
A hieradata/role/common/statistics/explorer.yaml
M manifests/site.pp
A modules/profile/manifests/statistics/explorer.pp
M modules/profile/manifests/statistics/private.pp
A modules/role/manifests/statistics/explorer.pp
5 files changed, 53 insertions(+), 10 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/statistics/explorer.yaml
b/hieradata/role/common/statistics/explorer.yaml
new file mode 100644
index 0000000..6688260
--- /dev/null
+++ b/hieradata/role/common/statistics/explorer.yaml
@@ -0,0 +1,12 @@
+admin::groups:
+ - analytics-users
+ - analytics-privatedata-users
+ - analytics-admins
+cluster: analytics
+profile::hadoop::client::zookeeper_cluster_name: 'main-eqiad'
+profile::hive::client::zookeeper_cluster_name: main-eqiad
+profile::hive::client::server_host: analytics1003.eqiad.wmnet
+profile::hive::client::server_port: 10000
+profile::hadoop::client::resourcemanager_hosts:
+ - analytics1001.eqiad.wmnet
+ - analytics1002.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index c947eec..550e5b3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2217,13 +2217,11 @@
role(failoid)
}
+# stat1004 contains all the tools and libraries to access
+# the Analytics Cluster services, but should not be used
+# for local data processing.
node 'stat1004.eqiad.wmnet' {
- # stat1004 contains all the tools and libraries to access
- # the Analytics Cluster services.
-
- role(analytics_cluster::client, analytics_cluster::refinery)
-
- include ::standard
+ role(statistics::explorer)
}
# WIP: stat1002 replacement (T152712)
diff --git a/modules/profile/manifests/statistics/explorer.pp
b/modules/profile/manifests/statistics/explorer.pp
new file mode 100644
index 0000000..567b340
--- /dev/null
+++ b/modules/profile/manifests/statistics/explorer.pp
@@ -0,0 +1,23 @@
+# == Class profile::statistics::explorer
+#
+class profile::statistics::explorer(
+ $statistics_servers = hiera('statistics_servers'),
+) {
+ class { '::standard': }
+ class { '::deployment::umask_wikidev': }
+
+ class { '::statistics':
+ servers => $statistics_servers,
+ }
+
+ # include stuff common to statistics compute nodes
+ class { '::statistics::compute': }
+
+ # 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',
+ }
+}
\ No newline at end of file
diff --git a/modules/profile/manifests/statistics/private.pp
b/modules/profile/manifests/statistics/private.pp
index 95cf404..cb03098 100644
--- a/modules/profile/manifests/statistics/private.pp
+++ b/modules/profile/manifests/statistics/private.pp
@@ -48,10 +48,6 @@
# rsync mediawiki logs from logging hosts
include ::statistics::rsync::mediawiki
- # Discovery statistics generating scripts
- # This needs work to move to stat1005: T170471
- # include ::statistics::discovery
-
# WMDE releated statistics & analytics scripts.
class { '::statistics::wmde':
statsd_host => $statsd_host,
diff --git a/modules/role/manifests/statistics/explorer.pp
b/modules/role/manifests/statistics/explorer.pp
new file mode 100644
index 0000000..b234b5e
--- /dev/null
+++ b/modules/role/manifests/statistics/explorer.pp
@@ -0,0 +1,14 @@
+# == Class role::statistics::explorer
+# (stat1004)
+# Access to analytics Hadoop cluster with private data.
+# Not to be used for heavy local processing.
+#
+class role::statistics::explorer {
+ system::role { 'statistics::explorer':
+ description => 'Statistics & Analytics cluster explorer (private data
access, no local compute)'
+ }
+
+ include ::profile::statistics::explorer
+ include ::role::analytics_cluster::client
+ include ::role::analytics_cluster::refinery
+}
--
To view, visit https://gerrit.wikimedia.org/r/392865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac141e8d52f3fd4f763189fc40a1c3acf390c38c
Gerrit-PatchSet: 11
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
