Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: MicrosoftGuyJFlo

articles/active-directory/enterprise-users/groups-restore-deleted.md

@@ -16,17 +16,17 @@ ms.collection: M365-identity-device-management
 ---
 # Restore a deleted Microsoft 365 group in Azure Active Directory
 
-When you delete a Microsoft 365 group in Azure Active Directory (Azure AD), part of Microsoft Entra, the deleted group is retained but not visible for 30 days from the deletion date. This behavior is so that the group and its contents can be restored if needed. This functionality is restricted exclusively to Microsoft 365 groups in Azure AD. It is not available for security groups and distribution groups. Please note that the 30-day group restoration period is not customizable.
+When you delete a Microsoft 365 group in Azure Active Directory (Azure AD), part of Microsoft Entra, the deleted group is retained but not visible for 30 days from the deletion date. This behavior is so that the group and its contents can be restored if needed. This functionality is restricted exclusively to Microsoft 365 groups in Azure AD. It isn't available for security groups and distribution groups. Please note that the 30-day group restoration period isn't customizable.
 
 > [!NOTE]
-> Don't use `Remove-MsolGroup` because it purges the group permanently. Always use `Remove-AzureADMSGroup` to delete a Microsoft 365 group.
+> Don't use `Remove-MsolGroup` because it purges the group permanently. Always use `Remove-MgBetaGroup` to delete a Microsoft 365 group.
 
 The permissions required to restore a group can be any of the following:
 
 Role | Permissions
 --------- | ---------
-Global administrator, Group administrator, Partner Tier2 support, and Intune administrator | Can restore any deleted Microsoft 365 group
-User administrator and Partner Tier1 support | Can restore any deleted Microsoft 365 group except those groups assigned to the Global Administrator role
+Global administrator, Group administrator, Partner Tier 2 support, and Intune administrator | Can restore any deleted Microsoft 365 group
+User administrator and Partner Tier 1 support | Can restore any deleted Microsoft 365 group except those groups assigned to the Global Administrator role
 User | Can restore any deleted Microsoft 365 group that they own
 
 ## View and manage the deleted Microsoft 365 groups that are available to restore
@@ -46,19 +46,21 @@ User | Can restore any deleted Microsoft 365 group that they own
 
 ## View the deleted Microsoft 365 groups that are available to restore using PowerShell
 
-The following cmdlets can be used to view the deleted groups to verify that the one or ones you're interested in have not yet been permanently purged. These cmdlets are part of the [Azure AD PowerShell module](https://www.powershellgallery.com/packages/AzureAD/). More information about this module can be found in the [Azure Active Directory PowerShell Version 2](/powershell/azure/active-directory/install-adv2) article.
+The following cmdlets can be used to view the deleted groups to verify that the one or ones you're interested in haven't yet been permanently purged. These cmdlets are part of the [Microsoft Graph PowerShell module](/powershell/microsoftgraph/installation?view=graph-powershell-1.0&preserve-view=true). More information about this module can be found in the [Microsoft Graph PowerShell overview](/powershell/microsoftgraph/overview?view=graph-powershell-1.0&preserve-view=true) article.
 
-1.  Run the following cmdlet to display all deleted Microsoft 365 groups in your Azure AD organization that are still available to restore.
+1.  Run the following cmdlet to display all deleted Microsoft 365 groups in your Azure AD organization that are still available to restore. Please install the [Graph](/powershell/microsoftgraph/installation?view=graph-powershell-1.0&preserve-view=true) beta version if it isn't already installed on the machine.
 
 
     ```powershell
-    Get-AzureADMSDeletedGroup
+    Install-Module Microsoft.Graph.Beta
+    Connect-MgGraph -Scopes "Group.ReadWrite.All"
+    Get-MgBetaDirectoryDeletedGroup
     ```
 
-2.  Alternately, if you know the objectID of a specific group (and you can get it from the cmdlet in step 1), run the following cmdlet to verify that the specific deleted group has not yet been permanently purged.
+2.  Alternately, if you know the objectID of a specific group (and you can get it from the cmdlet in step 1), run the following cmdlet to verify that the specific deleted group hasn't yet been permanently purged.
 
