Reverted the changes from PR #558 (#747) (#750)

Signed-off-by: jeffhuss <[email protected]> (cherry picked from commit ff4a818) Co-authored-by: Jeff Huss <[email protected]>
opensearch-project · Jul 1, 2022 · e20f441 · e20f441
1 parent 889ab48
commit e20f441
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
@@ -12,14 +12,7 @@ redirect_from:
 
 Historically, many multiple popular agents and ingestion tools have worked with Elasticsearch OSS, such as Beats, Logstash, Fluentd, FluentBit, and OpenTelemetry. OpenSearch aims to continue to support a broad set of agents and ingestion tools, but not all have been tested or have explicitly added OpenSearch compatibility.
 
-Previously, an intermediate compatibility solution was available. OpenSearch had a setting that instructed the cluster to return version 7.10.2 rather than its actual version.
-
-The override main response setting `compatibility.override_main_response_version` is deprecated from OpenSearch version 1.x and removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
-{: .note}
-
-<!--
-{: .note}
-
+As an intermediate compatibility solution, OpenSearch has a setting that instructs the cluster to return version 7.10.2 rather than its actual version.
 
 If you use clients that include a version check, such as versions of Logstash OSS or Filebeat OSS between 7.x - 7.12.x, enable the setting:
 
@@ -39,7 +32,7 @@ PUT _cluster/settings
 ```yml
 compatibility.override_main_response_version: true
 ```
--->
+
 Logstash OSS 8.0 introduces a breaking change where all plugins run in ECS compatibility mode by default. If you use a compatible [OSS client](#compatibility-matrices) you must override the default value to maintain legacy behavior:
 
 ```yml

diff --git a/_clients/index.md b/_clients/index.md
@@ -26,10 +26,6 @@ For example, a 1.0.0 client works with an OpenSearch 1.1.0 cluster, but might no
 
 Most clients that work with Elasticsearch OSS 7.10.2 *should* work with OpenSearch, but the latest versions of those clients might include license or version checks that artificially break compatibility. This page includes recommendations around which versions of those clients to use for best compatibility with OpenSearch.
 
-{: .note}
-OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, some features are not supported when using OpenSearch 1.x clients to connect to OpenSearch 2.0.
-
-
 Client | Recommended version
 :--- | :---
 [Java low-level REST client](https://search.maven.org/artifact/org.elasticsearch.client/elasticsearch-rest-client/7.13.4/jar) | 7.13.4

diff --git a/_opensearch/configuration.md b/_opensearch/configuration.md
@@ -74,6 +74,7 @@ You don't mark settings in `opensearch.yml` as persistent or transient, and sett
 ```yml
 cluster.name: my-application
 action.auto_create_index: true
+compatibility.override_main_response_version: true
 ```
 
 The demo configuration includes a number of settings for the security plugin that you should modify before using OpenSearch for a production workload. To learn more, see [Security]({{site.url}}{{site.baseurl}}/security-plugin/).