Merge pull request #199790 from MicrosoftDocs/main

4 P.M. Publish, Sunday 5/29/22

Author: hmacgregor1

articles/azure-monitor/alerts/alerts-log.md

@@ -12,10 +12,15 @@ ms.reviewer: yanivlavi
 
 This article shows you how to create log alert rules and manage your alert instances. Azure Monitor log alerts allow users to use a [Log Analytics](../logs/log-analytics-tutorial.md) query to evaluate resource logs at a set frequency and fire an alert based on the results. Rules can trigger one or more actions using [alert processing rules](alerts-action-rules.md) and [action groups](./action-groups.md). Learn the concepts behind log alerts [here](alerts-types.md#log-alerts).
 
-When an alert is triggered by an alert rule, 
-- Target: A specific Azure resource to monitor.
-- Criteria: Logic to evaluate. If met, the alert fires.  
-- Action: Notifications or automation - email, SMS, webhook, and so on.
+You create an alert rule by combining:
+ - The resource(s) to be monitored.
+ - The signal or telemetry from the resource
+ - Conditions
+
+And then defining these elements of the triggered alert:
+ - Alert processing rules
+ - Action groups
+
 You can also [create log alert rules using Azure Resource Manager templates](../alerts/alerts-log-create-templates.md).
 ## Create a new log alert rule in the Azure portal
 

articles/azure-monitor/logs/basic-logs-configure.md

@@ -27,6 +27,27 @@ You can currently configure the following tables for Basic Logs:
 
 
 ## Set table configuration
+
+# [Portal](#tab/portal-1)
+
+To configure a table for Basic Logs or Analytics Logs in the Azure portal:
+
+1. From the **Log Analytics workspaces** menu, select **Tables (preview)**.
+
+    The **Tables (preview)** screen lists all of the tables in the workspace.
+
+1. Select the context menu for the table you want to configure and select **Manage table**.
+
+    :::image type="content" source="media/basic-logs-configure/log-analytics-table-configuration.png" lightbox="media/basic-logs-configure/log-analytics-table-configuration.png" alt-text="Screenshot showing the Manage table button for one of the tables in a workspace."::: 
+
+1. From the **Table plan** dropdown on the table configuration screen, select **Basic** or **Analytics**.
+
+    The **Table plan** dropdown is enabled only for [tables that support Basic Logs](#which-tables-support-basic-logs).
+
+    :::image type="content" source="media/basic-logs-configure/log-analytics-configure-table-plan.png" lightbox="media/basic-logs-configure/log-analytics-configure-table-plan.png" alt-text="Screenshot showing the Table plan dropdown on the table configuration screen."::: 
+
+1. Select **Save**.
+
 # [API](#tab/api-1)
 
 To configure a table for Basic Logs or Analytics Logs, call the **Tables - Update** API:
@@ -117,9 +138,11 @@ For example:
 ---
 
 ## Check table configuration
-# [Portal](#tab/portal-1)
+# [Portal](#tab/portal-2)
+
+To check table configuration in the Azure portal, you can open the table configuration screen, as described in [Set table configuration](#set-table-configuration). 
 
-To check the configuration of a table in the Azure portal: 
+Alternatively: 
 
 1. From the **Azure Monitor** menu, select **Logs** and select your workspace for the [scope](scope.md). See [Log Analytics tutorial](log-analytics-tutorial.md#view-table-information) for a walkthrough.
 1. Open the **Tables** tab, which lists all tables in the workspace. 
@@ -128,7 +151,7 @@ To check the configuration of a table in the Azure portal:
     
     ![Screenshot of the Basic Logs table icon in the table list.](./media/basic-logs-configure/table-icon.png#lightbox)
 
-    You can also hover over a table name for the table information view. This will specify that the table is configured as Basic Logs:
+    You can also hover over a table name for the table information view, which indicates whether the table is configured as Basic Logs:
     
     ![Screenshot of the Basic Logs table indicator in the table details.](./media/basic-logs-configure/table-info.png#lightbox)
 

articles/azure-monitor/logs/customer-managed-keys.md

@@ -254,10 +254,9 @@ When link your own storage (BYOS) to workspace, the service stores *saved-search
 * You need to have "write" permissions on your workspace and Storage Account.
 * Make sure to create your Storage Account in the same region as your Log Analytics workspace is located.
 * The *saves searches* in storage is considered as service artifacts and their format may change.
-* Existing *saves searches* are removed from your workspace. Copy and any *saves searches* that you need before the configuration. You can view your *saved-searches* using  [PowerShell](/powershell/module/az.operationalinsights/get-azoperationalinsightssavedsearch).
-* Query history isn't supported and you won't be able to see queries that you ran.
+* Existing *saves searches* are removed from your workspace. Copy any *saves searches* that you need before this configuration. You can view your *saved-searches* using  [PowerShell](/powershell/module/az.operationalinsights/get-azoperationalinsightssavedsearch).
+* Query 'history' and 'pin to dashboard' aren't supported when linking Storage Account for queries.
 * You can link a single Storage Account to a workspace, which can be used for both *saved-searches* and *log alerts* queries.
-* Pin to dashboard isn't supported.
 * Fired log alerts will not contains search results or alert query. You can use [alert dimensions](../alerts/alerts-unified-log.md#split-by-alert-dimensions) to get context in the fired alerts.
 
 **Configure BYOS for saved-searches queries**

articles/azure-monitor/logs/data-retention-archive.md

@@ -23,7 +23,7 @@ During the interactive retention period, data is available for monitoring, troub
 > The archive feature is currently in public preview and can only be set at the table level, not at the workspace level.
 
 ## Configure the default workspace retention policy
-You can set the workspace default retention policy in the Azure portal to 30, 31, 60, 90, 120, 180, 270, 365, 550, and 730 days. To set a different policy, use the Resource Manager configuration method described below. If you're on the *free* tier, you need to upgrade to the paid tier to change the data retention period.
+You can set the workspace default retention policy in the Azure portal to 30, 31, 60, 90, 120, 180, 270, 365, 550, and 730 days. You can set a different policy for specific tables by [configuring retention and archive policy at the table level](#set-retention-and-archive-policy-by-table). If you're on the *free* tier, you'll need to upgrade to the paid tier to change the data retention period.
 
 To set the default workspace retention policy:
 
@@ -37,17 +37,25 @@ To set the default workspace retention policy:
 
 ## Set retention and archive policy by table
 
-You can set retention policies for individual tables, except for workspaces in the legacy Free Trial pricing tier, using Azure Resource Manager APIs. You can’t currently configure data retention for individual tables in the Azure portal.
+By default, all tables in your workspace inherit the workspace's interactive retention setting and have no archive policy. You can modify the retention and archive policies of individual tables, except for workspaces in the legacy Free Trial pricing tier.
 
 You can keep data in interactive retention between 4 and 730 days. You can set the archive period for a total retention time of up to 2,555 days (seven years). 
 
-Each table is a subresource of the workspace it's in. For example, you can address the `SecurityEvent` table in [Azure Resource Manager](../../azure-resource-manager/management/overview.md) as:
+# [Portal](#tab/portal-1)
 
-```
-/subscriptions/00000000-0000-0000-0000-00000000000/resourceGroups/MyResourceGroupName/providers/Microsoft.OperationalInsights/workspaces/MyWorkspaceName/Tables/SecurityEvent
-```
+To set the retention and archive duration for a table in the Azure portal:
+
+1. From the **Log Analytics workspaces** menu, select **Tables (preview)**.
+
+    The **Tables (preview)** screen lists all of the tables in the workspace.
+
+1. Select the context menu for the table you want to configure and select **Manage table**.
+
+    :::image type="content" source="media/basic-logs-configure/log-analytics-table-configuration.png" lightbox="media/basic-logs-configure/log-analytics-table-configuration.png" alt-text="Screenshot showing the Manage table button for one of the tables in a workspace."::: 
 
-The table name is case-sensitive. 
+1. Configure the retention and archive duration in **Data retention settings** section of the table configuration screen.
+
+    :::image type="content" source="media/data-retention-configure/log-analytics-configure-table-retention-archive.png" lightbox="media/data-retention-configure/log-analytics-configure-table-retention-archive.png" alt-text="Screenshot showing the data retention settings on the table configuration screen."::: 
 
 # [API](#tab/api-1)
 
@@ -58,7 +66,7 @@ PATCH https://management.azure.com/subscriptions/{subscriptionId}/resourcegroups
 ```
 
 > [!NOTE]
-> You don't explicitly specify the archive duration in the API call. Instead, you set the total retention, which specifies the retention plus the archive duration.
+> You don't explicitly specify the archive duration in the API call. Instead, you set the total retention, which is the sum of the interactive retention plus the archive duration.
 
 
 You can use either PUT or PATCH, with the following difference: 
@@ -133,6 +141,15 @@ az monitor log-analytics workspace table update --subscription ContosoSID --reso
 
 ## Get retention and archive policy by table
 
+# [Portal](#tab/portal-2)
+
+To view the retention and archive duration for a table in the Azure portal, from the **Log Analytics workspaces** menu, select **Tables (preview)**.
+
+The **Tables (preview)** screen shows the interactive retention and archive period for all of the tables in the workspace.
+
+:::image type="content" source="media/data-retention-configure/log-analytics-view-table-retention-archive.png" lightbox="media/data-retention-configure/log-analytics-view-table-retention-archive.png" alt-text="Screenshot showing the Manage table button for one of the tables in a workspace."::: 
+
+
 # [API](#tab/api-2)
 
 To get the retention policy of a particular table (in this example, `SecurityEvent`), call the **Tables - Get** API:

articles/azure-monitor/logs/media/basic-logs-configure/log-analytics-configure-table-plan.png

@@ -2,33 +2,61 @@
 title: Azure CLI Script Example - Add an Application in Batch | Microsoft Docs
 description: Learn how to add an application for use with an Azure Batch pool or a task using the Azure CLI.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Add an application to an Azure Batch account
 
-This script demonstrates how to add an application for use with an Azure Batch pool or task. To set up an application to add to your Batch account, package your executable, together with any dependencies, into a zip file. 
+This script demonstrates how to add an application for use with an Azure Batch pool or task. To set up an application to add to your Batch account, package your executable, together with any dependencies, into a zip file.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
- - This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
+
+### Create batch account and new application
+
+:::code language="azurecli" source="~/azure_cli_scripts/batch/add-application/add-application.sh" id="FullScript":::
+
+### Create batch application package
 
-## Example script
+An application can reference multiple application executable packages of different versions. The executables and any dependencies need to be zipped up for the package. Once uploaded, the CLI attempts to activate the package so that it's ready for use.
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/add-application/add-application.sh "Add Application")]
+```azurecli
+az batch application package create \
+    --resource-group $resourceGroup \
+    --name $batchAccount \
+    --application-name "MyApplication" \
+    --package-file my-application-exe.zip \
+    --version-name 1.0
+```
+
+### Update the application
+
+Update the application to assign the newly added application package as the default version.
+
+```azurecli
+az batch application set \
+    --resource-group $resourceGroup \
+    --name $batchAccount \
+    --application-name "MyApplication" \
+    --default-version 1.0
+```
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands.
 Each command in the table links to command-specific documentation.

articles/azure-monitor/logs/media/basic-logs-configure/log-analytics-table-configuration.png

@@ -1,36 +1,38 @@
 ---
 title: Azure CLI Script Example - Create Batch account - Batch service | Microsoft Docs
-description: Learn how to create a Batch account in Batch service mode with this Azure CLI script example. This also script shows how to query or update various properties of the account.
+description: Learn how to create a Batch account in Batch service mode with this Azure CLI script example. This script also shows how to query or update various properties of the account.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Create a Batch account in Batch service mode
 
 This script creates an Azure Batch account in Batch service mode and shows how to query or update various properties of the account. When you create a Batch account in the default Batch service mode, its compute nodes are assigned internally by the Batch
-service. Allocated compute nodes are subject to a separate vCPU (core) quota and the account can be 
-authenticated either via shared key credentials or an Azure Active Directory token.
+service. Allocated compute nodes are subject to a separate vCPU (core) quota and the account can be authenticated either via shared key credentials or an Azure Active Directory token.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
 
-## Example script
+### Run the script
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/create-account/create-account.sh "Create Account")]
+:::code language="azurecli" source="~/azure_cli_scripts/batch/create-account/create-account.sh" id="FullScript":::
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.