From 89095648912410650a735095c3f6397a3e55e500 Mon Sep 17 00:00:00 2001 From: Alice Williams <88908598+alicejw-aws@users.noreply.github.com> Date: Mon, 20 Jun 2022 11:53:51 -0700 Subject: [PATCH] for cluster manager term update (#691) * for cluster manager term update Signed-off-by: alicejw * for small fix Signed-off-by: alicejw * to change to Signed-off-by: alicejw --- _opensearch/rest-api/cat/cat-templates.md | 6 +++--- _security-plugin/access-control/multi-tenancy.md | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_opensearch/rest-api/cat/cat-templates.md b/_opensearch/rest-api/cat/cat-templates.md index bedf9b7c..224cb5ff 100644 --- a/_opensearch/rest-api/cat/cat-templates.md +++ b/_opensearch/rest-api/cat/cat-templates.md @@ -39,15 +39,15 @@ In addition to the [common URL parameters]({{site.url}}{{site.baseurl}}/opensear Parameter | Type | Description :--- | :--- | :--- -local | Boolean | Whether to return information from the local node only instead of from the master node. Default is false. -master_timeout | Time | The amount of time to wait for a connection to the master node. Default is 30 seconds. +local | Boolean | Whether to return information from the local node only instead of from the cluster manager node. Default is false. +cluster_manager_timeout | Time | The amount of time to wait for a connection to the cluster manager node. Default is 30 seconds. ## Response ``` name | index_patterns order version composed_of -tenant_template | [kibana*] | 0 | +tenant_template | [opensearch-dashboards*] | 0 | ``` To learn more about index templates, see [Index templates]({{site.url}}{{site.baseurl}}/opensearch/index-templates). diff --git a/_security-plugin/access-control/multi-tenancy.md b/_security-plugin/access-control/multi-tenancy.md index a436e5ff..eb8e51cf 100644 --- a/_security-plugin/access-control/multi-tenancy.md +++ b/_security-plugin/access-control/multi-tenancy.md @@ -36,7 +36,7 @@ config: dynamic: opensearch-dashboards: multitenancy_enabled: true - server_username: kibanaserver + server_username: opensearch index: '.opensearch-dashboards' do_not_fail_on_forbidden: false ``` @@ -44,15 +44,15 @@ config: Setting | Description :--- | :--- `multitenancy_enabled` | Enable or disable multi-tenancy. Default is true. -`server_username` | Must match the name of the OpenSearch Dashboards server user from `opensearch_dashboards.yml`. Default is `kibanaserver`. +`server_username` | Must match the name of the OpenSearch Dashboards server user from `opensearch_dashboards.yml`. Default is `dashboardserver`. `index` | Must match the name of the OpenSearch Dashboards index from `opensearch_dashboards.yml`. Default is `.opensearch-dashboards`. `do_not_fail_on_forbidden` | If true, the security plugin removes any content that a user is not allowed to see from search results. If false, the plugin returns a security exception. Default is false. `opensearch_dashboards.yml` has some additional settings: ```yml -opensearch.username: kibanaserver -opensearch.password: kibanaserver +opensearch.username: dashboardserver +opensearch.password: dashboardserver opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: true opensearch_security.multitenancy.tenants.enable_global: true @@ -158,8 +158,8 @@ _meta: The open source version of OpenSearch Dashboards saves all objects to a single index: `.opensearch-dashboards`. The security plugin uses this index for the global tenant, but separate indices for every other tenant. Each user also has a private tenant, so you might see a large number of indices that follow two patterns: ``` -.kibana__ -.kibana__ +.opensearch-dashboards__ +.opensearch-dashboards__ ``` The security plugin scrubs these index names of special characters, so they might not be a perfect match of tenant names and usernames.