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

Author: roygara

articles/azure-arc/servers/concept-log-analytics-extension-deployment.md

@@ -1,20 +1,20 @@
 ---
 title: Deploy Azure Monitor agent on Arc-enabled servers
 description: This article reviews the different methods to deploy the Azure Monitor agent on Windows and Linux-based machines registered with Azure Arc-enabled servers in your local datacenter or other cloud environment.
-ms.date: 09/14/2022
+ms.date: 02/17/2023
 ms.topic: conceptual
 ---
 
-# Understand deployment options for the Azure Monitor agent on Azure Arc-enabled servers
+# Deployment options for Azure Monitor agent on Azure Arc-enabled servers
 
 Azure Monitor supports multiple methods to install the Azure Monitor agent and connect your machine or server registered with Azure Arc-enabled servers to the service. Azure Arc-enabled servers support the Azure VM extension framework, which provides post-deployment configuration and automation tasks, enabling you to simplify management of your hybrid machines like you can with Azure VMs.
 
 The Azure Monitor agent is required if you want to:
 
-* Monitor the operating system and any workloads running on the machine or server using [VM insights](../../azure-monitor/vm/vminsights-overview.md).
-* Analyze and alert using [Azure Monitor](../../azure-monitor/overview.md).
-* Perform security monitoring in Azure by using [Microsoft Defender for Cloud](../../defender-for-cloud/defender-for-cloud-introduction.md) or [Microsoft Sentinel](../../sentinel/overview.md).
-* Collect inventory and track changes by using [Azure Automation Change Tracking and Inventory](../../automation/change-tracking/overview.md).
+* Monitor the operating system and any workloads running on the machine or server using [VM insights](../../azure-monitor/vm/vminsights-overview.md)
+* Analyze and alert using [Azure Monitor](../../azure-monitor/overview.md)
+* Perform security monitoring in Azure by using [Microsoft Defender for Cloud](../../defender-for-cloud/defender-for-cloud-introduction.md) or [Microsoft Sentinel](../../sentinel/overview.md)
+* Collect inventory and track changes by using [Azure Automation Change Tracking and Inventory](../../automation/change-tracking/overview.md)
 
 This article reviews the deployment methods for the Azure Monitor agent VM extension, across multiple production physical servers or virtual machines in your environment, to help you determine which works best for your organization. If you are interested in the new Azure Monitor agent and want to see a detailed comparison, see [Azure Monitor agents overview](../../azure-monitor/agents/agents-overview.md).  
 
@@ -28,15 +28,15 @@ This method supports managing the installation, management, and removal of VM ex
 
 #### Advantages
 
-* Can be useful for testing purposes.
-* Useful if you have a few machines to manage.
+* Can be useful for testing purposes
+* Useful if you have a few machines to manage
 
 #### Disadvantages
 
-* Limited automation when using an Azure Resource Manager template.
-* Can only focus on a single Arc-enabled server, and not multiple instances.
-* Only supports specifying a single workspace to report to. Requires using PowerShell or the Azure CLI to configure the Log Analytics Windows agent VM extension to report to up to four workspaces.
-* Doesn't support deploying the Dependency agent from the portal. You can only use PowerShell, the Azure CLI, or ARM template.
+* Limited automation when using an Azure Resource Manager template
+* Can only focus on a single Arc-enabled server, and not multiple instances
+* Only supports specifying a single workspace to report to; requires using PowerShell or the Azure CLI to configure the Log Analytics Windows agent VM extension to report to up to four workspaces
+* Doesn't support deploying the Dependency agent from the portal; you can only use PowerShell, the Azure CLI, or ARM template
 
 ### Use Azure Policy
 
@@ -46,8 +46,8 @@ Azure Policy includes several prebuilt definitions related to Azure Monitor. For
 
 #### Advantages
 
-* If the VM extension is removed, after policy evaluation it reinstalls it.
-* Identifies and installs the VM extension when a new Azure Arc-enabled server is registered with Azure.
+* Reinstalls the VM extension if removed (after policy evaluation)
+* Identifies and installs the VM extension when a new Azure Arc-enabled server is registered with Azure
 
 #### Disadvantages
 
@@ -60,15 +60,30 @@ The process automation operating environment in Azure Automation and its support
 
 #### Advantages
 
-* Can use a scripted method to automate its deployment and configuration using scripting languages you're familiar with.
-* Runs on a schedule that you define and control.
-* Authenticate securely to Arc-enabled servers from the Automation account using a managed identity.
+* Can use a scripted method to automate its deployment and configuration using scripting languages you're familiar with
+* Runs on a schedule that you define and control
+* Authenticate securely to Arc-enabled servers from the Automation account using a managed identity
 
 #### Disadvantages
 
