Merge pull request #113162 from rmca14/8-3c2

Resolve merge conflicts in AM live publish sync PR

Author: rmca14

articles/azure-monitor/containers/container-insights-enable-arc-enabled-clusters.md

@@ -1,6 +1,6 @@
 ---
 title: Monitor Azure Arc-enabled Kubernetes clusters
-ms.date: 05/24/2022
+ms.date: 08/02/2023
 ms.topic: article
 description: Collect metrics and logs of Azure Arc-enabled Kubernetes clusters using Azure Monitor.
 ms.reviewer: aul
@@ -72,7 +72,7 @@ ms.reviewer: aul
 
 ### Identify workspace resource ID
 
-Run the following commands to locate the full Azure Resource Manager identifier of the Log Analytics workspace. 
+Run the following commands to locate the full Azure Resource Manager identifier of the Log Analytics workspace.
 
 1. List all the subscriptions that you have access to using the following command:
 
@@ -109,8 +109,7 @@ This option uses the following defaults:
 - Auto-upgrade is enabled for the Azure Monitor cluster extension
 
 >[!NOTE]
->Managed identity authentication will be default in k8s-extension version 1.43.0 or higher.
->
+> Managed identity authentication is the default in k8s-extension version 1.43.0 or higher.
 
 ```azurecli
 az k8s-extension create --name azuremonitor-containers --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type connectedClusters --extension-type Microsoft.AzureMonitor.Containers
@@ -123,10 +122,10 @@ az k8s-extension create --name azuremonitor-containers --cluster-name <cluster-n
 ```
 
 >[!NOTE]
->Managed identity authentication is not supported for Arc k8s connected clusters with **ARO**.
+> Managed identity authentication is not supported for Arc-enabled Kubernetes clusters with **ARO**.
 >
 
-To use legacy/non-managed identity authentication to create extension instance on **Arc K8S connected clusters with ARO**, you can use the commands below that does not use managed identity. Non-cli onboarding is not supported for Arc K8s connected clusters with **ARO**. Currently, only k8s-extension version 1.3.7 or below is supported. 
+To use legacy/non-managed identity authentication to create an extension instance on **Arc K8S connected clusters with ARO**, use the commands below that don't use managed identity. Non-cli onboarding is not supported for Arc-enabled Kubernetes clusters with **ARO**. Currently, only k8s-extension version 1.3.7 or below is supported. 
 
 If you are using k8s-extension version above 1.3.7, downgrade the version.
 
@@ -141,7 +140,6 @@ Install the extension with **amalogs.useAADAuth=false**.
 az k8s-extension create --name azuremonitor-containers --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type connectedClusters --extension-type Microsoft.AzureMonitor.Containers --configuration-settings amalogs.useAADAuth=false
 ```
 
-
 ### Option 2 - With existing Azure Log Analytics workspace
 
 You can use an existing Azure Log Analytics workspace in any subscription on which you have *Contributor* or a more permissive role assignment.
@@ -252,8 +250,7 @@ az k8s-extension show --name azuremonitor-containers --cluster-name <cluster-nam
 Use the flowing guidance to migrate an existing extension instance to managed identity authentication.
 
 >[!NOTE]
->Managed identity authentication is not supported for Arc k8s connected clusters with **ARO**.
->
+> Managed identity authentication is not supported for Arc-enabled Kubernetes clusters with **ARO**.
 
 ## [CLI](#tab/migrate-cli)
 First retrieve the Log Analytics workspace configured for Container insights extension.
@@ -310,4 +307,4 @@ For issues with enabling monitoring, we have provided a [troubleshooting script]
 
 - By default, the containerized agent collects the stdout/ stderr container logs of all the containers running in all the namespaces except kube-system. To configure container log collection specific to particular namespace or namespaces, review [Container Insights agent configuration](container-insights-agent-config.md) to configure desired data collection settings to your ConfigMap configurations file.
 
-- To scrape and analyze Prometheus metrics from your cluster, review [Configure Prometheus metrics scraping](container-insights-prometheus-integration.md)
+- To scrape and analyze Prometheus metrics from your cluster, review [Configure Prometheus metrics scraping](container-insights-prometheus-integration.md)

articles/cosmos-db/nosql/migrate-hbase-to-cosmos-db.md

@@ -802,7 +802,7 @@ Server-side programming mappings
 
 | HBase    | Azure Cosmos DB   | Description |
 | ----------------------- | ---------------- | ----------- |
-| Custom filters   | WHERE Clause  | If the processing implemented by the custom filter cannot be achieved by the WHERE clause in Azure Cosmos DB, use UDF in combination. See [UDF examples](query/udfs.md#examples) for an example of using UDF to further filter the results of the WHERE clause. |
+| Custom filters   | WHERE Clause  | If the processing implemented by the custom filter cannot be achieved by the WHERE clause in Azure Cosmos DB, use UDF in combination. |
 | Coprocessor  (Observer) | Trigger  | Observer is a trigger that executes before and after a particular event. Just as Observer supports pre- and post-calls, Azure Cosmos DB's Trigger also supports pre- and post-triggers. |
 | Coprocessor  (Endpoint) | Stored Procedure | Endpoint is a server-side data processing mechanism that is executed for each region. This is similar to an RDBMS stored procedure. Azure Cosmos DB stored procedures are written using JavaScript. It provides access to all the operations you can perform on Azure Cosmos DB through stored procedures. |
 

articles/cosmos-db/nosql/query/TOC.yml

@@ -59,11 +59,6 @@
     - name: Bitwise operators
       displayName: bitwise, binary, operators
       href: bitwise-operators.md
-- name: Functions
-  items:
-    - name: User-defined functions
-      displayName: functions, udf
-      href: udfs.md
 - name: Aggregate functions
   items:
     - name: AVG