Коммит 2787a935 создал по автору Changzheng Liu's avatar Changzheng Liu
Просмотр файлов

Change text Elasticsearch to OpenSearch in AWS search service config

Changelog: changed
EE: true
владелец d9981f53
......@@ -223,7 +223,7 @@ The following Elasticsearch settings are available:
| `Number of Elasticsearch shards` | Elasticsearch indices are split into multiple shards for performance reasons. In general, you should use at least 5 shards, and indices with tens of millions of documents need to have more shards ([see below](#guidance-on-choosing-optimal-cluster-configuration)). Changes to this value do not take effect until the index is recreated. You can read more about tradeoffs in the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/scalability.html). |
| `Number of Elasticsearch replicas` | Each Elasticsearch shard can have a number of replicas. These are a complete copy of the shard, and can provide increased query performance or resilience against hardware failure. Increasing this value increases total disk space required by the index. |
| `Limit the number of namespaces and projects that can be indexed` | Enabling this allows you to select namespaces and projects to index. All other namespaces and projects use database search instead. If you enable this option but do not select any namespaces or projects, none are indexed. [Read more below](#limit-the-number-of-namespaces-and-projects-that-can-be-indexed).|
| `Using AWS hosted Elasticsearch with IAM credentials` | Sign your Elasticsearch requests using [AWS IAM authorization](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html), [AWS EC2 Instance Profile Credentials](https://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html#getting-started-create-iam-instance-profile-cli), or [AWS ECS Tasks Credentials](https://docs.aws.amazon.com/AmazonECS/latest/userguide/task-iam-roles.html). Please refer to [Identity and Access Management in Amazon OpenSearch Service](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/ac.html) for details of AWS hosted OpenSearch domain access policy configuration. |
| `Using AWS OpenSearch Service with IAM credentials` | Sign your OpenSearch requests using [AWS IAM authorization](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html), [AWS EC2 Instance Profile Credentials](https://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html#getting-started-create-iam-instance-profile-cli), or [AWS ECS Tasks Credentials](https://docs.aws.amazon.com/AmazonECS/latest/userguide/task-iam-roles.html). Please refer to [Identity and Access Management in Amazon OpenSearch Service](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/ac.html) for details of AWS hosted OpenSearch domain access policy configuration. |
| `AWS Region` | The AWS region in which your OpenSearch Service is located. |
| `AWS Access Key` | The AWS access key. |
| `AWS Secret Access Key` | The AWS secret access key. |
......
......@@ -167,14 +167,14 @@
= render Pajamas::CardComponent.new(**component_params) do |c|
= c.body do
%h4= _('Elasticsearch AWS IAM credentials')
%h4= _('AWS OpenSearch IAM credentials')
.form-group
= f.gitlab_ui_checkbox_component :elasticsearch_aws, s_('AdminSettings|Use AWS hosted Elasticsearch with IAM credentials')
= f.gitlab_ui_checkbox_component :elasticsearch_aws, s_('AdminSettings|Use AWS OpenSearch Service with IAM credentials')
.form-group
= f.label :elasticsearch_aws_region, 'AWS region', class: 'label-bold'
= f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control gl-form-input'
.form-text.gl-text-gray-600.gl-mt-0
= _('Elasticsearch\'s region.')
= _('OpenSearch\'s region.')
.form-group
= f.label :elasticsearch_aws_access_key, _('AWS Access Key'), class: 'label-bold'
......
......@@ -1833,6 +1833,9 @@ msgstr ""
msgid "AWS Access Key"
msgstr ""
 
msgid "AWS OpenSearch IAM credentials"
msgstr ""
msgid "AWS Secret Access Key"
msgstr ""
 
......@@ -2886,7 +2889,7 @@ msgstr ""
msgid "AdminSettings|Total number of jobs in currently active pipelines"
msgstr ""
 
msgid "AdminSettings|Use AWS hosted Elasticsearch with IAM credentials"
msgid "AdminSettings|Use AWS OpenSearch Service with IAM credentials"
msgstr ""
 
msgid "AdminSettings|When paused, GitLab still tracks the changes. This is useful for cluster/index migrations."
......@@ -14247,9 +14250,6 @@ msgstr ""
msgid "Elapsed time"
msgstr ""
 
msgid "Elasticsearch AWS IAM credentials"
msgstr ""
msgid "Elasticsearch HTTP client timeout value in seconds."
msgstr ""
 
......@@ -14274,9 +14274,6 @@ msgstr ""
msgid "Elasticsearch zero-downtime reindexing"
msgstr ""
 
msgid "Elasticsearch's region."
msgstr ""
msgid "Elastic|None. Select namespaces to index."
msgstr ""
 
......@@ -27487,6 +27484,9 @@ msgstr ""
msgid "OpenAPI Specification file path or URL"
msgstr ""
 
msgid "OpenSearch's region."
msgstr ""
msgid "Opened"
msgstr ""
 
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать