Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397571 )
Change subject: Remove the Trending Edits service from production
......................................................................
Remove the Trending Edits service from production
Change-Id: I79b620fb437821a03361e637b489bd7f9f7dbb73
Depends-On: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be
Bug: T180384
---
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/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
M hieradata/role/common/restbase/dev_cluster.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/test_cluster.yaml
M hieradata/role/common/scb.yaml
M modules/admin/data/data.yaml
M modules/profile/manifests/restbase.pp
D modules/profile/manifests/trendingedits.pp
M modules/role/manifests/scb.pp
D modules/role/manifests/trendingedits.pp
17 files changed, 11 insertions(+), 108 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/397571/1
diff --git a/conftool-data/discovery/services.yaml
b/conftool-data/discovery/services.yaml
index 3628a24..886e45a 100644
--- a/conftool-data/discovery/services.yaml
+++ b/conftool-data/discovery/services.yaml
@@ -17,7 +17,6 @@
mobileapps: [eqiad, codfw]
ores: [eqiad, codfw]
pdfrender: [eqiad, codfw]
-trendingedits: [eqiad, codfw]
"recommendation-api": [eqiad, codfw]
wdqs: [eqiad, codfw]
zotero: [eqiad, codfw]
diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml
index 0469398..2a07250 100644
--- a/conftool-data/node/codfw.yaml
+++ b/conftool-data/node/codfw.yaml
@@ -281,12 +281,12 @@
sca2003.codfw.wmnet: [zotero]
sca2004.codfw.wmnet: [zotero]
scb:
- 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"]
+ scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb2005.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb2006.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "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 83e79e6..1fc4675 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -168,10 +168,10 @@
sca1003.eqiad.wmnet: [zotero]
sca1004.eqiad.wmnet: [zotero]
scb:
- 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"]
+ scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb1003.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "recommendation-api"]
+ scb1004.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender, "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 daa3d01..e9ab647 100644
--- a/conftool-data/service/services.yaml
+++ b/conftool-data/service/services.yaml
@@ -123,14 +123,6 @@
datacenters:
- eqiad
- codfw
- trendingedits:
- port: 6699
- default_values:
- pooled: 'no'
- weight: 10
- datacenters:
- - eqiad
- - codfw
"recommendation-api":
port: 9632
default_values:
diff --git a/hieradata/common/discovery.yaml b/hieradata/common/discovery.yaml
index 165d456..861e62a 100644
--- a/hieradata/common/discovery.yaml
+++ b/hieradata/common/discovery.yaml
@@ -82,9 +82,6 @@
pdfrender:
lvs: pdfrender
active_active: true
- trendingedits:
- lvs: trendingedits
- active_active: true
"recommendation-api":
lvs: "recommendation-api"
active_active: true
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 223a990..4317d87 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -122,9 +122,6 @@
pdfrender: &ip_block034
eqiad: 10.2.2.35
codfw: 10.2.1.35
- trendingedits: &ip_block035
- eqiad: 10.2.2.9
- codfw: 10.2.1.9
kubemaster: &ip_block036
eqiad: 10.2.2.8
codfw: 10.2.1.8
@@ -1107,32 +1104,6 @@
hostname: pdfrender.svc.eqiad.wmnet
codfw:
hostname: pdfrender.svc.codfw.wmnet
- trendingedits:
- description: "Trending edits service. trendingedits.svc.%{::site}.wmnet"
- class: low-traffic
- sites:
- - eqiad
- - codfw
- ip: *ip_block035
- port: 6699
- depool-threshold: '.5'
- monitors:
- ProxyFetch:
- url:
- - http://localhost/_info
- IdleConnection:
- timeout-clean-reconnect: 3
- max-delay: 300
- conftool:
- cluster: scb
- service: trendingedits
- icinga:
- check_command:
"check_http_lvs_on_port!trendingedits.svc.%{::site}.wmnet!6699!/_info"
- sites:
- eqiad:
- hostname: trendingedits.svc.eqiad.wmnet
- codfw:
- hostname: trendingedits.svc.codfw.wmnet
kubemaster:
description: "Kubernetes master service. kubemaster.svc.%{::site}.wmnet"
class: low-traffic
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 3c3fbe2..f2c54ce 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -108,7 +108,6 @@
profile::restbase::eventlogging_service_uri:
http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events
profile::restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
profile::restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
-profile::restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
profile::restbase::cxserver_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080
profile::restbase::recommendation_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:9632
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index 490d237..e57c356 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -145,7 +145,6 @@
tilerator/deploy:
repository: maps/tilerator/deploy
# lvs_service: tilerator
- trending-edits/deploy: {}
# Wikimania scholarships app
scholarships/scholarships:
repository: wikimedia/wikimania-scholarships
diff --git a/hieradata/role/common/restbase/dev_cluster.yaml
b/hieradata/role/common/restbase/dev_cluster.yaml
index 6e3476d..213d39b 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -18,7 +18,6 @@
profile::restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
profile::restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
profile::restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
-profile::restbase::trendingedits_uri:
"http://trendingedits.svc.%{::site}.wmnet:6699";
profile::restbase::eventlogging_service_uri:
"http://eventbus.discovery.wmnet:8085/v1/events";
profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080";
profile::restbase::recommendation_uri:
"http://recommendation-api.discovery.wmnet:9632";
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index 6353dea..8886336 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -15,7 +15,6 @@
profile::restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
profile::restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
profile::restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
-profile::restbase::trendingedits_uri:
"http://trendingedits.svc.%{::site}.wmnet:6699";
profile::restbase::eventlogging_service_uri:
"http://eventbus.discovery.wmnet:8085/v1/events";
profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080";
profile::restbase::recommendation_uri:
"http://recommendation-api.discovery.wmnet:9632";
diff --git a/hieradata/role/common/restbase/test_cluster.yaml
b/hieradata/role/common/restbase/test_cluster.yaml
index 47a2779..a4c7ec2 100644
--- a/hieradata/role/common/restbase/test_cluster.yaml
+++ b/hieradata/role/common/restbase/test_cluster.yaml
@@ -12,7 +12,6 @@
profile::restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
profile::restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
profile::restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
-profile::restbase::trendingedits_uri:
"http://trendingedits.svc.%{::site}.wmnet:6699";
profile::restbase::eventlogging_service_uri:
"http://eventbus.discovery.wmnet:8085/v1/events";
profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080";
profile::restbase::recommendation_uri:
"http://recommendation-api.discovery.wmnet:9632";
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index 722d217..798d40a 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -14,7 +14,6 @@
- changeprop-admin
- ores-admin
- pdfrender-admin
- - trendingedits-admin
- recommendation-admin
role::lvs::realserver::pools:
ores: {}
@@ -26,7 +25,6 @@
mathoid: {}
eventstreams: {}
pdfrender: {}
- trendingedits: {}
"recommendation-api": {}
### BEGIN GRAPHOID
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ca88681..093ff92 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -545,7 +545,6 @@
'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=*']
notebook-roots:
@@ -601,12 +600,6 @@
members: [ppchelko, eevans, mobrovac, tgr]
privileges: ['ALL = NOPASSWD: /usr/sbin/service pdfrender *',
'ALL = (pdfrender) NOPASSWD: ALL']
- trendingedits-admin:
- description: Group of trendingedits admins
- gid: 791
- members: [ppchelko, eevans, mobrovac, jdlrobson, bsitzmann]
- privileges: ['ALL = NOPASSWD: /usr/sbin/service trendingedits *',
- 'ALL = (trendingedits) NOPASSWD: ALL']
wmcs-roots:
description: root for cloud services infrastructure
gid: 792
diff --git a/modules/profile/manifests/restbase.pp
b/modules/profile/manifests/restbase.pp
index 37d4a38..6aeba70 100644
--- a/modules/profile/manifests/restbase.pp
+++ b/modules/profile/manifests/restbase.pp
@@ -60,10 +60,6 @@
# [*citoid_uri*]
# Citoid service URI. Format: http://citoid.svc.eqiad.wmnet:1970
#
-# [*trendingedits_uri*]
-# Trending edits service URI. Format:
-# http://trendingedits.svc.eqiad.wmnet:6699
-#
# [*cxserver_uri*]
# CXServer service uri. Format: http://cxserver.discovery.wmnet:8080
#
@@ -91,7 +87,6 @@
$eventlogging_service_uri =
hiera('profile::restbase::eventlogging_service_uri'),
$pdfrender_uri = hiera('profile::restbase::pdfrender_uri'),
$citoid_uri = hiera('profile::restbase::citoid_uri'),
- $trendingedits_uri = hiera('profile::restbase::trendingedits_uri'),
$cxserver_uri = hiera('profile::restbase::cxserver_uri'),
$recommendation_uri = hiera('profile::restbase::recommendation_uri'),
$monitor_domain = hiera('profile::restbase::monitor_domain'),
@@ -131,7 +126,6 @@
eventlogging_service_uri => $eventlogging_service_uri,
pdfrender_uri => $pdfrender_uri,
pdfrender_key => $pdfrender_key,
- trendingedits_uri => $trendingedits_uri,
cxserver_uri => $cxserver_uri,
recommendation_uri => $recommendation_uri,
aqs_uri => $aqs_uri,
diff --git a/modules/profile/manifests/trendingedits.pp
b/modules/profile/manifests/trendingedits.pp
deleted file mode 100644
index ca57360..0000000
--- a/modules/profile/manifests/trendingedits.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Profile class for trendingedits
-class profile::trendingedits {
-
- $kafka_config = kafka_config('main')
- $port = 6699
-
- service::packages { 'trendingedits':
- pkgs => ['librdkafka++1', 'librdkafka1'],
- dev_pkgs => ['librdkafka-dev'],
- }
-
- service::node { 'trendingedits':
- port => $port,
- repo => 'trending-edits/deploy',
- healthcheck_url => '',
- has_spec => true,
- deployment => 'scap3',
- deployment_config => true,
- deployment_vars => {
- broker_list => $kafka_config['brokers']['string'],
- site => $::site,
- },
- environment => {
- 'UV_THREADPOOL_SIZE' => 16
- },
- }
-}
diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp
index 8309a1c..92c8d95 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -5,7 +5,7 @@
$services = [
'ORES', 'changeprop', 'citoid', 'cpjobqueue', 'cxserver',
'eventstreams', 'graphoid', 'mathoid', 'mobileapps',
- 'pdfrender', 'trendingedits',
+ 'pdfrender',
]
$msg_services = join($services, "\n\t")
@@ -34,5 +34,4 @@
include ::profile::apertium
include ::profile::eventstreams
include ::profile::pdfrender
- include ::profile::trendingedits
}
diff --git a/modules/role/manifests/trendingedits.pp
b/modules/role/manifests/trendingedits.pp
deleted file mode 100644
index 90a1205..0000000
--- a/modules/role/manifests/trendingedits.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Role class for trendingedits
-class role::trendingedits {
- system::role { 'trendingedits':
- description => 'computes the list of currently-trending articles',
- }
-
- include ::profile::trendingedits
-}
--
To view, visit https://gerrit.wikimedia.org/r/397571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79b620fb437821a03361e637b489bd7f9f7dbb73
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
