Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e58e794

Browse files
jcalcabenjcalcaben
authored
Merge pull request magento#873 from magento/jc_69179_solr-deprecation-removal
Jc 69179 solr deprecation removal
2 parents 5fcd004 + 0f48e2a commit e58e794

File tree

9 files changed

+160
-67
lines changed

9 files changed

+160
-67
lines changed

‎guides/v2.0/cloud/release-notes/CloudReleaseNotes2.1.3.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ If you installed Magento Enterprise Cloud Edition 2.1.3 for the first time, you
6262

6363
To use Elasticsearch on a [staging]({{ page.baseurl }}cloud/reference/discover-arch.html#cloud-arch-stage) or [production]({{ page.baseurl }}cloud/reference/discover-arch.html#cloud-arch-prod) system, open a [Support ticket]({{ page.baseurl }}cloud/welcome/get-help.html) and request Elasticsearch.
6464

65+
<div class="bs-callout bs-callout-warning" markdown="1">
66+
After installing Elasticsearch, you must do a full index of your fulltext index.
67+
This process can take a while if the index is large.
68+
69+
The search functionality will be unavailable until the process completes.
70+
</div>
71+
6572
To use Elasticsearch, you must perform all the tasks discussed in this section.
6673

6774
### Get started
@@ -176,11 +183,7 @@ This section discusses how to get connection information for Elasticsearch so yo
176183

177184
### Step 5: Configure the Magento application to use Elasticsearch
178185

179-
{% collapsible To configure the Magento application: %}
180-
181-
{% include config/es-elasticsearch-magento.md %}
182-
183-
{% endcollapsible %}
186+
Configure Magento using the instructions in the [Magento configuration for Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/configure-magento.html) guide.
184187

185188
## Fixed issue
186189

‎guides/v2.0/config-guide/solr/solr-overview.md

Lines changed: 82 additions & 53 deletions
Large diffs are not rendered by default.

‎guides/v2.1/config-guide/elasticsearch/configure-magento.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
layout: default
3+
group: config-guide
4+
subgroup: 14_Elastic
5+
title: Configure Magento to use Elasticsearch
6+
menu_title: Configure Magento to use Elasticsearch
7+
menu_order: 900
8+
menu_node:
9+
version: 2.1
10+
github_link: config-guide/elasticsearch/configure-magento.md
11+
---
12+
13+
{% include config/es-elasticsearch-magento.md %}

‎guides/v2.1/config-guide/elasticsearch/es-overview.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ github_link: config-guide/elasticsearch/es-overview.md
1515

1616
#### Contents
1717

18-
* <a href="#overview">Overview of Elasticsearch</a>
19-
* <a href="#es-prereq">Install prerequisites and Elasticsearch</a>
20-
* <a href="#es-resources">Additional resources</a>
18+
* [Overview of Elasticsearch](#overview){:target="_blank"}
19+
* [Install prerequisites and Elasticsearch](#es-prereq){:target="_blank"}
20+
* [Additional resources](#es-resources){:target="_blank"}
2121
* [Configure nginx and Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/es-config-nginx.html)
2222
* [Configure Apache and Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/es-config-apache.html)
2323
* [Configure Elasticsearch stopwords]({{page.baseurl}}config-guide/elasticsearch/es-config-stopwords.html)
@@ -80,8 +80,9 @@ Search requests are processed as follows:
8080
The tasks discussed in this section require the following:
8181

8282
* [Firewall and SELinux](#firewall-selinux)
83-
* <a href="#prereq-java">Install the Java Software Development Kit (JDK)</a>
83+
* [Install the Java Software Development Kit (JDK)](#prereq-java){:target="_blank"}
8484
* [Install Elasticsearch](#es-install-es)
85+
* [Configure Magento to use Elasticsearch](#configure-magento-to-use-elasticsearch)
8586

8687
{% include config/solr-elastic-selinux.md %}
8788

@@ -136,7 +137,7 @@ To install Elasticsearch:
136137

137138
For more information, see [Setting the BooleanQuery maxClauseCount in Elasticsearch](http://george-stathis.com/2013/10/18/setting-the-booleanquery-maxclausecount-in-elasticsearch){:target="_blank"}.
138139
6. Save your changes to `elasticsearch.yml` and exit the text editor.
139-
3. Optionally configure the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/2.0/setup-service.html" target="_blank">Elasticsearch service</a>.
140+
3. Optionally configure the [Elasticsearch service](https://www.elastic.co/guide/en/elasticsearch/reference/2.0/setup-service.html){:target="_blank"}.
140141
4. Start Elasticsearch:
141142

142143
service elasticsearch start
@@ -148,10 +149,12 @@ To install Elasticsearch:
148149

149150
{"cluster_name":"elasticsearch","status":"green","timed_out":false,"number_of_nodes":1,"number_of_data_nodes":1,"active_primary_shards":0,"active_shards":0,"relocating_shards":0,"initializing_shards":0,"unassigned_shards":0,"delayed_unassigned_shards":0,"number_of_pending_tasks":0,"number_of_in_flight_fetch":0,"task_max_waiting_in_queue_millis":0,"active_shards_percent_as_number":100.0}
150151

152+
151153
## Additional resources {#es-resources}
152154
For additional information, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/2.4/index.html){:target=_"blank"}
153155

154156
#### Next
155157

156158
* [Configure nginx and Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/es-config-nginx.html)
157159
* [Configure Apache and Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/es-config-apache.html)
160+
* [Configure Magento to use Elasticsearch]({{page.baseurl}}config-guide/elasticsearch/configure-magento.html)

‎guides/v2.2/config-guide/bk-config-guide.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎guides/v2.2/config-guide/bk-config-guide.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
layout: default
3+
group: config-guide
4+
subgroup: 01_Introduction
5+
title: Configuration Guide
6+
landing-page: Configuration Guide
7+
menu_title: Introduction
8+
menu_order: 1
9+
menu_node: parent
10+
version: 2.2
11+
github_link: config-guide/bk-config-guide.md
12+
---
13+
14+
<h2 id="configuration">Configure the Magento application</h2>
15+
You can configure the Magento application in any of the following ways:
16+
17+
* General configuration
18+
19+
* Using a <a href="{{page.baseurl}}config-guide/cli/config-cli.html">command-line utility</a> (for example, enable or disable cache types, run indexers, set up translations, and so on)
20+
* Manually to set up <a href="{{page.baseurl}}config-guide/bootstrap/magento-bootstrap.html">bootstrap parameters</a>
21+
22+
* Caching
23+
24+
* <a href="{{page.baseurl}}config-guide/varnish/config-varnish.html">Set up Varnish</a>
25+
* <a href="{{page.baseurl}}config-guide/cache/caching.html">Set up caching</a>
26+
* [Use Redis for the Magento page and default cache]({{ page.baseurl}}config-guide/redis/redis-pg-cache.html)
27+
* [Use Redis for session storage]({{ page.baseurl }}config-guide/redis/redis-session.html)
28+
* [Set up database caching]({{ page.baseurl }}config-guide/cache/caching-database.html)
29+
30+
* Magento in production
31+
32+
* [Deployment steps]({{page.baseurl}}config-guide/prod/prod_deploy.html)
33+
* [Magento ownership and permissions in development and production]({{page.baseurl}}config-guide/prod/prod_file-sys-perms.html)
34+
35+
* Session storage
36+
* [memcache]({{page.baseurl}}config-guide/memcache/memcache.html)
37+
* [Redis]({{page.baseurl}}config-guide/redis/redis-session.html)
38+
* [How to locate session files]({{page.baseurl}}config-guide/sessions.html)
39+
40+
* <img src="{{ site.baseurl }}common/images/ee-only_small.png">
41+
42+
* [Install and configure Elasticsearch]({{ page.baseurl }}config-guide/elasticsearch/es-overview.html)
43+
* <a href="{{page.baseurl}}config-guide/multi-master/multi-master.html">Split databases</a>
44+
* <a href="{{page.baseurl}}config-guide/mq/rabbitmq-overview.html">Message queues</a>
45+
46+
47+
48+

‎guides/v2.2/config-guide/elasticsearch/configure-magento.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../v2.1/config-guide/elasticsearch/configure-magento.md

‎guides/v2.2/config-guide/solr/solr-magento.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎guides/v2.2/config-guide/solr/solr-overview.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎guides/v2.2/config-guide/solr/solr-script.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)