Merge pull request #284300 from MicrosoftDocs/main

Publish main to live, Sunday 4:00PM PDT, 08/11

Author: Stacyrch140

articles/azure-monitor/agents/azure-monitor-agent-manage.md

@@ -373,8 +373,7 @@ The AgentSettings DCR currently supports configuring the following parameters:
 
 | Parameter | Description | Valid values |
 | --------- | ----------- | ----------- |
-
-| `DiscQuotaInMb` | Defines the amount of disk space used by the Azure Monitor Agent log files and cache. | 1,000-50,000 (or 1-50 GB) |
+| `MaxDiskQuotaInMB` | Defines the amount of disk space used by the Azure Monitor Agent log files and cache. | 1000-50000 (in MB) |
 | `TimeReceivedForForwardedEvents` | Changes WEF column in the Sentinel WEF table to use TimeReceived instead of TimeGenerated data | 0 or 1 |
 
 ### Setting up AgentSettings DCR
@@ -397,9 +396,9 @@ N/A
 
     [Install AMA](#installation-options) on your VM.
 
-1. **Create a DCR via template deployment:**
+1. **Create a DCR:**
 
-    The following example changes the maximum amount of disk space used by AMA cache to 5 GB.
+    This example sets the maximum amount of disk space used by AMA cache to 5000 MB.
 
     ```json
     {
@@ -431,24 +430,70 @@ N/A
     }
     ```
     
-    > [!NOTE]
-    > You can use the Get DataCollectionRule API to get the DCR payload you created with this template.
-    
-1. **Associate DCR with your machine:**
+1. **Associate the DCR with your machine:**
 
-    This can be done with a template or by using the [Create API](/rest/api/monitor/data-collection-rule-associations/create) with the following details:
-  
-    * **AssociationName:** agentSettings
-    * **ResourceUri:** Full ARM ID of the VM
-    * **api-version:** 2023-03-11 (Old API version is also fine)
-    * **Body:**
-        ```json
-            {
-            "properties": {
-                "dataCollectionRuleId": “Full ARM ID for agent setting DCR”
-                }
-            }
-        ```
+   Use these ARM template and parameter files:
+
+    **ARM template file**
+    
+    ```json
+    {
+      "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+      "contentVersion": "1.0.0.0",
+      "parameters": {
+        "vmName": {
+          "type": "string",
+          "metadata": {
+            "description": "The name of the virtual machine."
+          }
+        },
+        "associationName": {
+          "type": "string",
+          "metadata": {
+            "description": "The name of the association."
+          }
+        },
+        "dataCollectionRuleId": {
+          "type": "string",
+          "metadata": {
+            "description": "The resource ID of the data collection rule."
+          }
+        }
+      },
+      "resources": [
+        {
+          "type": "Microsoft.Insights/dataCollectionRuleAssociations",
+          "apiVersion": "2021-09-01-preview",
+          "scope": "[format('Microsoft.Compute/virtualMachines/{0}', parameters('vmName'))]",
+          "name": "[parameters('associationName')]",
+          "properties": {
+            "description": "Association of data collection rule. Deleting this association will break the data collection for this virtual machine.",
+            "dataCollectionRuleId": "[parameters('dataCollectionRuleId')]"
+          }
+        }
+      ]
+    }
+    ```
+    
+    **Parameter file**
+    
+    ```json
+    {
+      "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+      "contentVersion": "1.0.0.0",
+      "parameters": {
+        "vmName": {
+          "value": "my-azure-vm"
+        },
+        "associationName": {
+          "value": "my-windows-vm-my-dcr"
+        },
+        "dataCollectionRuleId": {
+          "value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/my-resource-group/providers/microsoft.insights/datacollectionrules/my-dcr"
+        }
+       }
+    }
+    ```
 
 1. **Activate the settings:**
 

articles/azure-monitor/app/media/create-workspace-resource/create-workspace-based.png

@@ -71,7 +71,7 @@ Predictive autoscale adheres to the scaling boundaries you've set for your virtu
 
 ## Enable using an Azure Resource Manager template
 
-1. Retrieve the virtual machine scale set resource ID and resource group of your virtual machine scale set.  For example: /subscriptions/e954e48d-abcd-abcd-abcd-3e0353cb45ae/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2
+1. Retrieve the virtual machine scale set resource ID and resource group of your virtual machine scale set.  For example: /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2
 
 1. Update the *autoscale_only_parameters* file with the virtual machine scale set resource ID and any autoscale setting parameters.
 
@@ -81,7 +81,49 @@ Predictive autoscale adheres to the scaling boundaries you've set for your virtu
 PS G:\works\kusto_onboard\test_arm_template> new-azurermresourcegroupdeployment -name binzAutoScaleDeploy -resourcegroupname cpatest2 -templatefile autoscale_only.json -templateparameterfile autoscale_only_parameters.json
 ```
 
-:::image type="content" source="media/autoscale-predictive/powershell-template-7.png" alt-text="Screenshot that shows PowerShell command output from the preceding command when you run Azure Resource Manager templates to deploy predictive autoscale.":::
+
+```powershell
+PS C:\works\autoscale\predictive_autoscale\arm_template> new-azurermresourcegroupdeployment -name binzAutoScaleDeploy - resourcegroupname patest2 -templatefile autoscale_only_binz.json -templateparameterfile autoscale_only_parameters_binz.json
+
+        DeploymentName        : binzAutoScaleDeploy
+        ResourceGroupName     : patest2
+        ProvisioningState     : Succeeded
+        Timestamp             : 3/30/2021 10:11:02 PM
+        Mode                  : Incremental
+        TemplateLink
+        Parameters            :
+
+                                Name              Type                           Value
+                                ================  =============================  ====================
+                                targetVmssResourceld String	                        /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2
+                                location	      String                         East US
+                                minimumCapacity   Int                            1
+                                maximumCapacity   Int                            4
+                                defaultCapacity   Int                            4
+                                metricThresholdToScaleOut  Int                             50
+                                metricTimeWindowForScaleOut  String                          PT5M
+                                metricThresholdToScaleln  Int                              30   
+                                metricTimeWindowForScaleln  String                           PT5M 
+                                changeCountScaleOut  Int                             1
+                                changeCountScaleln  Int                             1
+                                predictiveAutoscaleMode String                            Enabled
+                           
+Outputs                        :
+                                Name              Type                           Value
+                                ================  ============================== ====================
+                            
+                                targetVmssResourceld  String	/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2 
+                                settingLocation  String	                        East US
+                                predictiveAutoscaleMode  String	                    Enabled
+
+DeloymentDebugLoglevel         :
+
+PS C:\works\autoscale\predictive_autoscale\arm_template>
+
+```
+
+
+
 
 **autoscale_only.json**
 ```json
@@ -253,7 +295,7 @@ PS G:\works\kusto_onboard\test_arm_template> new-azurermresourcegroupdeployment
     "contentVersion": "1.0.0.0",
 	"parameters": {
 		"targetVmssResourceId": {
-			"value": "/subscriptions/e954e48d-b252-b252-b252-3e0353cb45ae/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2"
+			"value": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/patest2/providers/Microsoft.Compute/virtualMachineScaleSets/patest2"
 		},
 		"location": {
 			"value": "East US"

articles/azure-monitor/autoscale/autoscale-predictive.md

@@ -14,7 +14,11 @@ This article provides architectural best practices for Azure Monitor Logs. The g
 
 
 ## Reliability
-[Reliability](/azure/well-architected/resiliency/overview) refers to the ability of a system to recover from failures and continue to function. Instead of trying to prevent failures altogether in the cloud, the goal is to minimize the effects of a single failing component. Use the following information to minimize failure of your Log Analytics workspaces and to protect the data they collect.
+[Reliability](/azure/well-architected/resiliency/overview) refers to the ability of a system to recover from failures and continue to function. The goal is to minimize the effects of a single failing component. Use the following information to minimize failure of your Log Analytics workspaces and to protect the data they collect.
+
+This video provides an overview of reliability and resilience options available for Log Analytics workspaces:
+
+> [!VIDEO https://www.youtube.com/embed/CYspm1Yevx8?cc_load_policy=1&cc_lang_pref=auto]
 
 [!INCLUDE [waf-logs-reliability](includes/waf-logs-reliability.md)]
 

articles/azure-monitor/autoscale/media/autoscale-common-scale-patterns/custom-metric-scale.png

@@ -6,7 +6,7 @@ ms.author: edbaynash
 services: azure-monitor
 ms.topic: how-to
 ms.custom: devx-track-azurecli, devx-track-azurepowershell
-ms.date: 10/19/2023
+ms.date: 08/11/2024
 ms.reviewer: lualderm
 ---
 
@@ -222,6 +222,15 @@ Diagnostic settings don't support resource IDs with non-ASCII characters. For ex
 
 Every effort is made to ensure all log data is sent correctly to your destinations, however it's not possible to guarantee 100% data transfer of logs between endpoints. Retries and other mechanisms are in place to work around these issues and attempt to ensure log data arrives at the endpoint.
 
+### Inactive resources
+
+When a resource is inactive and exporting zero-value metrics, the diagnostic settings export mechanism backs off incrementally to avoid unnecessary costs of exporting and storing zero values. The back-off may lead to a delay in the export of the next non-zero value. 
+
+When a resource is inactive for one hour, the export mechanism backs off to 15 minutes. This means that there is a potential latency of up to 15 minutes for the next nonzero value to be exported. The maximum backoff time of two hours is reached after seven days of inactivity. Once the resource starts exporting nonzero values, the export mechanism reverts to the original export latency of three minutes. 
+
+This behavior only applies to exported metrics and doesn't affect metrics-based alerts or autosacle.
+
+
 ## Next steps
 
 - [Review how to work with diagnostic settings in Azure Monitor](./diagnostic-settings.md)