Add latest changes from gitlab-org/gitlab@15-0-stable-ee

4 files changed, 16 insertions, 1 deletions

diff --git a/doc/api/members.md b/doc/api/members.md
index 1db9714bfd1..5002e1003e3 100644
--- a/doc/api/members.md
+++ b/doc/api/members.md
@@ -6,6 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Group and project members API **(FREE)**
 
+> `created_by` field [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/28789) in GitLab 14.10.
+
 ## Valid access levels
 
 The access levels are defined in the `Gitlab::Access` module. Currently, these levels are recognized:
diff --git a/doc/install/next_steps.md b/doc/install/next_steps.md
index 2fc60c3af53..5d8c61cad44 100644
--- a/doc/install/next_steps.md
+++ b/doc/install/next_steps.md
@@ -56,7 +56,7 @@ installation.
 
 ## Cross-repository Code Search
 
-- [Advanced Search](../integration/elasticsearch.md): Leverage Elasticsearch for
+- [Advanced Search](../integration/elasticsearch.md): Leverage [Elasticsearch](https://www.elastic.co/) or [OpenSearch](https://opensearch.org/) for
   faster, more advanced code search across your entire GitLab instance.
 
 ## Scaling and replication
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 214bd845944..ab9aaae63a2 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -38,6 +38,8 @@ GitLab does not support:
 For updates, see [issue #327560](https://gitlab.com/gitlab-org/gitlab/-/issues/327560).
 - Elasticsearch 8.0. For updates, see [issue #350600](https://gitlab.com/gitlab-org/gitlab/-/issues/350600). Use Elasticsearch 7.17 instead.
 
+If you are using a compatible version and after connecting to OpenSearch, you get the message `Elasticsearch version not compatible`, [unpause indexing](#unpause-indexing).
+
 ## System requirements
 
 Elasticsearch requires additional resources to those documented in the
@@ -301,6 +303,13 @@ To disable the Elasticsearch integration:
    bundle exec rake gitlab:elastic:delete_index RAILS_ENV=production
    ```
 
+## Unpause Indexing 
+
+1. On the top bar, select **Menu > Admin**.
+1. On the left sidebar, select **Settings > Advanced Search**.
+1. Expand **Advanced Search**.
+1. Clear the **Pause Elasticsearch indexing** checkbox.
+
 ## Zero downtime reindexing
 
 The idea behind this reindexing method is to leverage the [Elasticsearch reindex API](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html)
diff --git a/doc/update/index.md b/doc/update/index.md
index 24afb01396a..779b8ccbc6a 100644
--- a/doc/update/index.md
+++ b/doc/update/index.md
@@ -289,6 +289,10 @@ sudo -u git -H bundle exec rake gitlab:elastic:list_pending_migrations
 
 See [how to retry a halted migration](../integration/elasticsearch.md#retry-a-halted-migration).
 
+### What do I do for the error `Elasticsearch version not compatible`
+
+Confirm that your version of Elasticsearch or OpenSearch is [compatible with your version of GitLab](../integration/elasticsearch.md#version-requirements).
+
 ## Upgrading without downtime
 
 Read how to [upgrade without downtime](zero_downtime.md).