-    ```
-    Get-AzureADMSDeletedGroup –Id <objectId>
+    ```powershell
+    Get-MgBetaDirectoryDeletedGroup -DirectoryObjectId <objectId>
     ```
 
 ## How to restore your deleted Microsoft 365 group using 
@@ -68,20 +70,20 @@ Once you have verified that the group is still available to restore, restore the
 1. Run the following cmdlet to restore the group and its contents.
  
 
-   ```
-    Restore-AzureADMSDeletedDirectoryObject –Id <objectId>
+   ```powershell    
+    Restore-MgBetaDirectoryDeletedItem -DirectoryObjectId <objectId>
     ``` 
 
 2. Alternatively, the following cmdlet can be run to permanently remove the deleted group.
     
 
-    ```
-    Remove-AzureADMSDeletedDirectoryObject –Id <objectId>
+    ```powershell
+    Remove-MgBetaDirectoryDeletedItem -DirectoryObjectId <objectId>
     ```
 
 ## How do you know this worked?
 
-To verify that you’ve successfully restored a Microsoft 365 group, run the `Get-AzureADGroup –ObjectId <objectId>` cmdlet to display information about the group. After the restore request is completed:
+To verify that you’ve successfully restored a Microsoft 365 group, run the `Get-MgBetaGroup –GroupId <objectId>` cmdlet to display information about the group. After the restore request is completed:
 
 - The group appears in the Left navigation bar on Exchange
 - The plan for the group will appear in Planner

articles/active-directory/enterprise-users/groups-troubleshooting.md

@@ -21,19 +21,32 @@ This article contains troubleshooting information for groups in Azure Active Dir
 ## Troubleshooting group creation issues
 
 **I disabled security group creation in the Azure portal but groups can still be created via PowerShell**  
-The **User can create security groups in Azure portals** setting in the Azure portal controls whether or not non-admin users can create security groups in the Access panel or the Azure portal. It does not control security group creation via PowerShell.
+The **User can create security groups in Azure portals** setting in the Azure portal controls whether or not nonadmin users can create security groups in the Access panel or the Azure portal. It does not control security group creation via PowerShell.
 
-To disable group creation for non-admin users in PowerShell:
-1. Verify that non-admin users are allowed to create groups:
+To disable group creation for nonadmin users in PowerShell:
+1. Verify that nonadmin users are allowed to create groups:
 
    ```powershell
-   Get-MsolCompanyInformation | Format-List UsersPermissionToCreateGroupsEnabled
+   Get-MgBetaDirectorySetting | select -ExpandProperty values
    ```
 
-2. If it returns `UsersPermissionToCreateGroupsEnabled : True`, then non-admin users can create groups. To disable this feature:
+2. If it returns `EnableGroupCreation : True`, then nonadmin users can create groups. To disable this feature:
 
    ```powershell
