Merge pull request #277811 from MicrosoftDocs/main

Publish to live, Tuesday 4 AM PST, 6/11

Author: ttorble

includes/resource-graph/samples/bycat/azure-advisor.md renamed to articles/advisor/includes/azure-advisor.md

@@ -1,29 +1,28 @@
 ---
-author: davidsmatlak
-ms.service: resource-graph
+ms.service: advisor
 ms.topic: include
 ms.date: 07/07/2022
-ms.author: davidsmatlak
-ms.custom: generated
+author: ikhapova
+ms.author: ikhapova
 ---
 
 ### Get cost savings summary from Azure Advisor
 
-This query summarizes the cost savings of each [Azure Advisor](../../../../articles/advisor/advisor-overview.md) recommendation.
+This query summarizes the cost savings of each [Azure Advisor](../advisor-overview.md) recommendation.
 
 ```kusto
 AdvisorResources
 | where type == 'microsoft.advisor/recommendations'
 | where properties.category == 'Cost'
 | extend
-	resources = tostring(properties.resourceMetadata.resourceId),
-	savings = todouble(properties.extendedProperties.savingsAmount),
-	solution = tostring(properties.shortDescription.solution),
-	currency = tostring(properties.extendedProperties.savingsCurrency)
+  resources = tostring(properties.resourceMetadata.resourceId),
+  savings = todouble(properties.extendedProperties.savingsAmount),
+  solution = tostring(properties.shortDescription.solution),
+  currency = tostring(properties.extendedProperties.savingsCurrency)
 | summarize
-	dcount(resources),
-	bin(sum(savings), 0.01)
-	by solution, currency
+  dcount(resources),
+  bin(sum(savings), 0.01)
+  by solution, currency
 | project solution, dcount_resources, sum_savings, currency
 | order by sum_savings desc
 ```

articles/advisor/resource-graph-samples.md

@@ -7,15 +7,13 @@ ms.custom: subject-resourcegraph-sample
 ---
 # Azure Resource Graph sample queries for Azure Advisor
 
-This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries for Azure Advisor. For a complete list of Azure Resource Graph samples, see [Resource Graph samples by Category](../governance/resource-graph/samples/samples-by-category.md) and [Resource Graph samples by Table](../governance/resource-graph/samples/samples-by-table.md).
+This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries for Azure Advisor. 
 
 ## Sample queries
 
-[!INCLUDE [azure-resource-graph-samples-cat-advisor](../../includes/resource-graph/samples/bycat/azure-advisor.md)]
+[!INCLUDE [azure-resource-graph-samples-cat-advisor](./includes/azure-advisor.md)]
 
 ## Next steps
 
 - Learn more about the [query language](../governance/resource-graph/concepts/query-language.md).
 - Learn more about how to [explore resources](../governance/resource-graph/concepts/explore-resources.md).
-- See samples of [Starter language queries](../governance/resource-graph/samples/starter.md).
-- See samples of [Advanced language queries](../governance/resource-graph/samples/advanced.md).

includes/resource-graph/samples/bycat/azure-monitor.md renamed to articles/azure-monitor/includes/azure-monitor.md

@@ -1,10 +1,9 @@
 ---
-author: davidsmatlak
-ms.service: resource-graph
+ms.service: azure-monitor
 ms.topic: include
 ms.date: 08/04/2022
-ms.author: davidsmatlak
-ms.custom: generated
+author: bwren
+ms.author: bwren
 ---
 
 ### View recent Azure Monitor alerts
@@ -144,11 +143,11 @@ Returns the connected cluster ID of each Azure Arc-enabled Kubernetes cluster th
 Resources
 | where type =~ 'Microsoft.Kubernetes/connectedClusters' | extend connectedClusterId = tolower(id) | project connectedClusterId
 | join kind = leftouter
-	(KubernetesConfigurationResources
-	| where type == 'microsoft.kubernetesconfiguration/extensions'
-	| where properties.ExtensionType  == 'microsoft.azuremonitor.containers'
-	| parse tolower(id) with connectedClusterId '/providers/microsoft.kubernetesconfiguration/extensions' *
-	| project connectedClusterId
+  (KubernetesConfigurationResources
+  | where type == 'microsoft.kubernetesconfiguration/extensions'
+  | where properties.ExtensionType  == 'microsoft.azuremonitor.containers'
+  | parse tolower(id) with connectedClusterId '/providers/microsoft.kubernetesconfiguration/extensions' *
+  | project connectedClusterId
 )  on connectedClusterId
 | where connectedClusterId1 == ''
 | project connectedClusterId

articles/azure-monitor/resource-graph-samples.md

@@ -10,17 +10,13 @@ ms.custom: subject-resourcegraph-sample
 # Azure Resource Graph sample queries for Azure Monitor
 
 This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries
-for Azure Monitor. For a complete list of Azure Resource Graph samples, see:
-- [Resource Graph samples by category](../governance/resource-graph/samples/samples-by-category.md)
-- [Resource Graph samples by table](../governance/resource-graph/samples/samples-by-table.md)
+for Azure Monitor.
 
 ## Azure Monitor
 
-[!INCLUDE [azure-resource-graph-samples-cat-monitor](../../includes/resource-graph/samples/bycat/azure-monitor.md)]
+[!INCLUDE [azure-resource-graph-samples-cat-monitor](./includes/azure-monitor.md)]
 
 ## Next steps
 
 - Learn more about the [query language](../governance/resource-graph/concepts/query-language.md).
 - Learn more about how to [explore resources](../governance/resource-graph/concepts/explore-resources.md).
-- See samples of [starter language queries](../governance/resource-graph/samples/starter.md).
-- See samples of [advanced language queries](../governance/resource-graph/samples/advanced.md).

articles/databox/data-box-logs.md

@@ -200,7 +200,10 @@ During the data upload to Azure, a copy log is created.
 
 For each order that is processed, the Data Box service creates a copy log in the associated storage account. The copy log has the total number of files that were uploaded and the number of files that errored out during the data copy from Data Box to your Azure storage account.
 
-A Cyclic Redundancy Check (CRC) computation is done during the upload to Azure. The CRCs from the data copy and after the data upload are compared. A CRC mismatch indicates that the corresponding files failed to upload.
+> [!NOTE]
+> A Cyclic Redundancy Check (CRC) computation is completed during the upload to Azure. The CRCs from the data copy and data upload are compared. A CRC mismatch indicates that the corresponding files failed to upload.
+> 
+> You can use the CRC checksum tool script to compare the checksums of the on-premises source data with the data uploaded to Azure. The script can be downloaded from [Azure Samples](https://github.com/Azure-Samples/data-box-samples/tree/main/JavaToolforCRC). See the [README file](https://github.com/Azure-Samples/data-box-samples/blob/main/JavaToolforCRC/README.md) for more information.
 
 By default, logs are written to a container named `copylog`. The logs are stored with the following naming convention: