Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326528 )
Change subject: Trending Edits: LVS configuration
......................................................................
Trending Edits: LVS configuration
Bug: T150043
Change-Id: If9bc7ec2fbba271234d91bcaccd933629d3fd60d
---
M conftool-data/nodes/codfw.yaml
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/role/common/scb.yaml
M modules/role/manifests/lvs/balancer.pp
6 files changed, 49 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/326528/1
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 57fe66d..321738b 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -257,10 +257,10 @@
sca2003.codfw.wmnet: [zotero]
sca2004.codfw.wmnet: [zotero]
scb:
- scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
+ 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]
eventbus:
kafka2001.codfw.wmnet: [eventbus]
kafka2002.codfw.wmnet: [eventbus]
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index f1a6669..94889fe 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -200,10 +200,10 @@
sca1003.eqiad.wmnet: [zotero]
sca1004.eqiad.wmnet: [zotero]
scb:
- scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb1003.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
- scb1004.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium,
cxserver, ores, eventstreams, pdfrender]
+ 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]
dns:
chromium.wikimedia.org: [pdns_recursor]
hydrogen.wikimedia.org: [pdns_recursor]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 0fca36d..d3a8f2b 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -123,6 +123,14 @@
datacenters:
- eqiad
- codfw
+ trendingedits:
+ port: 6699
+ default_values:
+ pooled: 'no'
+ weight: 10
+ datacenters:
+ - eqiad
+ - codfw
restbase:
restbase:
port: 7231
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 8c07642..453e69e 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -137,6 +137,9 @@
pdfrender: &ip_block034
eqiad: 10.2.2.35
codfw: 10.2.1.35
+ trendingedits: &ip_block035
+ eqiad: 10.2.2.36
+ codfw: 10.2.1.36
lvs::configuration::lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -1102,3 +1105,30 @@
hostname: pdfrender.svc.eqiad.wmnet
codfw:
hostname: pdfrender.svc.codfw.wmnet
+ trendingedits:
+ description: Trending edits service
+ class: low-traffic
+ sites:
+ - eqiad
+ - codfw
+ ip: *ip_block035
+ port: 6699
+ bgp: 'yes'
+ depool-threshold: '.5'
+ monitors:
+ ProxyFetch:
+ url:
+ - http://localhost/
+ 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!/"
+ sites:
+ eqiad:
+ hostname: trendingedits.svc.eqiad.wmnet
+ codfw:
+ hostname: trendingedits.svc.codfw.wmnet
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index e36528d..07ee500 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -21,6 +21,7 @@
mathoid: {}
eventstreams: {}
pdfrender: {}
+ trendingedits: {}
graphoid::allowed_domains:
https:
- mediawiki.org
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index c142d31..35c52d4 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -48,6 +48,7 @@
$sip['kibana'][$::site],
$sip['eventstreams'][$::site],
$sip['pdfrender'][$::site],
+ $sip['trendingedits'][$::site],
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
@@ -83,6 +84,7 @@
$sip['wdqs'][$::site],
$sip['eventstreams'][$::site],
$sip['pdfrender'][$::site],
+ $sip['trendingedits'][$::site],
],
# esams + ulsfo
--
To view, visit https://gerrit.wikimedia.org/r/326528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9bc7ec2fbba271234d91bcaccd933629d3fd60d
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
