Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368143 )
Change subject: role::statistics::web: fix geowiki rsync ...................................................................... role::statistics::web: fix geowiki rsync The analytics webserver (thorium) currently rsyncs data from stat1003 rather than stat1006 (old host vs replacement) causing stale data and cronspam. Refactored a bit a profile to follow the ops guidelines. Set the geowiki rsync host as hiera variable rather than hardcoding it to a class. Change-Id: I1a8a2ba71a55112a0c4655b76ab02a4c2687c1b6 --- M hieradata/role/common/statistics/web.yaml M modules/profile/manifests/statistics/web.pp M modules/statistics/manifests/sites/stats.pp 3 files changed, 21 insertions(+), 11 deletions(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/statistics/web.yaml b/hieradata/role/common/statistics/web.yaml index a247771..0c2bf86 100644 --- a/hieradata/role/common/statistics/web.yaml +++ b/hieradata/role/common/statistics/web.yaml @@ -5,3 +5,4 @@ debdeploy::grains: debdeploy-analytics-web: value: standard +profile::statistics::web::geowiki_host: 'stat1006.eqiad.wmnet' \ No newline at end of file diff --git a/modules/profile/manifests/statistics/web.pp b/modules/profile/manifests/statistics/web.pp index f17b4e2..888ad08 100644 --- a/modules/profile/manifests/statistics/web.pp +++ b/modules/profile/manifests/statistics/web.pp @@ -2,6 +2,7 @@ # class profile::statistics::web( $statistics_servers = hiera('statistics_servers'), + $geowiki_host = hiera('profile::statistics::web::geowiki_host'), ) { include ::standard include ::base::firewall @@ -13,18 +14,20 @@ } # include stuff common to statistics webserver nodes. - include ::statistics::web + class { '::statistics::web': } # # include statistics web sites - include ::statistics::sites::metrics - include ::statistics::sites::stats - include ::statistics::sites::analytics + class { '::statistics::sites::metrics': } + class { '::statistics::sites::stats': + geowiki_private_data_bare_host => $geowiki_host, + } + class { '::statistics::sites::analytics': } # Proxy to securely access Yarn (authentication via LDAP) - include ::statistics::sites::yarn + class { '::statistics::sites::yarn': } # Proxy to securely access Pivot (authentication via LDAP) - include ::statistics::sites::pivot + class { '::statistics::sites::pivot': } # Proxy to Hue (not authenticated via LDAP, delegated to app) - include ::statistics::sites::hue + class { '::statistics::sites::hue': } ferm::service {'statistics-web': proto => 'tcp', diff --git a/modules/statistics/manifests/sites/stats.pp b/modules/statistics/manifests/sites/stats.pp index 5c2780d..518e61b 100644 --- a/modules/statistics/manifests/sites/stats.pp +++ b/modules/statistics/manifests/sites/stats.pp @@ -1,10 +1,16 @@ # == Class statistics::sites::stats +# # stats.wikimedia.org -class statistics::sites::stats { +# +# === Parameters +# +# [*geowiki_private_data_bare_host*] +# Hostname used to rsync the geowiki private repository. +# +class statistics::sites::stats ( + $geowiki_private_data_bare_host, +) { require ::statistics::web - - # TODO: make this a hiera param. - $geowiki_private_data_bare_host = 'stat1003.eqiad.wmnet' class { '::geowiki': private_data_bare_host => $geowiki_private_data_bare_host -- To view, visit https://gerrit.wikimedia.org/r/368143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a8a2ba71a55112a0c4655b76ab02a4c2687c1b6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@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