Merge branch 'develop' into data_ingest_kh

src/content/docs/accounts/original-accounts-billing/original-users-roles/user-migration.mdx

@@ -1,7 +1,6 @@
 ---
 title: Migrate your users to the New Relic One user model 
-metaDescription: >-
-  For New Relic accounts with users on our original user model: how to migrate your users to our new model.
+metaDescription: "For New Relic accounts with users on our original user model: how to migrate your users to our new model."
 ---
 
 Starting April 12, 2021, we're allowing some customers who have users on our original user model to self-serve and migrate those users to be on the New Relic One user model.
@@ -82,13 +81,14 @@ If you've successfully completed migration, learn [how to manage your users](#ma
 ![User migration page 1](./images/user-migration-page-1.png "user-migration-page-1.png")
 
 Tips: 
+* Check the **Accounts included** dropdown. Note that the user migration will only apply to the account selected. This means if your organization has multiple accounts, you should do the migration process for each of them. 
 * You can either a) import all current admins for your account or b) specify the admins that should have access to user management capabilities. Note that you can add more admin users and edit permissions after you complete the migration process.
 * If you've already used the wizard to set up an admin on the new user model, have the admin sign in using their new user record to access the migration tool. The user migration wizard, when completed, destroys the old user record, but if you've started the user migration process without completing it, you may have users with access to both the original and new record, as shown below: 
 	 ![A screenshot of what is shown when you have an email address associated with multiple New Relic logins](./images/login-multiple-accounts-view.png "Login UI for email addresses with multiple user records")
     <figcaption>
 	  If a user on the new model has been created and the migration process hasn't been completed, they may have access to both the original user record and the new user records. 
     </figcaption>
-* If you plan on migrating only a portion of your users to the new user model to start, we recommend leaving some original user model admins so that you have an admin to manage your users on the original model. 
+* If you plan on migrating only a portion of your users to the new user model to start, we recommend leaving some original user model admins so that you have an admin to manage your original user model users. 
 
 ## Step 2: Set up organization [#page2]
 
@@ -109,7 +109,7 @@ Name your organization something descriptive and easily recognizable.
 
 ![User migration page 4](./images/user-migration-page-4.png "user-migration-page-4.png")
 
-This section controls how users are provisioned (added to New Relic) and how they authenticate (log in). Note that choosing SAML SSO or SCIM setup will require you to exit the migration wizard and configure things elsewhere in the New Relic UI.
+This section controls how users are provisioned (added to New Relic) and how they authenticate (log in). Note that choosing SAML SSO or SCIM setup will require you to exit the migration wizard and configure things elsewhere in the New Relic UI and in your identity provider. 
 
 Here's more detail about the two authentication domain sections: 
 
@@ -145,14 +145,16 @@ Okta, Azure, and OneLogin have New Relic apps for both the original user model a
 
 **Recommended**: Download the full list of existing original user model users before choosing to import users. This will be a useful resource and serve as a backup, if you need it. 
 
-After downloading your original user model users, you can upload all users or just some of them. This step will create user records on the New Relic One user model. In a later step, you’ll be able to transition these users' assets. 
+After downloading your original user model users, you can upload all users or just some of them. We recommend reviewing this list of users and removing any users you don't want migrated (for example, people who no longer work at your organization). 
 
-The new user record that's created has the same login credentials: there is no need to reset passwords. If a user has a pending email verification status (pending being verified), that will also be transitioned over. 
+When you reupload your list of users and complete this step, it will create user records on the New Relic One user model. In a later step, you’ll be able to transition these users' assets. 
+
+The new user records created for your users have the same login credentials: there's no need to reset passwords. If a user has a pending email verification status (pending being verified), that will also be transitioned over. 
 
 Important tips: 
 
 * Ensure the new users' email addresses match their original user record email addresses, including matching exact case. We use email addresses as the key value to match users and, in a later step, to transition their user-associated assets. 
-* Once you complete this step and create new user records, we highly recommend completing the migration process without delay. If you don't complete the steps to migrate assets and delete the original user record, a user may see two user records when logging in (see [login screenshot from Step 1](#page1)) or else may be missing assets they expect to see (like dashboards). 
+* Once you complete this step and create new user records, we highly recommend completing the remainder of the migration process fairly quickly. If you don't complete the steps to migrate assets and delete the original user record, a user may have two user records associated with the same login (see [login screenshot from Step 1](#page1)) or else may be missing assets they expect to see (like dashboards). 
 
 ## Step 6: Access settings [#access-settings]
 
