Skip to content

Commit fa1892f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into container-vulnerability
2 parents ac90412 + e384ffc commit fa1892f

18 files changed

+316
-390
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5813,6 +5813,11 @@
58135813
"redirect_url": "/azure/automation/update-management/update-mgmt-view-update-assessments",
58145814
"redirect_document_id": false
58155815
},
5816+
{
5817+
"source_path_from_root": "/articles/automation/source-control-integration-legacy.md",
5818+
"redirect_url": "source-control-integration",
5819+
"redirect_document_id": false
5820+
},
58165821
{
58175822
"source_path_from_root": "/articles/best-practices-availability-paired-regions.md",
58185823
"redirect_url": "/azure/availability-zones/cross-region-replication-azure",

articles/automation/source-control-integration-legacy.md

Lines changed: 0 additions & 130 deletions
This file was deleted.

articles/azure-monitor/logs/manage-cost-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: azure-monitor
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 01/26/2022
14+
ms.date: 02/13/2022
1515
ms.author: bwren
1616
ms.custom: devx-track-azurepowershell
1717
---
@@ -79,7 +79,7 @@ The easiest way to view your billed usage for a particular Log Analytics workspa
7979

8080
Alternatively, you can start in the [Azure Cost Management + Billing](../../cost-management-billing/costs/quick-acm-cost-analysis.md?toc=%2fazure%2fbilling%2fTOC.json) hub. here you can use the "Cost analysis" functionality to view your Azure resource expenses. To track your Log Analytics expenses, you can add a filter by "Resource type" (to microsoft.operationalinsights/workspace for Log Analytics and microsoft.operationalinsights/cluster for Log Analytics Clusters). For **Group by**, select **Meter category** or **Meter**. Other services, like Microsoft Defender for Cloud and Microsoft Sentinel, also bill their usage against Log Analytics workspace resources. To see the mapping to the service name, you can select the Table view instead of a chart.
8181

82-
To gain more understanding of your usage, you can [download your usage from the Azure portal](../../cost-management-billing/understand/download-azure-daily-usage.md).
82+
To gain more understanding of your usage, you can [download your usage from the Azure portal](../../cost-management-billing/understand/download-azure-daily-usage.md). For step-by-step instructions, review this [tutorial](../../cost-management-billing/costs/tutorial-export-acm-data.md).
8383
In the downloaded spreadsheet, you can see usage per Azure resource (for example, Log Analytics workspace) per day. In this Excel spreadsheet, usage from your Log Analytics workspaces can be found by first filtering on the "Meter Category" column to show "Log Analytics", "Insight and Analytics" (used by some of the legacy pricing tiers), and "Azure Monitor" (used by commitment tier pricing tiers), and then adding a filter on the "Instance ID" column that is "contains workspace" or "contains cluster" (the latter to include Log Analytics Cluster usage). The usage is shown in the "Consumed Quantity" column, and the unit for each entry is shown in the "Unit of Measure" column. For more information, see [Review your individual Azure subscription bill](../../cost-management-billing/understand/review-individual-bill.md).
8484

8585
## Understand your usage and optimizing your pricing tier

articles/azure-resource-manager/bicep/learn-bicep.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ ms.date: 12/03/2021
88

99
Ready to see how Bicep can help simplify and accelerate your deployments to Azure? Check out the many hands-on courses on Microsoft Learn.
1010

11+
> [!TIP]
12+
> Want to learn Bicep live from subject matter experts? [Learn Live with our experts every Tuesday (Pacific time) beginning March 8, 2022.](https://aka.ms/learnlive-iac-and-bicep)
13+
1114
## Get started
1215

1316
If you're new to Bicep, a great way to get started is by taking this module on Microsoft Learn.

articles/azure-sql/database/scripts/restore-database-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This Azure CLI example restores a single database in Azure SQL Database to a spe
2929

3030
### Run the script
3131

32-
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/restore-database/restore-database.sh" range="4-39":::
32+
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/restore-database/restore-database.sh" range="4-42":::
3333

3434
## Clean up resources
3535

articles/azure-sql/managed-instance/scripts/restore-geo-backup-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This sample requires an existing pair of managed instances, see [Use Azure CLI t
3131

3232
### Run the script
3333

34-
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/sql-managed-instance-restore-geo-backup/restore-geo-backup-cli.sh" range="4-29":::
34+
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/sql-managed-instance-restore-geo-backup/restore-geo-backup-cli.sh" range="4-32":::
3535

3636
## Clean up resources
3737

0 commit comments

Comments
 (0)