Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/207051
Change subject: mobileapps service: LVS configuration ...................................................................... mobileapps service: LVS configuration Bug: T92627 Change-Id: Ica3ae57f3f259bb145ba0c7b3a343dbd5b74640b --- M hieradata/role/common/sca.yaml M manifests/role/lvs.pp M modules/lvs/manifests/configuration.pp M modules/lvs/manifests/monitor.pp 4 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/207051/1 diff --git a/hieradata/role/common/sca.yaml b/hieradata/role/common/sca.yaml index f6bb36d..f8a746c 100644 --- a/hieradata/role/common/sca.yaml +++ b/hieradata/role/common/sca.yaml @@ -13,6 +13,7 @@ - '10.2.2.18' # cxserver.svc.eqiad.wmnet - '10.2.2.19' # citoid.svc.eqiad.wmnet - '10.2.2.20' # mathoid.svc.eqiad.wmnet +# - '10.2.2.XX' # mobileapps.svc.eqiad.wmnet service::configuration::http_proxy: http://url-downloader.wikimedia.org:8080 service::configuration::statsd_host: statsd.eqiad.wmnet diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp index efe2782..f9edbb3 100644 --- a/manifests/role/lvs.pp +++ b/manifests/role/lvs.pp @@ -46,6 +46,7 @@ $sip['search'][$::site], $sip['restbase'][$::site], $sip['zotero'][$::site], + $sip['mobileapps'][$::site], ], # codfw (should mirror eqiad above, eventually, and become merged with it via regex diff --git a/modules/lvs/manifests/configuration.pp b/modules/lvs/manifests/configuration.pp index f47249a6..f344748 100644 --- a/modules/lvs/manifests/configuration.pp +++ b/modules/lvs/manifests/configuration.pp @@ -177,6 +177,9 @@ 'cxserver' => { 'eqiad' => "10.2.2.18", }, + #'mobileapps' => { + # 'eqiad' => "10.2.2.XX", + #}, 'restbase' => { 'eqiad' => "10.2.2.17", }, @@ -202,6 +205,7 @@ 'cxserver' => {}, 'misc_web' => {}, 'mobile' => {}, + 'mobileapps' => {}, 'ocg' => {}, 'osm' => {}, 'swift' => { @@ -710,6 +714,19 @@ 'IdleConnection' => $idleconnection_monitor_options, } }, + 'mobileapps' => { + 'description' => 'mobileapps, mobileapps.svc.eqiad.wmnet', + 'class' => 'low-traffic', + 'sites' => [ 'eqiad' ], + 'ip' => $service_ips['mobileapps'][$::site], + 'port' => 6624, + 'bgp' => 'yes', + 'depool-threshold' => '.5', + 'monitors' => { + 'ProxyFetch' => { 'url' => [ 'http://mobileapps.svc.eqiad.wmnet/robots.txt' ] }, + 'IdleConnection' => $idleconnection_monitor_options, + } + }, 'restbase' => { 'description' => 'RESTBase, restbase.svc.eqiad.wmnet', 'class' => 'low-traffic', diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp index 377ecf7..7594cab 100644 --- a/modules/lvs/manifests/monitor.pp +++ b/modules/lvs/manifests/monitor.pp @@ -17,6 +17,7 @@ lvs::monitor_service_http { 'mathoid.svc.eqiad.wmnet': ip_address => $ip['mathoid']['eqiad'], check_command => "check_http_lvs_on_port!mathoid.svc.eqiad.wmnet!10042!/" } lvs::monitor_service_http { 'citoid.svc.eqiad.wmnet': ip_address => $ip['citoid']['eqiad'], check_command => "check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970!/", contact_group => "admins,parsoid" } lvs::monitor_service_http { 'cxserver.svc.eqiad.wmnet': ip_address => $ip['cxserver']['eqiad'], check_command => "check_http_lvs_on_port!citoid.svc.eqiad.wmnet!8080!/" } + lvs::monitor_service_http { 'mobileapps.svc.eqiad.wmnet': ip_address => $ip['mobileapps']['eqiad'], check_command => "check_http_lvs_on_port!mobileapps.svc.eqiad.wmnet!6624!/robots.txt", contact_group => "admins,parsoid" } lvs::monitor_service_http { 'restbase.svc.eqiad.wmnet': ip_address => $ip['restbase']['eqiad'], check_command => "check_http_lvs_on_port!restbase.svc.eqiad.wmnet!7231!/" } lvs::monitor_service_http { 'zotero.svc.eqiad.wmnet': ip_address => $ip['zotero']['eqiad'], check_command => "check_http_zotero_lvs_on_port!zotero.svc.eqiad.wmnet!1969!/export?format=wikipedia" } -- To view, visit https://gerrit.wikimedia.org/r/207051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica3ae57f3f259bb145ba0c7b3a343dbd5b74640b 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
