Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275774
Change subject: Setup LVS for changeprop service on scb cluster
......................................................................
Setup LVS for changeprop service on scb cluster
Change-Id: I85e74fa33e210f57992149e4318b0840f937c7e0
---
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/role/common/scb.yaml
3 files changed, 98 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/275774/1
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 5823c4e..9a40c17 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -99,6 +99,13 @@
weight: 10
datacenters:
- eqiad
+ changeprop:
+ datacenters:
+ - eqiad
+ default_values:
+ pooled: 'yes'
+ weight: 10
+ port: '7272'
restbase:
restbase:
port: 7231
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 394a9ca..a98a53b 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -50,19 +50,19 @@
ulsfo:
mapslb: 198.35.26.113
mapslb6: 2620:0:863:ed1a::2:d
- apaches: &ip_block007
+ apaches: &ip_block006
eqiad: 10.2.2.1
codfw: 10.2.1.1
- rendering: &ip_block008
+ rendering: &ip_block007
eqiad: 10.2.2.21
codfw: 10.2.1.21
- api: &ip_block009
+ api: &ip_block008
eqiad: 10.2.2.22
codfw: 10.2.1.22
- swift: &ip_block010
+ swift: &ip_block009
eqiad: 10.2.2.27
codfw: 10.2.1.27
- dns_rec: &ip_block005
+ dns_rec: &ip_block004
eqiad:
dns_rec: 208.80.154.239
dns_rec6: 2620:0:861:ed1a::3:fe
@@ -72,7 +72,7 @@
esams:
dns_rec: 91.198.174.216
dns_rec6: 2620:0:862:ed1a::3:fe
- misc_web: &ip_block006
+ misc_web: &ip_block005
codfw:
misc_weblb: 208.80.153.248
misc_weblb6: 2620:0:860:ed1a::3:d
@@ -85,45 +85,47 @@
ulsfo:
misc_weblb: 198.35.26.120
misc_weblb6: 2620:0:863:ed1a::3:d
- search: &ip_block013
+ search: &ip_block011
eqiad: 10.2.2.30
codfw: 10.2.1.30
- stream: &ip_block014
+ stream: &ip_block012
eqiad:
streamlb: 208.80.154.249
streamlb6: 2620:0:861:ed1a::3:15
- ocg: &ip_block015
+ ocg: &ip_block013
eqiad: 10.2.2.31
- parsoid: &ip_block011
+ parsoid: &ip_block010
eqiad: 10.2.2.28
- mathoid: &ip_block016
+ mathoid: &ip_block014
eqiad: 10.2.2.20
- citoid: &ip_block017
+ citoid: &ip_block015
eqiad: 10.2.2.19
- cxserver: &ip_block018
+ cxserver: &ip_block016
eqiad: 10.2.2.18
- graphoid: &ip_block019
+ graphoid: &ip_block017
eqiad: 10.2.2.15
- restbase: &ip_block020
+ restbase: &ip_block018
eqiad: 10.2.2.17
codfw: 10.2.1.17
- zotero: &ip_block021
+ zotero: &ip_block019
eqiad: 10.2.2.16
- kartotherian: &ip_block022
+ kartotherian: &ip_block020
codfw: 10.2.1.13
- mobileapps: &ip_block023
+ mobileapps: &ip_block021
eqiad: 10.2.2.14
- git-ssh: &ip_block024
+ git-ssh: &ip_block022
eqiad:
git-ssh4: 208.80.154.250
git-ssh6: 2620:0:861:ed1a::3:16
- aqs: &ip_block025
+ aqs: &ip_block023
eqiad: 10.2.2.12
- eventbus: &ip_block026
+ eventbus: &ip_block024
eqiad: 10.2.2.23
+ changeprop: &ip_block025
+ eqiad: 10.2.2.24
lvs_services:
text:
- description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
+ description: Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)
class: high-traffic1
sites:
- codfw
@@ -152,7 +154,7 @@
ulsfo:
hostname: text-lb.ulsfo.wikimedia.org
text-https:
- description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(nginx)"
+ description: Main wiki platform LVS service, text.%{::site}.wikimedia.org
(nginx)
class: high-traffic1
sites:
- codfw
@@ -175,7 +177,7 @@
timeout-clean-reconnect: 3
max-delay: 300
upload:
- description: "Images and other media, upload.%{::site}.wikimedia.org"
+ description: Images and other media, upload.%{::site}.wikimedia.org
class: high-traffic2
sites:
- codfw
@@ -204,7 +206,7 @@
ulsfo:
hostname: upload-lb.ulsfo.wikimedia.org
upload-https:
- description: "Images and other media, upload.%{::site}.wikimedia.org"
+ description: Images and other media, upload.%{::site}.wikimedia.org
class: high-traffic2
sites:
- codfw
@@ -227,7 +229,7 @@
cluster: cache_upload
service: nginx
maps:
- description: "Maps service maps-lb.%{::site}.wikimedia.org"
+ description: Maps service maps-lb.%{::site}.wikimedia.org
class: high-traffic2
sites:
- eqiad
@@ -242,7 +244,7 @@
cluster: cache_maps
service: varnish-fe
maps-https:
- description: "Maps service maps-lb.%{::site}.wikimedia.org"
+ description: Maps service maps-lb.%{::site}.wikimedia.org
class: high-traffic2
sites:
- eqiad
@@ -269,7 +271,7 @@
- codfw
- esams
protocol: udp
- ip: *ip_block005
+ ip: *ip_block004
port: 53
bgp: 'yes'
depool-threshold: '.5'
@@ -293,7 +295,7 @@
- codfw
- esams
protocol: tcp
- ip: *ip_block005
+ ip: *ip_block004
port: 53
bgp: 'no'
depool-threshold: '.5'
@@ -317,7 +319,7 @@
- eqiad
- esams
- ulsfo
- ip: *ip_block006
+ ip: *ip_block005
bgp: 'yes'
depool-threshold: '.5'
monitors:
@@ -346,7 +348,7 @@
- eqiad
- esams
- ulsfo
- ip: *ip_block006
+ ip: *ip_block005
port: 443
scheduler: sh
bgp: 'no'
@@ -359,12 +361,12 @@
cluster: cache_misc
service: nginx
apaches:
- description: "Main MediaWiki application server cluster,
appservers.svc.%{::site}.wmnet"
+ description: Main MediaWiki application server cluster,
appservers.svc.%{::site}.wmnet
class: low-traffic
sites:
- eqiad
- codfw
- ip: *ip_block007
+ ip: *ip_block006
bgp: 'yes'
depool-threshold: '.9'
monitors:
@@ -376,7 +378,7 @@
max-delay: 300
RunCommand:
command: /bin/sh
- arguments: "[ '/etc/pybal/runcommand/check-apache', server.host ]"
+ arguments: '[ ''/etc/pybal/runcommand/check-apache'', server.host ]'
interval: 60
timeout: 10
conftool:
@@ -388,12 +390,12 @@
eqiad:
hostname: appservers.svc.eqiad.wmnet
rendering:
- description: "MediaWiki thumbnail rendering cluster,
rendering.svc.%{::site}.wmnet"
+ description: MediaWiki thumbnail rendering cluster,
rendering.svc.%{::site}.wmnet
class: low-traffic
sites:
- eqiad
- codfw
- ip: *ip_block008
+ ip: *ip_block007
bgp: 'yes'
depool-threshold: '.74'
monitors:
@@ -405,7 +407,7 @@
max-delay: 300
RunCommand:
command: /bin/sh
- arguments: "[ '/etc/pybal/runcommand/check-apache', server.host ]"
+ arguments: '[ ''/etc/pybal/runcommand/check-apache'', server.host ]'
interval: 60
timeout: 10
conftool:
@@ -417,12 +419,12 @@
eqiad:
hostname: rendering.svc.eqiad.wmnet
api:
- description: "MediaWiki API cluster, api.svc.%{::site}.wmnet"
+ description: MediaWiki API cluster, api.svc.%{::site}.wmnet
class: low-traffic
sites:
- eqiad
- codfw
- ip: *ip_block009
+ ip: *ip_block008
bgp: 'yes'
depool-threshold: '.6'
monitors:
@@ -434,7 +436,7 @@
max-delay: 300
RunCommand:
command: /bin/sh
- arguments: "[ '/etc/pybal/runcommand/check-apache', server.host ]"
+ arguments: '[ ''/etc/pybal/runcommand/check-apache'', server.host ]'
interval: 60
timeout: 10
conftool:
@@ -451,7 +453,7 @@
sites:
- codfw
- eqiad
- ip: *ip_block010
+ ip: *ip_block009
bgp: 'yes'
depool-threshold: '.5'
monitors:
@@ -474,7 +476,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block011
+ ip: *ip_block010
port: 8000
bgp: 'yes'
depool-threshold: '.5'
@@ -500,7 +502,7 @@
sites:
- eqiad
- codfw
- ip: *ip_block013
+ ip: *ip_block011
port: 9200
bgp: 'yes'
depool-threshold: '.5'
@@ -526,7 +528,7 @@
class: high-traffic2
sites:
- eqiad
- ip: *ip_block014
+ ip: *ip_block012
port: 80
bgp: 'yes'
depool-threshold: '.5'
@@ -546,7 +548,7 @@
class: high-traffic2
sites:
- eqiad
- ip: *ip_block014
+ ip: *ip_block012
port: 443
bgp: 'no'
depool-threshold: '.5'
@@ -566,7 +568,7 @@
class: high-traffic2
sites:
- eqiad
- ip: *ip_block015
+ ip: *ip_block013
port: 8000
bgp: 'yes'
depool-threshold: '.5'
@@ -590,7 +592,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block016
+ ip: *ip_block014
port: 10042
bgp: 'yes'
depool-threshold: '.5'
@@ -614,7 +616,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block017
+ ip: *ip_block015
port: 1970
bgp: 'yes'
depool-threshold: '.5'
@@ -639,7 +641,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block018
+ ip: *ip_block016
port: 8080
bgp: 'yes'
depool-threshold: '.5'
@@ -663,7 +665,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block019
+ ip: *ip_block017
port: 19000
bgp: 'yes'
depool-threshold: '.5'
@@ -684,19 +686,19 @@
eqiad:
hostname: graphoid.svc.eqiad.wmnet
restbase:
- description: "RESTBase, restbase.svc.%{::site}.wmnet"
+ description: RESTBase, restbase.svc.%{::site}.wmnet
class: low-traffic
sites:
- eqiad
- codfw
- ip: *ip_block020
+ ip: *ip_block018
port: 7231
bgp: 'yes'
depool-threshold: '.5'
monitors:
ProxyFetch:
url:
- - "http://restbase.svc.%{::site}.wmnet";
+ - http://restbase.svc.%{::site}.wmnet
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -704,7 +706,7 @@
cluster: restbase
service: restbase
icinga:
- check_command:
"check_http_lvs_on_port!restbase.svc.%{::site}.wmnet!7231!/"
+ check_command: check_http_lvs_on_port!restbase.svc.%{::site}.wmnet!7231!/
sites:
eqiad:
hostname: restbase.svc.eqiad.wmnet
@@ -715,7 +717,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block021
+ ip: *ip_block019
port: 1969
bgp: 'yes'
depool-threshold: '.5'
@@ -736,7 +738,7 @@
class: low-traffic
sites:
- codfw
- ip: *ip_block022
+ ip: *ip_block020
port: 6533
bgp: 'yes'
depool-threshold: '.5'
@@ -748,11 +750,12 @@
cluster: maps
service: kartotherian
mobileapps:
- description: A service for use by mobile apps. Provides DOM manipulation,
aggregation, JSON flattening
+ description: A service for use by mobile apps. Provides DOM manipulation,
aggregation,
+ JSON flattening
class: low-traffic
sites:
- eqiad
- ip: *ip_block023
+ ip: *ip_block021
port: 8888
bgp: 'yes'
depool-threshold: '.5'
@@ -773,7 +776,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block024
+ ip: *ip_block022
port: 22
bgp: 'yes'
depool-threshold: '.6'
@@ -785,18 +788,18 @@
cluster: phabricator
service: git-ssh
aqs:
- description: "Analytics Query Service, aqs.svc.%{::site}.wmnet"
+ description: Analytics Query Service, aqs.svc.%{::site}.wmnet
class: low-traffic
sites:
- eqiad
- ip: *ip_block025
+ ip: *ip_block023
port: 7232
bgp: 'yes'
depool-threshold: '.5'
monitors:
ProxyFetch:
url:
- - "http://aqs.svc.%{::site}.wmnet";
+ - http://aqs.svc.%{::site}.wmnet
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -804,7 +807,7 @@
cluster: aqs
service: aqs
icinga:
- check_command: "check_http_lvs_on_port!aqs.svc.%{::site}.wmnet!7232!/"
+ check_command: check_http_lvs_on_port!aqs.svc.%{::site}.wmnet!7232!/
sites:
eqiad:
hostname: aqs.svc.eqiad.wmnet
@@ -813,7 +816,7 @@
class: low-traffic
sites:
- eqiad
- ip: *ip_block026
+ ip: *ip_block024
port: 8085
bgp: 'yes'
depool-threshold: '.5'
@@ -821,14 +824,35 @@
cluster: eventbus
service: eventbus
icinga:
- check_command:
"check_http_lvs_on_port!eventbus.svc.eqiad.wmnet!8085!/v1/topics"
+ check_command:
check_http_lvs_on_port!eventbus.svc.eqiad.wmnet!8085!/v1/topics
sites:
eqiad:
hostname: eventbus.svc.eqiad.wmnet
monitors:
ProxyFetch:
url:
- - "http://eventbus.svc.%{::site}.wmnet/v1/topics";
+ - http://eventbus.svc.%{::site}.wmnet/v1/topics
IdleConnection:
max-delay: 300
timeout-clean-reconnect: 3
+ changeprop:
+ bgp: 'yes'
+ class: low-traffic
+ conftool:
+ cluster: scb
+ service: changeprop
+ depool-threshold: '.5'
+ description: propagates events from the EventBus
+ icinga:
+ check_command:
check_http_lvs_on_port!changeprop.svc.eqiad.wmnet!7272!/_info
+ sites:
+ eqiad:
+ hostname: changeprop.svc.eqiad.wmnet
+ ip: *ip_block025
+ monitors:
+ IdleConnection:
+ max-delay: 300
+ timeout-clean-reconnect: 3
+ port: '7272'
+ sites:
+ - eqiad
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index b66ec39..388c04d 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -16,6 +16,7 @@
- 10.2.2.18
- 10.2.2.19
- 10.2.2.20
+- 10.2.2.24
service::configuration::http_proxy: http://url-downloader.wikimedia.org:8080
service::configuration::statsd_host: statsd.eqiad.wmnet
service::configuration::logstash_host: logstash1001.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/275774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85e74fa33e210f57992149e4318b0840f937c7e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
