Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364451 )
Change subject: role::scb: add recommendation-api service ...................................................................... role::scb: add recommendation-api service Bug: T165760 Change-Id: I0a0126c97767264078c1b8bb5b5ea139cde56312 --- M conftool-data/discovery/services.yaml M conftool-data/node/codfw.yaml M conftool-data/node/eqiad.yaml M conftool-data/service/services.yaml M hieradata/common/discovery.yaml M hieradata/common/lvs/configuration.yaml M hieradata/role/common/scb.yaml M modules/admin/data/data.yaml M modules/role/manifests/scb.pp 9 files changed, 80 insertions(+), 23 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved Mobrovac: Looks good to me, but someone else must approve diff --git a/conftool-data/discovery/services.yaml b/conftool-data/discovery/services.yaml index 45a423e..3138fe5 100644 --- a/conftool-data/discovery/services.yaml +++ b/conftool-data/discovery/services.yaml @@ -19,5 +19,6 @@ ores: [eqiad, codfw] pdfrender: [eqiad, codfw] trendingedits: [eqiad, codfw] +recommendation: [eqiad, codfw] wdqs: [eqiad, codfw] zotero: [eqiad, codfw] diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml index ae13d6f..b36675d 100644 --- a/conftool-data/node/codfw.yaml +++ b/conftool-data/node/codfw.yaml @@ -278,12 +278,12 @@ sca2003.codfw.wmnet: [zotero] sca2004.codfw.wmnet: [zotero] scb: - scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb2005.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb2006.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] + scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb2005.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb2006.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] eventbus: kafka2001.codfw.wmnet: [eventbus] kafka2002.codfw.wmnet: [eventbus] diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml index 9501b29..c7f5b9a 100644 --- a/conftool-data/node/eqiad.yaml +++ b/conftool-data/node/eqiad.yaml @@ -160,10 +160,10 @@ sca1003.eqiad.wmnet: [zotero] sca1004.eqiad.wmnet: [zotero] scb: - scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb1003.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] - scb1004.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits] + scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb1003.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] + scb1004.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] dns: chromium.wikimedia.org: [pdns_recursor] hydrogen.wikimedia.org: [pdns_recursor] diff --git a/conftool-data/service/services.yaml b/conftool-data/service/services.yaml index 6d9abf9..1934178 100644 --- a/conftool-data/service/services.yaml +++ b/conftool-data/service/services.yaml @@ -139,6 +139,14 @@ datacenters: - eqiad - codfw + "recommendation-api": + port: 9632 + default_values: + pooled: 'no' + weight: 10 + datacenters: + - eqiad + - codfw restbase: restbase: port: 7231 diff --git a/hieradata/common/discovery.yaml b/hieradata/common/discovery.yaml index 3b6ee10..c0a14ca 100644 --- a/hieradata/common/discovery.yaml +++ b/hieradata/common/discovery.yaml @@ -82,6 +82,9 @@ trendingedits: lvs: trendingedits active_active: true + "recommendation-api": + lvs: "recommendation-api" + active_active: true wdqs: lvs: wdqs active_active: true diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index 8c42e61..54180f1 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -129,6 +129,9 @@ codfw: 10.2.1.8 logstash: &ip_block037 eqiad: 10.2.2.36 + "recommendation-api": &ip_block038 + eqiad: 10.2.2.37 + codfw: 10.2.1.37 lvs::configuration::lvs_services: text: @@ -1348,3 +1351,30 @@ conftool: cluster: logstash service: logstash-udp2log + "recommendation-api": + description: Service for recommendation API + class: low-traffic + sites: + - eqiad + - codfw + ip: *ip_block038 + port: 9632 + bgp: 'yes' + depool-threshold: '.5' + monitors: + ProxyFetch: + url: + - http://localhost/ + IdleConnection: + timeout-clean-reconnect: 3 + max-delay: 300 + conftool: + cluster: scb + service: recommendation-api + icinga: + check_command: "check_http_lvs_on_port!recommendation-api.svc.%{::site}.wmnet!5252!/" + sites: + eqiad: + hostname: recommendation-api.svc.eqiad.wmnet + codfw: + hostname: recommendation-api.svc.codfw.wmnet diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml index 6bd0949..3439121 100644 --- a/hieradata/role/common/scb.yaml +++ b/hieradata/role/common/scb.yaml @@ -1,18 +1,19 @@ cluster: scb admin::groups: -- sc-admins -- citoid-admin -- citoid-users -- cxserver-admin -- apertium-admins -- graphoid-admin -- mathoid-admin -- zotero-admin -- mobileapps-admin -- changeprop-admin -- ores-admin -- pdfrender-admin -- trendingedits-admin + - sc-admins + - citoid-admin + - citoid-users + - cxserver-admin + - apertium-admins + - graphoid-admin + - mathoid-admin + - zotero-admin + - mobileapps-admin + - changeprop-admin + - ores-admin + - pdfrender-admin + - trendingedits-admin + - recommendation-admin role::lvs::realserver::pools: ores: {} apertium: {} @@ -24,6 +25,7 @@ eventstreams: {} pdfrender: {} trendingedits: {} + "recommendation-api": {} graphoid::allowed_domains: https: - mediawiki.org @@ -84,3 +86,6 @@ changeprop::restbase_uri: http://restbase-async.discovery.wmnet:7231 profile::nutcracker::memcached_pools: {} profile::nutcracker::monitor_port: 0 # we have nothing exposed via tcp + +# Recommendation API +profile::recommendation_api::wdqs_uri: "http://wdqs.discovery.wmnet" diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 202c4d1..a7c2253 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -526,6 +526,8 @@ 'ALL = NOPASSWD: /usr/sbin/service mathoid *', 'ALL = NOPASSWD: /usr/sbin/service mobileapps *', 'ALL = NOPASSWD: /usr/sbin/service pdfrender *', + 'ALL = NOPASSWD: /usr/sbin/service recommendation_api *', + 'ALL = (recommendation_api) NOPASSWD: ALL' 'ALL = NOPASSWD: /usr/sbin/service trendingedits *', 'ALL = NOPASSWD: /usr/sbin/service zotero *', 'ALL = NOPASSWD: /usr/bin/firejail --join=*'] @@ -603,6 +605,12 @@ members: [bd808] privileges: ['ALL = (ALL) NOPASSWD: /usr/local/sbin/maintain-views', 'ALL = (ALL) NOPASSWD: /usr/local/sbin/maintain-meta_p'] + recommendation-admin: + description: Group of recommendation-api admins + gid: 794 + members: [gwicke, ppchelko, eevans, mobrovac] + privileges: ['ALL = NOPASSWD: /usr/sbin/service recommendation_api *', + 'ALL = (recommendation_api) NOPASSWD: ALL'] users: rush: diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp index 7c47484..1ae90c0 100644 --- a/modules/role/manifests/scb.pp +++ b/modules/role/manifests/scb.pp @@ -5,6 +5,8 @@ include ::profile::ores::web include ::profile::nutcracker + include ::profile::recommendation_api + include role::mobileapps include role::mathoid include role::graphoid -- To view, visit https://gerrit.wikimedia.org/r/364451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a0126c97767264078c1b8bb5b5ea139cde56312 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits