Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281882
Change subject: WIP
......................................................................
WIP
Change-Id: Ie6c9f8d3ad194af11c2d6bc6ce25382aae507889
---
M wmf-config/CirrusSearch-production.php
M wmf-config/ProductionServices.php
2 files changed, 22 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/82/281882/1
diff --git a/wmf-config/CirrusSearch-production.php
b/wmf-config/CirrusSearch-production.php
index d609900..987d9a7 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -11,8 +11,26 @@
$wgCirrusSearchMasterTimeout = '2m';
$wgCirrusSearchClusters = array(
- 'eqiad' => $wmfAllServices['eqiad']['search'], // search.svc.eqiad.wmnet
- 'codfw' => $wmfAllServices['codfw']['search'], // search.svc.codfw.wmnet
+ 'eqiad' => array_map( function ( $host ) {
+ return array(
+ 'transport' => 'CirrusSearch\\Elastica\\PooledHttps',
+ 'port' => '9243',
+ 'host' => $host,
+ 'config' => array(
+ 'pool' => 'cirrus-eqiad',
+ ),
+ );
+ }, $wmfAllServices['eqiad']['search'] ),
+ 'codfw' => array_map( function ( $host ) {
+ return array(
+ 'transport' => 'CirrusSearch\\Elastica\\PooledHttps',
+ 'port' => '9243',
+ 'host' => $host,
+ 'config' => array(
+ 'pool' => 'cirrus-codfw',
+ ),
+ );
+ }, $wmfAllServices['eqiad']['search'] ),
'labsearch' => array( '10.64.37.14' ), // nobelium.eqiad.wmnet
);
diff --git a/wmf-config/ProductionServices.php
b/wmf-config/ProductionServices.php
index c5e2766..fc689ee 100644
--- a/wmf-config/ProductionServices.php
+++ b/wmf-config/ProductionServices.php
@@ -14,7 +14,7 @@
$wmfAllServices['eqiad'] = array(
'udp2log' => 'fluorine.eqiad.wmnet:8420',
'statsd' => 'statsd.eqiad.wmnet',
- 'search' => array( '10.2.2.30' ), # search.svc.eqiad.wmnet
+ 'search' => array( 'search.svc.eqiad.wmnet' ), # elasticsearch must be
accessed by hostname for SSL certificate verification to work
'ocg' => 'http://ocg.svc.eqiad.wmnet:8000',
'urldownloader' => 'http://url-downloader.wikimedia.org:8080',
'parsoid' => 'http://parsoid.svc.eqiad.wmnet:8000',
@@ -27,7 +27,7 @@
$wmfAllServices['codfw'] = array(
'udp2log' => 'fluorine.eqiad.wmnet:8420',
'statsd' => 'statsd.eqiad.wmnet',
- 'search' => array( '10.2.1.30' ), # search.svc.codfw.wmnet
+ 'search' => array( 'search.svc.codfw.wmnet' ), # elasticsearch must be
accessed by hostname for SSL certificate verification to work
'ocg' => 'http://ocg.svc.eqiad.wmnet:8000',
'urldownloader' => 'http://url-downloader.wikimedia.org:8080',
'parsoid' => 'http://parsoid.svc.eqiad.wmnet:8000', # Change this once
parsoid is up and running in codfw
--
To view, visit https://gerrit.wikimedia.org/r/281882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6c9f8d3ad194af11c2d6bc6ce25382aae507889
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