@@ -185,6 +187,15 @@ If a user has access to several organizations that use New Relic (for example, i
 
 If you're migrating users in chunks and not all at once, you can go through the migration workflow several times with different groups of users. You can only click **Finish Setup** when all users in the organization are migrated.
 
+## Troubleshooting [#troubleshooting]
+
+Some common problems after migration: 
+
+* If you have admin-level roles assigned but get an error message when trying to access New Relic platform features, it may be because you've been assigned organization-scoped roles (**Organization manager** and/or **Authentication domain manager**) but not any account-scoped roles. To access New Relic features in a specific account, you'll need at least one account-scoped role (for example, **All product admin** or a custom role). 
+* If you've completed the migration, or are partway through the migration, and still see the original user management UI (the UI accessed through the **Account settings** tab), this may be because you are still logged in to your original user model record. Some remedies for this:
+   * Log out of New Relic and log back in, selecting the **Verify email** option. When you've verified your email, choose the login option that says "Organization" and not the one that says "Original New Relic account."
+   * If you're still having problems, clear your browser cache and attempt logging in again. 
+
 ## After you're done [#manage-users]
 
 Once your users are migrated to the new user model, you can find and manage them by clicking the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#account-dropdown), clicking **Administration**, and using these UI pages: 

src/content/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-integration.mdx

@@ -18,14 +18,14 @@ import ecs from './images/ecs.png';
 
 import kubernetes from './images/kubernetes-k8.png';
 
-Our Elasticsearch [integration](/docs/integrations/host-integrations/getting-started/introduction-host-integrations) collects and sends inventory and metrics from your [Elasticsearch](https://www.elastic.co/) cluster to our platform, where you can see the health of your Elasticsearch environment. We collect metrics at the cluster, node, and index level so you can more easily find the source of any problems.
+Our Elasticsearch integration collects and sends inventory and metrics from your [Elasticsearch](https://www.elastic.co/) cluster to our platform, where you can see the health of your Elasticsearch environment. We collect metrics at the cluster, node, and index level so you can more easily find the source of any problems.
 
 To install the Elasticsearch monitoring integration, run through the following steps:
 
 1. [Configure the integration](#config).
 2. [Install and activate the integration](#install).
 3. [Find and use data](#find-and-use).
-4. Optionally, see [the advanced configuration settings](https://docs.newrelic.com/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config).
+4. Optionally, see the [advanced configuration settings](/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config).
 
 ## Compatibility and requirements [#req]
 
@@ -53,7 +53,7 @@ There are several ways to configure the integration, depending on how it was ins
 
 - If enabled via <ImageSizing width="32px" height="32px">![Kubernetes](./images/kubernetes-k8.png 'Kubernetes')</ImageSizing>Kubernetes, see [Monitor services running on Kubernetes](/docs/monitor-service-running-kubernetes).
 - If enabled via <ImageSizing width="32px" height="32px">![ECS](./images/ecs.png 'ECS')</ImageSizing>Amazon ECS, see [Monitor services running on ECS](/docs/integrations/host-integrations/host-integrations-list/monitor-services-running-amazon-ecs).
-- If installed on-host, edit the config in the integration's YAML config file, `elasticsearch-config.yml`. An integration's YAML-format configuration is where you can place required login credentials and configure how data is collected. Which options you change depend on your setup and preference. The configuration file has common settings applicable to all integrations, such as `interval`, `timeout`, `inventory_source`. To read all about these common settings, refer to our [Configuration Format](/docs/create-integrations/infrastructure-integrations-sdk/specifications/host-integrations-newer-configuration-format/#configuration-basics) document.
+- If installed on-host, edit the config in the integration's YAML config file, `elasticsearch-config.yml`. An integration's YAML-format configuration is where you can place required login credentials and configure how data is collected. Which options you change depend on your setup and preference. The configuration file has common settings applicable to all integrations, such as `interval`, `timeout`, `inventory_source`. To read all about these common settings, refer to our [configuration format](/docs/create-integrations/infrastructure-integrations-sdk/specifications/host-integrations-newer-configuration-format/#configuration-basics) document.
 
 <Callout variant="important">
   If you are still using our legacy configuration or definition files, check the [standard configuration format](/docs/create-integrations/infrastructure-integrations-sdk/specifications/host-integrations-standard-configuration-format/).
@@ -76,7 +76,7 @@ To install the Elasticsearch integration, follow the instructions for your envir
   sudo cp elasticsearch-config.yml.sample elasticsearch-config.yml
   ```
 
-4. Edit the `elasticsearch-config.yml` configuration file with your favorite editor. Check out some [great configuration file examples.](#examples).
+4. Edit the `elasticsearch-config.yml` configuration file with your favorite editor. Check out some [great configuration file examples](#examples).
 5. Restart the infrastructure agent. See how to [restart the infrastructure agent in different Linux environments](/docs/infrastructure/install-infrastructure-agent/manage-your-agent/start-stop-restart-infrastructure-agent/#linux).
 6. To enable automatic Elasticsearch error log parsing and forwarding, copy (or rename) the `elasticsearch-log.yml.example` file to `elasticsearch-log.yml`. No need to restart the agent.
 
@@ -278,10 +278,10 @@ Data from this service is reported to an [integration dashboard](/docs/integrati
 
 Elasticsearch data is attached to the following [event types](/docs/using-new-relic/data/understand-data/new-relic-data-types#events-new-relic):
 
-- [`ElasticsearchClusterSample`](#elasticsearch-cluster-metrics)
-- [`ElasticsearchNodeSample`](#elasticsearch-node-metrics)
-- [`ElasticsearchCommonSample`](#elasticsearch-common-metrics)
-- [`ElasticsearchIndexSample`](#elasticsearch-index-metrics)
+- [`ElasticsearchClusterSample`](/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config#cluster-metrics)
+- [`ElasticsearchNodeSample`](/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config#node-metrics)
+- [`ElasticsearchCommonSample`](/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config#common-metrics)
+- [`ElasticsearchIndexSample`](/docs/infrastructure/host-integrations/host-integrations-list/elasticsearch/elasticsearch-advanced-config#index-metrics)
 
 You can [query this data](/docs/using-new-relic/data/understand-data/query-new-relic-data) for troubleshooting purposes or to create custom charts and dashboards.