BBlack has submitted this change and it was merged. Change subject: Revert s/en/de/ for LVS monitoring; switch ProxyFetch to TLS ......................................................................
Revert s/en/de/ for LVS monitoring; switch ProxyFetch to TLS First, this reverts the change of the primary monitoring URLs (back to enwiki URLs). Also, for all of the public text/mobile/bits/upload endpoints the monitors are rearranged as follows: OLD: foo_80 (HTTP): IdleConn,ProxyFetch->http://bar foo_443 (HTTPS): IdleConn NEW: foo_80 (HTTP): IdleConn foo_443 (HTTPS): IdleConn,ProxyFetch->https://bar This gets us monitoring fetches over HTTPS (which is more important now), and skips over the issues of HTTP ProxyFetch failing on the (soon to be very very common) case of a 301 direct for HTTPS. Revert "Switch LVS monitoring to dewiki (mobile, too)" This reverts commit cd343f9c039cee7f89922871459c198082cd64d0. Revert "Switch LVS monitoring to dewiki" This reverts commit 89c1673c8a2fd7a0fe45b3c3bc044a46652bbc6a. Bug: T102393 Change-Id: Ic1ece34976962637e77a9a85bbd2fa7b4752999f --- M modules/lvs/manifests/configuration.pp 1 file changed, 12 insertions(+), 28 deletions(-) Approvals: Faidon Liambotis: Looks good to me, but someone else must approve BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/lvs/manifests/configuration.pp b/modules/lvs/manifests/configuration.pp index fc607bb..c8623dd 100644 --- a/modules/lvs/manifests/configuration.pp +++ b/modules/lvs/manifests/configuration.pp @@ -355,12 +355,7 @@ 'ip' => $service_ips['text'][$::site], 'bgp' => 'yes', 'depool-threshold' => '.5', - 'monitors' => { - 'ProxyFetch' => { - 'url' => [ 'http://de.wikipedia.org/wiki/Wikipedia:Hauptseite' ], - }, - 'IdleConnection' => $idleconnection_monitor_options - }, + 'monitors' => { 'IdleConnection' => $idleconnection_monitor_options }, }, 'text-https' => { 'description' => "Main wiki platform LVS service, text.${::site}.wikimedia.org (nginx)", @@ -372,7 +367,8 @@ 'bgp' => 'no', 'depool-threshold' => '.5', 'monitors' => { - 'IdleConnection' => $idleconnection_monitor_options + 'ProxyFetch' => { 'url' => [ 'https://en.wikipedia.org/wiki/Main_Page' ] }, + 'IdleConnection' => $idleconnection_monitor_options, }, }, "bits" => { @@ -382,12 +378,7 @@ 'ip' => $service_ips['bits'][$::site], 'bgp' => "yes", 'depool-threshold' => ".5", - 'monitors' => { - 'ProxyFetch' => { - 'url' => [ 'http://bits.wikimedia.org/pybal-test-file' ], - }, - 'IdleConnection' => $idleconnection_monitor_options - }, + 'monitors' => { 'IdleConnection' => $idleconnection_monitor_options }, }, "bits-https" => { 'description' => "Site assets (CSS/JS) LVS service, bits.${::site}.wikimedia.org", @@ -399,7 +390,8 @@ 'bgp' => 'no', 'depool-threshold' => '.5', 'monitors' => { - 'IdleConnection' => $idleconnection_monitor_options + 'ProxyFetch' => { 'url' => [ 'https://bits.wikimedia.org/pybal-test-file' ] }, + 'IdleConnection' => $idleconnection_monitor_options, }, }, "upload" => { @@ -409,12 +401,7 @@ 'ip' => $service_ips['upload'][$::site], 'bgp' => "yes", 'depool-threshold' => ".5", - 'monitors' => { - 'ProxyFetch' => { - 'url' => [ 'http://upload.wikimedia.org/monitoring/backend' ], - }, - 'IdleConnection' => $idleconnection_monitor_options - }, + 'monitors' => { 'IdleConnection' => $idleconnection_monitor_options }, }, "upload-https" => { 'description' => "Images and other media, upload.${::site}.wikimedia.org", @@ -426,7 +413,8 @@ 'bgp' => "no", 'depool-threshold' => ".5", 'monitors' => { - 'IdleConnection' => $idleconnection_monitor_options + 'ProxyFetch' => { 'url' => [ 'https://upload.wikimedia.org/monitoring/backend' ] }, + 'IdleConnection' => $idleconnection_monitor_options, }, }, "mobile" => { @@ -436,12 +424,7 @@ 'ip' => $service_ips['mobile'][$::site], 'bgp' => "yes", 'depool-threshold' => ".6", - 'monitors' => { - 'ProxyFetch' => { - 'url' => [ 'http://de.m.wikipedia.org/wiki/Angelsberg' ], - }, - 'IdleConnection' => $idleconnection_monitor_options - }, + 'monitors' => { 'IdleConnection' => $idleconnection_monitor_options }, }, "mobile-https" => { 'description' => "MediaWiki based mobile site", @@ -453,7 +436,8 @@ 'bgp' => "no", 'depool-threshold' => ".6", 'monitors' => { - 'IdleConnection' => $idleconnection_monitor_options + 'ProxyFetch' => { 'url' => [ 'https://en.m.wikipedia.org/wiki/Angelsberg' ] }, + 'IdleConnection' => $idleconnection_monitor_options, }, }, "dns_rec" => { -- To view, visit https://gerrit.wikimedia.org/r/218285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1ece34976962637e77a9a85bbd2fa7b4752999f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
