Lcarr has submitted this change and it was merged.
Change subject: Add LVS setup for new search infrastructure with monitoring
......................................................................
Add LVS setup for new search infrastructure with monitoring
RT: 5867
Change-Id: I9bbb00a11ac9bc5cfc36ccafad700dcee5296b89
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 2721038..4490232 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -415,6 +415,9 @@
'parsoidcache' => {
'eqiad' => "10.2.2.29",
},
+ 'search' => {
+ 'eqiad' => "10.2.2.30",
+ },
},
'labs' => {
'text' => {
@@ -465,6 +468,7 @@
},
'parsoid' => {},
'parsoidcache' => {},
+ 'search' => {},
}
}
@@ -830,6 +834,21 @@
'IdleConnection' =>
$idleconnection_monitor_options,
},
},
+ "search" => {
+ 'description' => "Elasticsearch search for MediaWiki",
+ 'class' => "low-traffic",
+ 'sites' => [ "eqiad" ],
+ 'ip' => $service_ips['search'][$::site],
+ 'port' => 9200,
+ 'bgp' => "yes",
+ 'depool-threshold' => ".5",
+ 'monitors' => {
+ 'ProxyFetch' => {
+ 'url' => [ 'http://localhost:9200/' ],
+ },
+ 'IdleConnection' =>
$idleconnection_monitor_options,
+ },
+ },
}
}
@@ -1019,6 +1038,7 @@
# monitor_service_lvs_http { "ms-fe.eqiad.wmnet": ip_address =>
"10.2.2.27", check_command =>
"check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "parsoid.svc.eqiad.wmnet": ip_address =>
"10.2.2.28", check_command => "check_http_on_port!8000", contact_group =>
"admins,parsoid" }
monitor_service_lvs_http { "parsoidcache.svc.eqiad.wmnet": ip_address
=> "10.2.2.29", check_command => "check_http_lvs!parsoid!/", contact_group =>
"admins,parsoid" }
+ monitor_service_lvs_http { "search.svc.eqiad.wmnet": ip_address =>
"10.2.2.30", check_command => "check_http_on_port!9200", contact_group =>
"admins" }
monitor_service_lvs_custom { "search-pool1.svc.pmtpa.wmnet": ip_address
=> "10.2.1.11", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
monitor_service_lvs_custom { "search-pool2.svc.pmtpa.wmnet": ip_address
=> "10.2.1.12", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
diff --git a/manifests/site.pp b/manifests/site.pp
index 0b2ee80..a412262 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1521,7 +1521,8 @@
$sip['search_prefix'][$::site],
$sip['swift'][$::site],
$sip['parsoid'][$::site],
- $sip['parsoidcache'][$::site]
+ $sip['parsoidcache'][$::site],
+ $sip['search'][$::site]
]
}
@@ -2837,6 +2838,7 @@
include standard
include role::elasticsearch::production
+ class { "lvs::realserver": realserver_ips => [ "10.2.2.30" ] }
}
node "tin.eqiad.wmnet" {
--
To view, visit https://gerrit.wikimedia.org/r/86742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bbb00a11ac9bc5cfc36ccafad700dcee5296b89
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
