Alexandros Kosiaris has submitted this change and it was merged.
Change subject: lvs: normalize ProxyFetch URL configuration
......................................................................
lvs: normalize ProxyFetch URL configuration
The url entries for various configuration entries in the LVS
configuration contained non-used or irrelevant data. For example the
port specified in multiple ProxyFetch URL entries was specified, but the
code never uses it. Removed in I4908d105125. Second and slightly
more controversial is the host part of the ProxyFetch url parameter,
which is only used to set the Host: HTTP header. Since no one of the
smaller services like the *oids or eventbus actually rely on the Host
header, this is irrelevant data. On the other hand that specific value
turns out to be DC specific in many configuration stanzas for no good
reason. Normalize all of them to be localhost, chosen as an arbitrary,
but consistent value.
That being said, we probably do want a clear and consistent way of
defining the Host: Header in the future, especially in light of TLS
connections.
Change-Id: Ib218dcae2e4eb1a4eed9911fe46a48234b04a111
---
M hieradata/common/lvs/configuration.yaml
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 0b0060b..7c37347 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -577,7 +577,7 @@
monitors:
ProxyFetch:
url:
- - http://ocg.svc.eqiad.wmnet/?command=health
+ - http://localhost/?command=health
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -601,7 +601,7 @@
monitors:
ProxyFetch:
url:
- - http://mathoid.svc.eqiad.wmnet/_info
+ - http://localhost/_info
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -625,7 +625,7 @@
monitors:
ProxyFetch:
url:
- - http://citoid.svc.eqiad.wmnet
+ - http://localhost/_info
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -633,7 +633,7 @@
cluster: scb
service: citoid
icinga:
- check_command: check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970!/
+ check_command: check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970!/_info
contact_group: admins,parsoid
sites:
eqiad:
@@ -650,7 +650,7 @@
monitors:
ProxyFetch:
url:
- - http://cxserver.svc.eqiad.wmnet/_info
+ - http://localhost/_info
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -674,7 +674,7 @@
monitors:
ProxyFetch:
url:
- - http://graphoid.svc.eqiad.wmnet/_info
+ - http://localhost/_info
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -700,7 +700,7 @@
monitors:
ProxyFetch:
url:
- - "http://restbase.svc.%{::site}.wmnet";
+ - http://localhost/
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -800,7 +800,7 @@
monitors:
ProxyFetch:
url:
- - "http://aqs.svc.%{::site}.wmnet";
+ - http://localhost/
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -832,7 +832,7 @@
monitors:
ProxyFetch:
url:
- - "http://eventbus.svc.%{::site}.wmnet/v1/topics";
+ - http://localhost/v1/topics
IdleConnection:
max-delay: 300
timeout-clean-reconnect: 3
--
To view, visit https://gerrit.wikimedia.org/r/276739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib218dcae2e4eb1a4eed9911fe46a48234b04a111
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
