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

Author: w-azure

articles/active-directory/authentication/concept-certificate-based-authentication-smartcard.md

@@ -73,7 +73,11 @@ The Windows smart card sign-in works with the latest preview build of Windows 11
 |✅ | ✅ | ✅ |✅ |
 
 >[!NOTE] 
->Azure AD CBA supports both certificates on-device as well as external storage like security keys on Windows.
+>Azure AD CBA supports both certificates on-device as well as external storage like security keys on Windows. 
+
+## Windows Out of the box experience (OOBE)
+
+Windows OOBE should allow the user to login using an external smart card reader and authenticate against Azure AD CBA. Windows OOBE by default should have the necessary smart card drivers or the smart card drivers previously added to the Windows image before OOBE setup.
 
 ## Restrictions and caveats  
 

articles/active-directory/reports-monitoring/concept-provisioning-logs.md

@@ -241,6 +241,7 @@ Use the following table to better understand how to resolve errors that you find
 > | AzureActiveDirectoryCannotUpdateObjectsOriginatedInExternalService | The synchronization engine could not update one or more user properties in the target tenant.<br/><br/>The operation failed in Microsoft Graph API because of Source of Authority (SOA) enforcement. Currently, the following properties show up in the list:<br/>`Mail`<br/>`showInAddressList` | In some cases (for example when `showInAddressList` property is part of the user update), the synchronization engine might automatically retry the (user) update without the offending property. Otherwise, you will need to update the property directly in the target tenant. |
 > | AzureDirectoryB2BManagementPolicyCheckFailure | The cross-tenant synchronization policy allowing automatic redemption failed.<br/><br/>The synchronization engine checks to ensure that the administrator of the target tenant has created an inbound cross-tenant synchronization policy allowing automatic redemption. The synchronization engine also checks if the administrator of the source tenant has enabled an outbound policy for automatic redemption. | Ensure that the automatic redemption setting has been enabled for both the source and target tenants. For more information, see [Automatic redemption setting](../multi-tenant-organizations/cross-tenant-synchronization-overview.md#automatic-redemption-setting). |
 > | AzureActiveDirectoryQuotaLimitExceeded | The number of objects in the tenant exceeds the directory limit.<br/><br/>Azure AD has limits for the number of objects that can be created in a tenant. | Check whether the quota can be increased. For information about the directory limits and steps to increase the quota, see [Azure AD service limits and restrictions](../enterprise-users/directory-service-limits-restrictions.md). |
+> |InvitationCreationFailure| The Azure AD provisioning service attempted to invite the user in the target tenant. That invitation failed.| Navigate to the user settings page in Azure AD > external users > collaboration restrictions and ensure that collaboration with that tenant is enabled.|
 
 ## Next steps
 

articles/azure-arc/data/upgrade-sql-managed-instance-auto.md

@@ -13,7 +13,6 @@ ms.topic: how-to
 
 # Enable automatic upgrades of an Azure SQL Managed Instance for Azure Arc
 
-[!INCLUDE [azure-arc-data-preview](../../../includes/azure-arc-data-preview.md)]
 
 You can set the `--desired-version` parameter of the `spec.update.desiredVersion` property of an Azure Arc-enabled SQL Managed Instance to `auto` to ensure that your managed instance will be upgraded after a data controller upgrade, with no interaction from a user. This setting simplifies management, as you don't need to manually upgrade every instance for every release.
 

articles/azure-arc/resource-bridge/network-requirements.md

@@ -42,10 +42,12 @@ In addition, resource bridge (preview) requires connectivity to the [Arc-enabled
 
 ## SSL proxy configuration
 
-Azure Arc resource bridge must be configured for proxy so that it can connect to the Azure services. This configuration is handled automatically. However, proxy configuration of the management machine isn't configured by the Azure Arc resource bridge.
+If using a proxy, Azure Arc resource bridge must be configured for proxy so that it can connect to the Azure services. To configure the Arc resource bridge with proxy, provide the proxy certificate file path during creation of the configuration files. Only pass the single proxy certificate. If a certificate bundle is passed then the deployment will fail. Proxy configuration of the management machine isn't configured by the Azure Arc resource bridge.
 
 There are only two certificates that should be relevant when deploying the Arc resource bridge behind an SSL proxy: the SSL certificate for your SSL proxy (so that the host and guest trust your proxy FQDN and can establish an SSL connection to it), and the SSL certificate of the Microsoft download servers. This certificate must be trusted by your proxy server itself, as the proxy is the one establishing the final connection and needs to trust the endpoint. Non-Windows machines may not trust this second certificate by default, so you may need to ensure that it's trusted.
 
+
+
 ## Exclusion list for no proxy
 
 The following table contains the list of addresses that must be excluded by using the `-noProxy` parameter in the `createconfig` command.

articles/azure-monitor/app/monitor-functions.md

@@ -1,68 +1,85 @@
 ---
 title: Monitor applications running on Azure Functions with Application Insights - Azure Monitor | Microsoft Docs
-description: Azure Monitor seamlessly integrates with your application running on Azure Functions, and allows you to monitor the performance and spot the problems with your apps in no time.
+description: Azure Monitor integrates with your Azure Functions application, allowing performance monitoring and quickly identifying problems.
 ms.topic: conceptual
-ms.date: 11/14/2022
+ms.date: 02/09/2023
 ms.reviewer: abinetabate
 ---
 
 # Monitoring Azure Functions with Azure Monitor Application Insights
 
-[Azure Functions](../../azure-functions/functions-overview.md) offers built-in integration with Azure Application Insights to monitor functions. For languages other than .NET and .NETCore additional language-specific workers/extensions are needed to get the full benefits of distributed tracing. 
+[Azure Functions](../../azure-functions/functions-overview.md) offers built-in integration with Azure Application Insights to monitor functions. For languages other than .NET and .NET Core, other language-specific workers/extensions are needed to get the full benefits of distributed tracing. 
 
 Application Insights collects log, performance, and error data, and automatically detects performance anomalies. Application Insights includes powerful analytics tools to help you diagnose issues and to understand how your functions are used. When you have the visibility into your application data, you can continuously improve performance and usability. You can even use Application Insights during local function app project development. 
 
-The required Application Insights instrumentation is built into Azure Functions. The only thing you need is a valid instrumentation key to connect your function app to an Application Insights resource. The instrumentation key should be added to your application settings when your function app resource is created in Azure. If your function app doesn't already have this key, you can set it manually. For more information read more about [monitoring Azure Functions](../../azure-functions/functions-monitoring.md?tabs=cmd).
-
-For a complete list of supported auto-instrumentation scenarios, see [Supported environments, languages, and resource providers](codeless-overview.md#supported-environments-languages-and-resource-providers).
+The required Application Insights instrumentation is built into Azure Functions. The only thing you need is a valid connection string to connect your function app to an Application Insights resource. The connection string should be added to your application settings when your function app resource is created in Azure. If your function app doesn't already have a connection string, you can set it manually. For more information, read more about [monitoring Azure Functions](../../azure-functions/functions-monitoring.md?tabs=cmd) and [connection strings](sdk-connection-string.md).
 
 [!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-instrumentation-key-deprecation.md)]
 
+For a complete list of supported auto-instrumentation scenarios, see [Supported environments, languages, and resource providers](codeless-overview.md#supported-environments-languages-and-resource-providers).
+
 ## Distributed tracing for Java applications (public preview)
 
 > [!IMPORTANT]
 > This feature is currently in public preview for Java Azure Functions both Windows and Linux
 
-If your applications are written in Java you can view richer data from your functions applications, including requests, dependencies, logs, and metrics. The additional data also lets you see and diagnose end-to-end transactions and see the application map, which aggregates many transactions to show a topological view of how the systems interact, and what the average performance and error rates are.
+> [!Note]
+> This feature used to have a 8-9 second cold startup implication, which has been reduced to less than 1 sec. If you were an early adopter of this feature (i.e. prior to Feb 2023), then review the troubleshooting section to update to the current version and benefit from the new faster startup.
 
-The end-to-end diagnostics and the application map provide visibility into one single transaction/request. Together these two features are helpful for finding the root cause of reliability issues and performance bottlenecks on a per request basis.
+To view more data from your Java-based Azure Functions applications than is [collected by default](../../azure-functions/functions-monitoring.md?tabs=cmd), you can enable the [Application Insights Java 3.x agent](./java-in-process-agent.md). This agent allows Application Insights to automatically collect and correlate dependencies, logs, and metrics from popular libraries and Azure SDKs, in addition to the request telemetry already captured by Functions.
+
+By using the application map and having a more complete view of end-to-end transactions, you can better diagnose issues and see a topological view of how systems interact, along with data on average performance and error rates. You have more data for end-to-end diagnostics and the ability to use the application map to easily find the root cause of reliability issues and performance bottlenecks on a per request basis.
+
+For more advanced use cases, you're able to modify telemetry (add spans, update span status, add span attributes) or send custom telemetry using standard APIs.
 
 ### How to enable distributed tracing for Java Function apps
 
-Navigate to the functions app Overview pane and go to configurations. Under Application Settings, click "+ New application setting". 
+Navigate to the functions app Overview pane and go to configurations. Under Application Settings, select "+ New application setting". 
 
 > [!div class="mx-imgBorder"]
 > ![Under Settings, add new application settings](./media//functions/create-new-setting.png)
 
-Add the following application settings with below values, then click Save on the upper left. DONE!
+Add the following application settings with below values, then select Save on the upper left. DONE!
+
+```
+APPLICATIONINSIGHTS_ENABLE_AGENT: true
+```
+
+### Troubleshooting
+
+Your Java Functions may have slow startup times if you adopted this feature before Feb 2023. Follow the steps to fix the issue.
 
 #### Windows
+
+1. Check to see if the following settings exist and remove them.
+
 ```
 XDT_MicrosoftApplicationInsights_Java -> 1
 ApplicationInsightsAgent_EXTENSION_VERSION -> ~2
 ```
-> [!IMPORTANT]
-> This feature will have a cold start implication of 8-9 seconds in the Windows Consumption plan.
+
+2. Enable the latest version by adding this setting.
+
+```
+APPLICATIONINSIGHTS_ENABLE_AGENT: true
+```
 
 #### Linux Dedicated/Premium
+
+1. Check to see if the following settings exist and remove it.
+
 ```
 ApplicationInsightsAgent_EXTENSION_VERSION -> ~3
 ```
 
-#### Linux Consumption
+2. Enable the latest version by adding this setting.
+
 ```
 APPLICATIONINSIGHTS_ENABLE_AGENT: true
 ```
 
-### Troubleshooting
-
-* Sometimes the latest version of the Application Insights Java agent is not
-  available in Azure Function - it takes a few months for the latest versions to
-  roll out to all regions. In case you need the latest version of Java agent to
-  monitor your app in Azure Function to use a specific version of Application
-  Insights Java Auto-instrumentation Agent, you can upload the agent manually:
-   
-  Please follow this [instruction](https://github.com/Azure/azure-functions-java-worker/wiki/Distributed-Tracing-for-Java-Azure-Functions#customize-distribute-agent).
+> [!NOTE]
+> If the latest version of the Application Insights Java agent isn't available in Azure Function, you can upload it manually by following [these instructions](https://github.com/Azure/azure-functions-java-worker/wiki/Distributed-Tracing-for-Java-Azure-Functions#customize-distribute-agent).
 
 [!INCLUDE [azure-monitor-app-insights-test-connectivity](../../../includes/azure-monitor-app-insights-test-connectivity.md)]
 
@@ -75,5 +92,5 @@ To collect custom telemetry from services such as Redis, Memcached, MongoDB, and
 * Read more instructions and information about monitoring [Monitoring Azure Functions](../../azure-functions/functions-monitoring.md)
 * Get an overview of [Distributed Tracing](./distributed-tracing.md)
 * See what [Application Map](./app-map.md?tabs=net) can do for your business
-* Read about [requests and dependencies for Java apps](./opentelemetry-enable.md?tabs=java)
+* Read about [requests and dependencies for Java apps](./java-in-process-agent.md)
 * Learn more about [Azure Monitor](../overview.md) and [Application Insights](./app-insights-overview.md)