Merge branch 'develop' into jhagan-add-memorable-icons-to-om-dg-guide

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

@@ -3,7 +3,7 @@ title: Migrate your users to the New Relic One user model
 metaDescription: "For New Relic organizations with users on our original user model: how to migrate your users to our new model."
 ---
 
-Starting April 12 of 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.
+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.
 
 ## Background [#background]
 
@@ -113,29 +113,32 @@ Here's more detail about the two authentication domain sections:
 
 ### Managing users [#managing-users]
 
-For how users are added and managed, you can select **Manually** or **Identity provider**. 
+For how users are added and managed, you can select **Manually** or **Identity provider** (SCIM). The option to use your identity provider to provision users via SCIM is available only if your organization has [Pro or Enterprise edition](https://newrelic.com/pricing). 
 
-The option to use your identity provider to provision users is available only if your organization has [Pro or Enterprise edition](https://newrelic.com/pricing). If you choose **Identity provider**, you must follow [additional steps for using specific identity providers](/docs/accounts/accounts/automated-user-management/automated-user-provisioning-single-sign). Once you do that, these users are created on the new user model and synced in New Relic based on your identity provider configuration. 
+If you choose **Identity provider**, **you must follow the [steps for automated user management](/docs/accounts/accounts/automated-user-management/automated-user-provisioning-single-sign#how-to)**. Once you complete those steps return to the user migration wizard and docs. Once you complete this step, we highly recommend completing the user migration process as quickly as you can. If you don't complete the later steps of migrating assets and deleting the original user record, your users 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).  
 
-Note that if you're already using an app made by Okta, Azure, or OneLogin, you'll probably need to use a newer version made for New Relic's newer user model. For more on this, see [Identity provider apps](#idp-apps).
+Some tips for syncing your identity provider with New Relic and setting up access grants: 
+* If you're already using a New Relic app for either Okta, Azure, or OneLogin, you're likely using an out-of-date version. The out-of-date app is titled "New Relic by account" while the newer, required app is titled "New Relic by organization."
+* Once you complete those steps, new user records are created on the new user model and synced in New Relic based on your identity provider configuration. After you complete provisioning users, confirm that you see those user records in the new [**User management** UI](#manage-users). Later, at step #6, you'll migrate your existing users' assets (dashboards, favorites, etc.) to the newly created user records. 
+* To access the new New Relic user management UI, you must be logged in via your new user record: this may require logging out, logging back in, and verifying your email to see all the logins associated with your email. 
+* When your identity provider is synced with New Relic and your users and groups are in New Relic, you must set up access grants. For some basics of how access grants work, see [Access grants](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#understand-concepts). For a tutorial, see the [user management tutorial](/docs/accounts/accounts-billing/new-relic-one-user-management/tutorial-add-new-user-groups-roles-new-relic-one-user-model/#group-access).
+* Note that you won't be able to edit users or groups in New Relic: all user and group changes must be done from your identity provider. 
 
-After you complete provisioning users, you can confirm that these users have been added by seeing if they’re in the new [**User management** UI](#manage-users).
-
-If you’ve selected the guided workflow, we’ll match these users by email address. There will be no need to later complete the user import step for these users given they’ll have been brought into New Relic via your identity provider. When done, you can skip ahead to the **Migrate assets** step.
+When done, you can skip ahead to Step #5. 
 
 ### Login methods [#login-methods]
 
 If you chose **Manually** for [managing users](#managing-users), you have a choice for how those users log in. You can select either a) email/password login or b) single sign on (SSO). Note that SSO is available only for organizations with Pro or Enterprise edition.
 
 You can select multiple authentication methods based on your needs. For example, you might use SSO for your employees and username/password for contractors. 
 
-If you select SSO, you must complete [additional configuration steps](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#saml). You can complete the procedure for setting up SSO, and then come back to the migration wizard to continue the migration process. If you select more than one authentication method, note that you’ll need to add a new [authentication domain](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#auth-domain-definition).
-
-Note that if you're already using an identity provider's New Relic app, you'll probably need to use a newer version made for New Relic's newer user model. For more on this, see [Identity provider apps](#idp-apps), below. 
+If you select SSO, you must complete [additional configuration steps](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#saml). Some tips for doing this: 
 
-### A note about identity provider apps [#idp-apps]
+* If you're already using a New Relic app for either Okta, Azure, or OneLogin, you're likely using an out-of-date version. The out-of-date app is titled "New Relic by account" while the newer, required app is titled "New Relic by organization."
+* To access the new New Relic user management UI, you'll have to ensure you're logged in via your new user record. This may require logging out, logging back in, and verifying your email to see all logins associated with that email. 
+* You can complete the procedure for setting up SSO, and then come back to the migration wizard to continue the migration process. 
+* If you select more than one authentication method, note that you’ll need to add a new [authentication domain](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#auth-domain-definition).
 
-Okta, Azure, and OneLogin have New Relic apps for both the original user model and the New Relic One user model. The original apps are titled "New Relic by account" while the newer apps are titled "New Relic by organization." If you're already using one of the New Relic apps, it's likely made for the original user model, which means you'll need to set up a new app. 
 
 ## Step 5: Import existing users [#import-users]
 
@@ -146,7 +149,7 @@ There are two methods for adding and managing your New Relic users. Select the m
 <CollapserGroup>
   <Collapser
     id="manual-provision"
-    title="Add and manage users from the New Relic UI"
+    title="Add and manage users manually from New Relic UI"
   >
 **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. You can also use this list to help you figure out which users have access to which accounts, and also help you create groups and access grants during a later step.
 
@@ -156,7 +159,7 @@ When you reupload your list of users and complete this step, it will create user
 
 Once you complete this step and create new user records, we highly recommend completing the remainder of the migration process as quickly as you can. If you don't complete the steps for migrating assets and deleting the original user record, your users 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).  
 
-Some tips and considerations: 
+Some tips: 
 * There's no need to reset passwords. If using username/password for your users' login, they'll have the same login credentials for the new user records created for them. If a user has a pending email verification status (pending being verified), that will also be transitioned over. 
 * 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. 
 
@@ -167,28 +170,23 @@ Some tips and considerations:
   >   
 **Recommended**: We recommend downloading the list of your existing original user model users. This can be a useful resource and serve as a backup, if needed. You can also use this list to help you figure out which users have access to which accounts, and also help you create groups and access grants during a later step.
 
-In a previous step (step #4), you set up your identity provider to add your users in New Relic. This means you don't have to upload a list of users for this step. Note that you won't be able to edit users or groups in New Relic: all user and group changes must be done from your identity provider. 
-
-We highly recommend completing the remainder of the migration process as quickly as you can. If you don't complete the steps for migrating assets and deleting the original user record, your users 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).  
-
-  </Collapser>
+In a previous step (step #4), you should have completed [the steps for syncing your identity provider with New Relic](/docs/accounts/accounts/automated-user-management/automated-user-provisioning-single-sign/#how-to) so that you can see the groups and users from your identity provider in New Relic. If you haven't already done that, do that now. Becasue your groups and users are synced between your identity provider and New Relic, you don't need to upload your users for this step. 
+      </Collapser>
   </CollapserGroup>
 
 ## Step 6: Access settings [#access-settings]
 
 ![User migration page 6](./images/user-migration-page-6.png "user-migration-page-6.png")
 
-This step allows you to determine the level of access your users have. If you need to map user access to specific accounts and roles, then you'll want to set up groups and access grants at this stage. 
-
-You'll need to create an access grant for each account that you want a group to have access to. For example, a DevOps group might have five different access grants, each giving the group access to a different account.  
+This step is about setting what roles and what accounts your user groups have access to. If you need to map user access to specific accounts and roles, then you'll want to set up groups and access grants at this stage. (If you've previously set up access grants as part of your SCIM setup in step #4, you can skip this step.)
 
-This procedure is done separately from the user migration wizard procedure. For more on how to create access grants, see the [user management tutorial](/docs/accounts/accounts-billing/new-relic-one-user-management/tutorial-add-new-user-groups-roles-new-relic-one-user-model/#group-access).
+You'll need to create an access grant for each account and role that you want a group to have access to. For some basics of how access grants work, see [Access grants](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#understand-concepts). For a tutorial on how to create access grants, see the [user management tutorial](/docs/accounts/accounts-billing/new-relic-one-user-management/tutorial-add-new-user-groups-roles-new-relic-one-user-model/#group-access).
 
 ## Step 7: Migrate user assets [#migrate-assets]
 
 ![User migration page 7](./images/user-migration-page-7.png "user-migration-page-7.png")
 
-Upon completion of this step, personal assets are migrated to new user records and the original user record is deleted. For users currently logged in to New Relic, once you complete this step, their current New Relic session won't be interrupted until they log out or until their current browser session expires.
+When this step is completed, the personal assets of your users are migrated to the new user records and the original user records are deleted. For users currently logged in to New Relic, once you complete this step, their current New Relic session won't be interrupted until they log out or until their current browser session expires.
 
 User assets that are migrated include: 
 

src/content/docs/apm/agents/java-agent/getting-started/compatibility-requirements-java-agent.mdx

@@ -378,7 +378,7 @@ The agent automatically instruments these frameworks and libraries:
       - Scala 2.12: 0.21 - 0.22.0-M8
       - Scala 2.13: 0.21 - 0.22.0-M8
     * HttpAsyncClient 4.1 to latest
-    * Apache Httpclient from 3.0 to latest
+    * Apache Httpclient from 3.0 to 4.5.x
     * java.net.HttpURLConnection
     * JMS and Spring-JMS 1.1 to latest
     * [Kafka Clients](/docs/agents/java-agent/instrumentation/use-kafka-message-queues) 0.10.0.0 to 2.8.1 (for metric and event data)

src/content/docs/apm/agents/net-agent/azure-troubleshooting/azure-cloud-services-no-data-appears.mdx → src/content/docs/apm/agents/net-agent/azure-installation/azure-cloud-services-no-data-appears.mdx

@@ -1,12 +1,14 @@
 ---
-title: 'Azure Cloud Services: No data appears'
+title: 'Azure Cloud Services troubleshooting: No data appears'
 tags:
   - Agents
   - NET agent
   - Azure troubleshooting
-metaDescription: Use the .NET agent's custom instrumentation so Microsoft Azure Worker roles can report database and external calls in the APM UI.
+metaDescription: 'What to do if no data appears after you install the New Relic .NET agent through Microsoft Azure Cloud Services.'
 redirects:
   - /docs/agents/net-agent/azure-troubleshooting/azure-cloud-services-no-data-appears
+  - /docs/apm/agents/net-agent/azure-troubleshooting/azure-cloud-services-no-data-appears
+  - /docs/agents/net-agent/azure-installation/azure-troubleshooting
 ---
 
 ## Problem

src/content/docs/apm/agents/net-agent/azure-troubleshooting/azure-web-apps-profiler-dll-locks-during-deployment.mdx → src/content/docs/apm/agents/net-agent/azure-installation/azure-web-apps-profiler-dll-locks-during-deployment.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Azure Web Apps: Profiler .dll locks during deployment'
+title: 'Azure Web Apps troubleshooting: Profiler .dll locks during deployment'
 tags:
   - Agents
   - NET agent
@@ -8,6 +8,7 @@ metaDescription: 'New Relic .NET agent: Options if your profiler dll locks when
 redirects:
   - /docs/agents/net-agent/azure-troubleshooting/azure-web-apps-profiler-dll-locks-during-deployment
   - /docs/agents/net-agent/azure-troubleshooting/azure-web-apps-profiler-dll-locks
+  - /docs/apm/agents/net-agent/azure-troubleshooting/azure-web-apps-profiler-dll-locks-during-deployment
 ---
 
 ## Problem

src/content/docs/apm/agents/net-agent/azure-troubleshooting/azure-web-apps-unable-open-log-file.mdx → src/content/docs/apm/agents/net-agent/azure-installation/azure-web-apps-unable-open-log-file.mdx

@@ -1,12 +1,13 @@
 ---
-title: 'Azure Web Apps: Unable to open log file'
+title: 'Azure Web Apps troubleshooting: Unable to open log file'
 tags:
   - Agents
   - NET agent
   - Azure troubleshooting
 metaDescription: 'New Relic .NET agent: If a profile log exists for your Azure Web App but you cannot view it, restart your web app.'
 redirects:
   - /docs/agents/net-agent/azure-troubleshooting/azure-web-apps-unable-open-log-file
+  - /docs/apm/agents/net-agent/azure-troubleshooting/azure-web-apps-unable-open-log-file
 ---
 
 ## Problem