-* Requires an Azure Automation account.
-* Experience authoring and managing runbooks in Azure Automation.
-* Must create a runbook based on PowerShell or Python, depending on the target operating system.
+* Requires an Azure Automation account
+* Experience authoring and managing runbooks in Azure Automation
+* Must create a runbook based on PowerShell or Python, depending on the target operating system
+
+### Use Azure portal
+
+The Azure Monitor agent VM extension can be installed using the Azure portal. See [Automatic extension upgrade for Azure Arc-enabled servers](manage-automatic-vm-extension-upgrade.md) for more information about installing extensions from the Azure portal.
+
+#### Advantages
+
+* Point and click directly from Azure portal
+* Useful for testing with small set of servers
+* Immediate deployment of extension
+
+#### Disadvantages
+
+* Not scalable to many servers
+* Limited automation
 
 ## Next steps
 

articles/azure-arc/servers/toc.yml

@@ -28,7 +28,7 @@
   items:
     - name: Connected Machine agent overview
       href: agent-overview.md
-    - name: Log Analytics agent deployment options
+    - name: Deploy Azure Monitor agent
       href: concept-log-analytics-extension-deployment.md
     - name: Security
       items:

articles/storage/blobs/blob-containers-portal.md

@@ -225,7 +225,7 @@ To view soft-deleted containers within the [Azure portal](https://portal.azure.c
 1. Navigate to your storage account within the Azure portal and view the list of your containers.
 1. Toggle the **Show deleted containers** switch to include deleted containers in the list.
 
-    :::image type="content" source="media/blob-containers-portal/soft-delete-container-portal-list.png" alt-text="Screenshot showing how to view soft deleted containers within the Azure portal.":::
+    :::image type="content" source="media/blob-containers-portal/soft-delete-container-portal-list.png" alt-text="Screenshot showing how to view soft-deleted containers within the Azure portal.":::
 
 ## Restore a soft-deleted container
 

articles/storage/blobs/blob-inventory.md

@@ -42,7 +42,7 @@ Enable blob inventory reports by adding a policy with one or more rules to your
 
 ## Upgrading an inventory policy
 
-If you are an existing Azure Storage blob inventory user who has configured inventory prior to June 2021, you can start using the new features by loading the policy, and then saving the policy back after making changes. When you reload the policy, the new fields in the policy will be populated with default values. You can change these values if you want. Also, the following two features will be available.
+If you're an existing Azure Storage blob inventory user who has configured inventory prior to June 2021, you can start using the new features by loading the policy, and then saving the policy back after making changes. When you reload the policy, the new fields in the policy will be populated with default values. You can change these values if you want. Also, the following two features will be available.
 
 - A destination container is now supported for every rule instead of just being supported for the policy.
 
@@ -109,12 +109,12 @@ Several filters are available for customizing a blob inventory report:
 
 | Filter name | Filter type | Notes | Required? |
 |--|--|--|--|
-| blobTypes | Array of predefined enum values | Valid values are `blockBlob` and `appendBlob` for hierarchical namespace enabled accounts, and `blockBlob`, `appendBlob`, and `pageBlob` for other accounts. This field is not applicable for inventory on a container, (objectType: `container`). | Yes |
+| blobTypes | Array of predefined enum values | Valid values are `blockBlob` and `appendBlob` for hierarchical namespace enabled accounts, and `blockBlob`, `appendBlob`, and `pageBlob` for other accounts. This field isn't applicable for inventory on a container, (objectType: `container`). | Yes |
 | prefixMatch | Array of up to 10 strings for prefixes to be matched. | If you don't define *prefixMatch* or provide an empty prefix, the rule applies to all blobs within the storage account. A prefix must be a container name prefix or a container name. For example, `container`, `container1/foo`. | No |
 | excludePrefix | Array of up to 10 strings for prefixes to be excluded. | Specifies the blob paths to exclude from the inventory report.<br><br>An *excludePrefix* must be a container name prefix or a container name. An empty *excludePrefix* would mean that all blobs with names matching any *prefixMatch* string will be listed.<br><br>If you want to include a certain prefix, but exclude some specific subset from it, then you could use the excludePrefix filter. For example, if you want to include all blobs under `container-a` except those under the folder `container-a/folder`, then *prefixMatch* should be set to `container-a` and *excludePrefix* should be set to `container-a/folder`. | No |
-| includeSnapshots | boolean | Specifies whether the inventory should include snapshots. Default is `false`. This field is not applicable for inventory on a container, (objectType: `container`). | No |
-| includeBlobVersions | boolean | Specifies whether the inventory should include blob versions. Default is `false`. This field is not applicable for inventory on a container, (objectType: `container`). | No |
-| includeDeleted | boolean | Specifies whether the inventory should include deleted blobs. Default is `false`. In accounts that have a hierarchical namespace, this filter includes folders as well as blobs that are in a soft deleted state. <br><br>Only the folders and files (blobs) that are explicitly deleted appear in reports. Child folders and files that are deleted as a result of deleting a parent folder are not included in the report. | No |
+| includeSnapshots | boolean | Specifies whether the inventory should include snapshots. Default is `false`. This field isn't applicable for inventory on a container, (objectType: `container`). | No |
+| includeBlobVersions | boolean | Specifies whether the inventory should include blob versions. Default is `false`. This field isn't applicable for inventory on a container, (objectType: `container`). | No |
+| includeDeleted | boolean | Specifies whether the inventory should include deleted blobs. Default is `false`. In accounts that have a hierarchical namespace, this filter includes folders and also includes blobs that are in a soft-deleted state. <br><br>Only the folders and files (blobs) that are explicitly deleted appear in reports. Child folders and files that are deleted as a result of deleting a parent folder aren't included in the report. | No |
 
 
 
@@ -254,7 +254,7 @@ If you configure a rule to run daily, then it will be scheduled to run every day
 
 Most inventory runs complete within 24 hours. For hierarchical namespace enabled accounts, a run can take as long as two days, and depending on the number of files being processed, the run might not complete by end of that two days. The maximum amount of time that a run can complete before it fails is six days. 
 
-Runs don't overlap so a run must complete before another run of the same rule can begin. For example, if a rule is scheduled to run daily, but the previous day's run of that same rule is still in progress, then a new run will not be initiated that day. Rules that are scheduled to run weekly will run each Sunday regardless of whether a previous run succeeds or fails. If a run does not complete successfully, check subsequent runs to see if they complete before contacting support. The performance of a run can vary, so if a run doesn't complete, it's possible that subsequent runs will.
+Runs don't overlap so a run must complete before another run of the same rule can begin. For example, if a rule is scheduled to run daily, but the previous day's run of that same rule is still in progress, then a new run won't be initiated that day. Rules that are scheduled to run weekly will run each Sunday regardless of whether a previous run succeeds or fails. If a run doesn't complete successfully, check subsequent runs to see if they complete before contacting support. The performance of a run can vary, so if a run doesn't complete, it's possible that subsequent runs will.
 
 Inventory policies are read or written in full. Partial updates aren't supported. Inventory rules are evaluated daily. Therefore, if you change the definition of a rule, but the rules of a policy have already been evaluated for that day, then your updates won't be evaluated until the following day.
 
@@ -263,7 +263,7 @@ Inventory policies are read or written in full. Partial updates aren't supported
 
 ## Inventory completed event
 
-The `BlobInventoryPolicyCompleted` event is generated when the inventory run completes for a rule. This event also occurs if the inventory run fails with a user error before it starts to run. For example, an invalid policy, or an error that occurs when a destination container is not present will trigger the event. The following json shows an example `BlobInventoryPolicyCompleted` event.
+The `BlobInventoryPolicyCompleted` event is generated when the inventory run completes for a rule. This event also occurs if the inventory run fails with a user error before it starts to run. For example, an invalid policy, or an error that occurs when a destination container isn't present will trigger the event. The following json shows an example `BlobInventoryPolicyCompleted` event.
 
 ```json
 {
@@ -379,7 +379,7 @@ Billing for blob inventory begins on October 1, 2021. Regional pricing will be p
 
 After an inventory report is complete, additional standard data storage and operations charges are incurred for storing, reading, and writing the inventory report in the storage account.
 
-If a rule contains a prefix that overlaps with a prefix of any other rule, then the same blob can appear in more than one inventory report. In this case, you are billed for both instances. For example, assume that the `prefixMatch` element of one rule is set to `["inventory-blob-1", "inventory-blob-2"]`, and the `prefixMatch` element of another rule is set to `["inventory-blob-10", "inventory-blob-20"]`. An object named `inventory-blob-200` appears in both inventory reports.
+If a rule contains a prefix that overlaps with a prefix of any other rule, then the same blob can appear in more than one inventory report. In this case, you're billed for both instances. For example, assume that the `prefixMatch` element of one rule is set to `["inventory-blob-1", "inventory-blob-2"]`, and the `prefixMatch` element of another rule is set to `["inventory-blob-10", "inventory-blob-20"]`. An object named `inventory-blob-200` appears in both inventory reports.
 
 Snapshots and versions of a blob also count towards billing even if you've set `includeSnapshots` and `includeVersions` filters to `false`. Those filter values don't affect billing. You can use them only to filter what appears in the report.
 
@@ -405,11 +405,11 @@ An inventory job can take a longer amount of time in these cases:
 
 - In inventory run is processing a large amount of data in hierarchical namespace enabled accounts
 
-  An inventory job might take more than one day to complete for hierarchal namespace enabled accounts that have hundreds of millions of blobs. Sometimes the inventory job fails and doesn't create an inventory file. If a job doesn't complete successfully, check subsequent jobs to see if they are complete before contacting support. 
+  An inventory job might take more than one day to complete for hierarchical namespace enabled accounts that have hundreds of millions of blobs. Sometimes the inventory job fails and doesn't create an inventory file. If a job doesn't complete successfully, check subsequent jobs to see if they're complete before contacting support.
 
 #### Inventory jobs can't write reports to containers that have an object replication policy
 
-An object replication policy can prevent an inventory job from writing inventory reports to the destination container. Some other scenarios can archive the reports or make the reports immutable when they are partially completed which can cause inventory jobs to fail.
+An object replication policy can prevent an inventory job from writing inventory reports to the destination container. Some other scenarios can archive the reports or make the reports immutable when they're partially completed which can cause inventory jobs to fail.
 
 ## Next steps