-   Set-MsolCompanySettings -UsersPermissionToCreateGroupsEnabled $False
+    Install-Module Microsoft.Graph.Beta.Identity.DirectoryManagement
+    Import-Module Microsoft.Graph.Beta.Identity.DirectoryManagement
+    $params = @{
+	TemplateId = "62375ab9-6b52-47ed-826b-58e47e0e304b"
+	Values = @(		
+		@{
+			Name = "EnableGroupCreation"
+			Value = "false"
+		}		
+	)
+    }
+    Connect-MgGraph -Scopes "Directory.ReadWrite.All"
+    New-MgBetaDirectorySetting -BodyParameter $params
+    
    ```
 
 **I received a max groups allowed error when trying to create a Dynamic Group in PowerShell**  
@@ -46,7 +59,7 @@ To create any new Dynamic groups, you'll first need to delete some existing Dyna
 **I configured a rule on a group but no memberships get updated in the group**  
 1. Verify the values for user or device attributes in the rule. Ensure there are users that satisfy the rule.
 For devices, check the device properties to ensure any synced attributes contain the expected values.  
-2. Check the membership processing status to confirm if it is complete. You can check the [membership processing status](groups-create-rule.md#check-processing-status-for-a-rule) and the last updated date on the **Overview** page for the group.
+2. Check the membership processing status to confirm if it's complete. You can check the [membership processing status](groups-create-rule.md#check-processing-status-for-a-rule) and the last updated date on the **Overview** page for the group.
 
 If everything looks good, please allow some time for the group to populate. Depending on the size of your Azure AD organization, the group may take up to 24 hours for populating for the first time or after a rule change.
 
@@ -57,15 +70,15 @@ This is expected behavior. Existing members of the group are removed when a rule
 Dedicated membership evaluation is done periodically in an asynchronous background process. How long the process takes is determined by the number of users in your directory and the size of the group created as a result of the rule. Typically, directories with small numbers of users will see the group membership changes in less than a few minutes. Directories with a large number of users can take 30 minutes or longer to populate.
 
 **How can I force the group to be processed now?**  
-Currently, there is no way to automatically trigger the group to be processed on demand. However, you can manually trigger the reprocessing by updating the membership rule to add a whitespace at the end.
+Currently, there's no way to automatically trigger the group to be processed on demand. However, you can manually trigger the reprocessing by updating the membership rule to add a whitespace at the end.
 
 **I encountered a rule processing error**  
 The following table lists common dynamic membership rule errors and how to correct them.
 
 | Rule parser error | Error usage | Corrected usage |
 | --- | --- | --- |
 | Error: Attribute not supported. |(user.invalidProperty -eq "Value") |(user.department -eq "value")<br/><br/>Make sure the attribute is on the [supported properties list](groups-dynamic-membership.md#supported-properties). |
-| Error: Operator is not supported on attribute. |(user.accountEnabled -contains true) |(user.accountEnabled -eq true)<br/><br/>The operator used is not supported for the property type (in this example, -contains cannot be used on type boolean). Use the correct operators for the property type. |
+| Error: Operator isn't supported on attribute. |(user.accountEnabled -contains true) |(user.accountEnabled -eq true)<br/><br/>The operator used isn't supported for the property type (in this example, -contains can't be used on type boolean). Use the correct operators for the property type. |
 | Error: Query compilation error. | 1. (user.department -eq "Sales") (user.department -eq "Marketing")<br>2. (user.userPrincipalName -match "\*@domain.ext") | 1. Missing operator. Use -and or -or to join predicates<br>(user.department -eq "Sales") -or (user.department -eq "Marketing")<br>2. Error in regular expression used with -match<br>(user.userPrincipalName -match ".\*@domain.ext")<br>or alternatively: (user.userPrincipalName -match "@domain.ext$") |
 
 ## Next steps

articles/active-directory/enterprise-users/users-bulk-add.md

@@ -91,7 +91,7 @@ Next, you can check to see that the users you created exist in the Azure AD orga
 Run the following command:
 
 ``` PowerShell
-Get-AzureADUser -Filter "UserType eq 'Member'"
+Get-MgUser -Filter "UserType eq 'Member'"
 ```
 
 You should see that the users that you created are listed.

articles/active-directory/enterprise-users/users-bulk-delete.md

@@ -71,7 +71,7 @@ Next, you can check to see that the users you deleted exist in the Azure AD orga
 Run the following command:
 
 ``` PowerShell
