Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sanUpdates2

Author: roygara

articles/azure-arc/data/managed-instance-high-availability.md

@@ -129,7 +129,7 @@ az sql mi-arc create --name sqldemo --resource-group rg  --location uswest2 –s
 
 By default, all the replicas are configured in synchronous mode. This means any updates on the primary instance will be synchronously replicated to each of the secondary instances.
 
-## View and monitor availability group status
+## View and monitor high availability status
 
 Once the deployment is complete, connect to the primary endpoint from SQL Server Management Studio.  
 
@@ -147,7 +147,7 @@ kubectl get sqlmi -A
 
 ### Get the primary and secondary endpoints and AG status
 
-Use the `kubectl describe sqlmi` or `az sql mi-arc show` commands to view the primary and secondary endpoints, and availability group status.
+Use the `kubectl describe sqlmi` or `az sql mi-arc show` commands to view the primary and secondary endpoints, and high availability status.
 
 Example:
 
@@ -157,22 +157,26 @@ kubectl describe sqlmi sqldemo -n my-namespace
 or 
 
 ```azurecli
-az sql mi-arc show sqldemo --k8s-namespace my-namespace --use-k8s
+az sql mi-arc show --name sqldemo --k8s-namespace my-namespace --use-k8s
 ```
 
 Example output:
 
 ```console
  "status": {
-    "AGStatus": "Healthy",
-    "logSearchDashboard": "https://10.120.230.404:5601/app/kibana#/discover?_a=(query:(language:kuery,query:'custom_resource_name:sqldemo'))",
-    "metricsDashboard": "https://10.120.230.46:3000/d/40q72HnGk/sql-managed-instance-metrics?var-hostname=sqlmi1-0",
-    "mirroringEndpoint": "10.15.100.150:5022",
+    "endpoints": {
+      "logSearchDashboard": "https://10.120.230.404:5601/app/kibana#/discover?_a=(query:(language:kuery,query:'custom_resource_name:sqldemo'))",
+      "metricsDashboard": "https://10.120.230.46:3000/d/40q72HnGk/sql-managed-instance-metrics?var-hostname=sqldemo-0",
+      "mirroring": "10.15.100.150:5022",
+      "primary": "10.15.100.150,1433",
+      "secondary": "10.15.100.156,1433"
+    },
+    "highAvailability": {
+      "healthState": "OK",
+      "mirroringCertificate": "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----"
+    },
     "observedGeneration": 1,
-    "primaryEndpoint": "10.15.100.150,1433",
     "readyReplicas": "2/2",
-    "runningVersion": "v1.2.0_2021-12-15",
-    "secondaryEndpoint": "10.15.100.156,1433",
     "state": "Ready"
   }
 ```

articles/container-apps/log-options.md

@@ -4,7 +4,6 @@ description: Description of logging options in Azure Container Apps
 services: container-apps
 author: cebundy
 ms.service: container-apps
-ms.custom: ignite-2022
 ms.topic: conceptual
 ms.date: 09/29/2022
 ms.author: v-bcatherine

articles/container-apps/media/observability/diag-setting-new-diag-setting.png

@@ -44,7 +44,8 @@ You can associate Active Directory groups defined here with specific permission
    |--|--|
    | Domain controller FQDN | Set the fully qualified domain name (FQDN) exactly as it appears on your LDAP server. For example, enter `host1.subdomain.domain.com`. |
    | Domain controller port | Define the port on which your LDAP is configured. |
-   | Primary domain | Set the domain name (for example, `subdomain.domain.com`) and the connection type according to your LDAP configuration. |
+   | Primary domain | Set the domain name (for example, `subdomain.domain.com`) |
+   | Connection type | Set the authentication type: LDAPS/NTLMv3 (Recommended), LDAP/NTLMv3 or LDAP/SASL-MD5 |
    | Active Directory groups | Enter the group names that are defined in your Active Directory configuration on the LDAP server. You can enter a group name that you'll associate with Admin, Security Analyst and Read-only permission levels. Use these groups when creating new sensor users.|
    | Trusted endpoints | To add a trusted domain, add the domain name and the connection type of a trusted domain. <br />You can configure trusted endpoints only for users who were defined under users. |
 
@@ -59,4 +60,4 @@ You can associate Active Directory groups defined here with specific permission
 
 ## Next steps
 
-For more information, see [how to create and manage users](./how-to-create-and-manage-users.md).
+For more information, see [how to create and manage users](./how-to-create-and-manage-users.md).