-Get-AzureADUser -Filter "UserType eq 'Member'"
+Get-MgUser -Filter "UserType eq 'Member'"
 ```
 
 Verify that the users that you deleted are no longer listed.

articles/azure-monitor/app/codeless-overview.md

@@ -46,16 +46,14 @@ Links are provided to more information for each supported scenario.
 
 ## JavaScript (Web) SDK Loader Script injection by configuration
 
-If you’re using the following supported SDKs, you can configure the JavaScript (Web) SDK Loader Script to inject from the server-side SDK onto each page.
+When using supported SDKs, you can enable SDK injection in configuration to automatically inject JavaScript (Web) SDK Loader Script onto each page.
 
-> [!NOTE]
-> See the linked article for instructions on how to install the server-side SDK.
 
-   | SDK   | More information
-   |	:---	|	:---	|
-   | ASP.NET Core | [Enable client-side telemetry for web applications](./asp-net-core.md?tabs=netcorenew%2Cnetcore6#enable-client-side-telemetry-for-web-applications) |
-   | Node.js | [Automatic web Instrumentation](./nodejs.md#automatic-web-instrumentationpreview) |
-   | Java | [Browser SDK Loader](./java-standalone-config.md#browser-sdk-loader-preview) |
+   | Language   
+   |	:---	|
+   | [ASP.NET Core](./asp-net-core.md?tabs=netcorenew%2Cnetcore6#enable-client-side-telemetry-for-web-applications) |
+   | [Node.js](./nodejs.md#automatic-web-instrumentationpreview) |
+   | [Java](./java-standalone-config.md#browser-sdk-loader-preview) |
 
 For other methods to instrument your application with the Application Insights JavaScript SDK, see [Get started with the JavaScript SDK](./javascript-sdk.md).
 

articles/data-factory/connector-mongodb.md

@@ -8,7 +8,7 @@ ms.service: data-factory
 ms.subservice: data-movement
 ms.topic: conceptual
 ms.custom: synapse, ignite-2022
-ms.date: 10/25/2022
+ms.date: 07/24/2023
 ---
 
 # Copy data from or to MongoDB using Azure Data Factory or Synapse Analytics
@@ -251,6 +251,20 @@ To achieve such schema-agnostic copy, skip the "structure" (also called *schema*
 
 To copy data from MongoDB to tabular sink or reversed, refer to [schema mapping](copy-activity-schema-and-type-mapping.md#schema-mapping).
 
+## Upgrade the MongoDB linked service
+
+Here are steps that help you upgrade your linked service and related queries:
+
+1. Create a new MongoDB linked service and configure it by referring to [Linked service properties](#linked-service-properties).
+1. If you use SQL queries in your pipelines that refer to the old MongoDB linked service, replace them with the equivalent MongoDB queries. See the following table for the replacement examples:
+
+    | SQL query | Equivalent MongoDB query | 
+    |:--- |:--- |
+    | `SELECT * FROM users` | `db.users.find({})` |
+    | `SELECT username, age FROM users` |`db.users.find({}, {username: 1, age: 1})` |
+    | `SELECT username AS User, age AS Age, statusNumber AS Status, CASE WHEN Status = 0 THEN "Pending" CASE WHEN Status = 1 THEN "Finished" ELSE "Unknown" END AS statusEnum LastUpdatedTime + interval '2' hour AS NewLastUpdatedTime FROM users` | `db.users.aggregate([{ $project: { _id: 0, User: "$username", Age: "$age", Status: "$statusNumber", statusEnum: { $switch: { branches: [ { case: { $eq: ["$Status", 0] }, then: "Pending" }, { case: { $eq: ["$Status", 1] }, then: "Finished" } ], default: "Unknown" } }, NewLastUpdatedTime: { $add: ["$LastUpdatedTime", 2 * 60 * 60 * 1000] } } }])`|
+    | `SELECT employees.name, departments.name AS department_name FROM employees LEFT JOIN departments ON employees.department_id = departments.id;`|`db.employees.aggregate([ { $lookup: { from: "departments", localField: "department_id", foreignField: "_id", as: "department" } }, { $unwind: "$department" }, { $project: { _id: 0, name: 1, department_name: "$department.name" } } ])` |
+
 
 ## Next steps
 For a list of data stores supported as sources and sinks by the copy activity, see [supported data stores](copy-activity-overview.md#supported-data-stores-and-formats).

articles/data-factory/connector-troubleshoot-mongodb.md

@@ -1,12 +1,12 @@
 ---
-title: Troubleshoot the mongodb connector
+title: Troubleshoot the MongoDB connector
 titleSuffix: Azure Data Factory & Azure Synapse
-description: Learn how to troubleshoot issues with the mongodb connector in Azure Data Factory and Azure Synapse Analytics. 
+description: Learn how to troubleshoot issues with the MongoDB connector in Azure Data Factory and Azure Synapse Analytics. 
 author: jianleishen
 ms.service: data-factory
 ms.subservice: data-movement
 ms.topic: troubleshooting
-ms.date: 12/02/2022
+ms.date: 07/24/2023
 ms.author: jianleishen
 ms.custom: has-adal-ref, synapse
 ---
@@ -28,6 +28,18 @@ This article provides suggestions to troubleshoot common problems with the Mongo
 
 - **Resolution**: In the MongoDB connection string, add the *uuidRepresentation=standard* option. For more information, see [MongoDB connection string](connector-mongodb.md#linked-service-properties).
 
+## Migrate to the new version of MongoDB connector
+
+- **Symptoms**: You meet the following error code and error message:
+    - **Error code**: `DeprecatedMongoDbOdbcConnector`
+    - **Error message**: `The legacy MongoDB connector has been deprecated. To ensure your pipeline works, please create a new MongoDB linked service. Detailed instructions can be found in this documentation: https://learn.microsoft.com/azure/data-factory/connector-mongodb#upgrade-the-mongodb-linked-service`
+
+- **Cause**: 
+    Your pipeline is still running on a legacy MongoDB connector that causes the error. 
+
+- **Resolution**: 
+    Upgrade your MongoDB linked service to the latest version. Refer to this [article](connector-mongodb.md#upgrade-the-mongodb-linked-service).
+
 ## Next steps
 
 For more troubleshooting help, try these resources:

articles/ddos-protection/ddos-protection-overview.md

@@ -35,9 +35,9 @@ Azure DDoS Protection applies three auto-tuned mitigation policies (TCP SYN, TCP
 ### Azure DDoS Rapid Response
  During an active attack, Azure DDoS Protection customers have access to the DDoS Rapid Response (DRR) team, who can help with attack investigation during an attack and post-attack analysis. For more information, see [Azure DDoS Rapid Response](ddos-rapid-response.md).
 
-## SKU
+## Tier
 
-Azure DDoS Protection is offered in two available SKUs, DDoS IP Protection and DDoS Network Protection. For more information about the SKUs, see [SKU comparison](ddos-protection-sku-comparison.md).
+Azure DDoS Protection is offered in two available tiers, DDoS IP Protection and DDoS Network Protection. For more information about the tiers, see [Tier comparison](ddos-protection-sku-comparison.md).
 
 
 ### Native platform integration

articles/ddos-protection/index.yml

@@ -23,7 +23,7 @@ landingContent:
         links:
           - text: What is Azure DDoS Protection?
             url: ddos-protection-overview.md
-          - text: Azure DDoS Protection SKU comparison
+          - text: Azure DDoS Protection tier comparison
             url: ddos-protection-sku-comparison.md
           - text: Pricing
             url: https://azure.microsoft.com/en-us/pricing/details/ddos-protection/

articles/defender-for-cloud/TOC.yml

@@ -79,6 +79,9 @@
         href: tutorial-enable-container-aws.md
       - name: Protect your Google Cloud Platform (GCP) project containers
         href: tutorial-enable-container-gcp.md
+      - name: How to enable Defender for Containers components
+        displayName: kubernetes, aks, acr, registries, k8s, arc, hybrid, on-premises, azure arc, multicloud
+        href: defender-for-containers-enable.md
     - name: Protect your key vaults with Defender for Key Vault
       displayName: enable, key, vault, key vault
       href: tutorial-enable-key-vault-plan.md
@@ -544,9 +547,6 @@
     - name: How does Defender for Containers work?
       displayName: containers
       href: defender-for-containers-architecture.md
-    - name: Enable Defender for Containers
-      displayName: kubernetes, aks, acr, registries, k8s, arc, hybrid, on-premises, azure arc, multicloud
-      href: defender-for-containers-enable.md
     - name: Vulnerability assessment for Azure powered by Qualys
       displayName: ACR, registry, images, qualys
       href: defender-for-containers-vulnerability-assessment-azure.md