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

Author: siddomala

.openpublishing.redirection.app-service.json

@@ -1850,6 +1850,16 @@
             "redirect_url": "/azure/app-service/scripts/powershell-scale-manual",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/app-service/get-resource-events.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/overview-monitoring.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/app-service/app-service-security-attributes.md",
             "redirect_url": "/azure/app-service/security-baseline",

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 06/19/2024
+ms.date: 07/10/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -25,16 +25,43 @@ Azure OpenAI Service models are continually refreshed with newer and more capabl
 * Deprecation
 	* When a model is deprecated, it's no longer available for new customers. It continues to be available for use by customers with existing deployments until the model is retired.
 
-## Preretirement notification
+## Notifications
 
 Azure OpenAI notifies customers of active Azure OpenAI Service deployments for models with upcoming retirements. We notify customers of upcoming retirements as follows for each deployment:
 
-* At least 60 days before retirement 
-* At least 30 days before retirement 
-* At retirement
+1. At model launch, we programmatically designate a "not sooner than" retirement date (typically six months to one year out).
+2. At least 60 days notice before model retirement for Generally Available (GA) models.
+3. At least 14 days notice before preview model version upgrades.  
 
 Retirements are done on a rolling basis, region by region.
 
+## Model availability
+
+1. At least one year of model availability for GA models after the release date of a model in at least one region worldwide
+2. For global deployments, all future model versions starting with `gpt-4o` and `gpt-4 0409` will be available with their (`N`) next succeeding model (`N+1`) for comparison together. 
+1. Customers have 60 days to try out a new GA model in at least one global, or standard region, before any upgrades happen to a newer GA model.  
+
+### Considerations for the Azure public cloud
+
+Be aware of the following: 
+
+1. All model version combinations will **not** be available in all regions.
+2. Model version `N` and `N+1` might not always be available in the same region. 
+3. GA model version `N` might upgrade to a future model version `N+X` in some regions based on capacity limitations, and without the new model version `N+X` separately being available to test in the same region. The new model version will be available to test in other regions before any upgrades are scheduled.   
+4. Preview model versions and GA versions of the same model won't always be available to test together in the same region. There will be preview and GA versions available to test in different regions. 
+5.	We reserve the right to limit future customers using a particular region to balance service quality for existing customers.
+6.	As always at Microsoft, security is of the utmost importance. If a model or model version is found to have compliance or security issues, we reserve the right to invoke the need to do emergency retirements. See the terms of service for more information.
+
+### Special considerations for Azure Government clouds
+
+1.	Global standard deployments won't be available in government clouds.
+2.	Not all models or model versions available in commercial / public cloud will be available in government clouds.
+3.	In the Azure Government clouds, we intend to support only one version of a given model at a time.
+    1. For example only one version of `gpt-35-turbo 0125` and `gpt-4o (2024-05-13)`.
+4.	There will however be a 30 day overlap between new model versions, where more than two will be available.
+    1. For example if `gpt-35-turbo 0125` or `gpt-4o (2024-05-13)` is updated to a future version, or
+    2. for model family changes beyond version updates, such as when moving from `gpt-4 1106-preview` to `gpt-4o (2024-05-13)`. 
+
 ### Who is notified of upcoming retirements
 
 Azure OpenAI notifies those who are members of the following roles for each subscription with a deployment of a model with an upcoming retirement.

articles/ai-services/speech-service/how-to-configure-azure-ad-auth.md

@@ -103,7 +103,7 @@ The token context must be set to "https://cognitiveservices.azure.com/.default".
 ::: zone-end
 
 ::: zone pivot="programming-language-python"
-To get a Microsoft Entra access token in Java, use the [Azure Identity Client Library](/python/api/overview/azure/identity-readme).
+To get a Microsoft Entra access token in Python, use the [Azure Identity Client Library](/python/api/overview/azure/identity-readme).
 
 Here's an example of using Azure Identity to get a Microsoft Entra access token from an interactive browser:
 ```Python

articles/aks/network-observability-managed-cli.md

@@ -153,7 +153,7 @@ az aks create \
     --network-plugin azure \
     --network-plugin-mode overlay \
     --pod-cidr 192.168.0.0/16 \
-    --enable-network-observability
+    --enable-advanced-network-observability
 ```
 
 ###### Update Existing cluster
@@ -164,7 +164,7 @@ Use [az aks update](/cli/azure/aks#az-aks-update) to enable Network Observabilit
 az aks update \
     --resource-group myResourceGroup \
     --name myAKSCluster \
-    --enable-network-observability
+    --enable-advanced-network-observability
 ```
 
 ##### Example 2: **Cilium**

articles/analysis-services/analysis-services-network-faq.yml

@@ -42,6 +42,13 @@ sections:
           I have a source database behind a firewall. How can I configure the firewall to allow my Analysis Services server to access it?   
         answer: |
           Azure Analysis Services does not use fixed IP addresses or Service Tags. The range of IP addresses your Analysis Services servers use can be anything in the range of IP addresses for the *Azure region*. You  have to provide the *full range* of IP addresses for the Azure region of your server in the source database firewall rules. Another, and possibly more secure, alternative is to configure an On-premises Data Gateway. You can then configure your Analysis Services servers with the [AlwaysUseGateway server property](analysis-services-vnet-gateway.md#configure-alwaysusegateway-property), and then ensure the On-premises Data Gateway has an IP address allowed by the firewall rules of the data source.
+
+  - name: Consumer email accounts
+    questions:
+      - question: |
+          Can I invite consumer email accounts (outlook.com and gmail.com) to the tenant and give permissions to access Azure Analysis Services?
+        answer: |
+          Yes, Azure Analysis Services supports B2C accounts (consumer email accounts who are invited into the Server tenant). However there are limitations with such accounts, for example Single Sign-On from Power BI service Live Connect reports may not be supported for some providers of consumer email accounts.
           
   - name: Azure apps with IP address
     questions:

articles/app-service/get-resource-events.md

@@ -15,13 +15,28 @@ ms.service: app-service
 
 ## App Service monitoring
 
+Azure App Service provides several monitoring options for monitoring resources for availability, performance, and operation. Options include Diagnostic Settings, Application Insights, log stream, metrics, quotas and alerts, and activity logs.
+
 On the Azure portal page for your web app, you can select **Diagnose and solve problems** from the left navigation to access complete App Service diagnostics for your app. For more information about the App Service diagnostics tool, see [Azure App Service diagnostics overview](overview-diagnostics.md).
 
 App Service provides built-in diagnostics logging to assist with debugging apps. For more information about the built-in logs, see [Stream diagnostics logs](troubleshoot-diagnostic-logs.md#stream-logs).
 
 You can also use Azure Health check to monitor App Service instances. For more information, see [Monitor App Service instances using Health check](monitor-instances-health-check.md).
 
-For a complete overview and summary of App Service monitoring options, see [Azure App Service monitoring overview](overview-monitoring.md).
+If you're using ASP.NET Core, ASP.NET, Java, Node.js, or Python, we recommend [enabling observability with Application Insights](/azure/azure-monitor/app/opentelemetry-enable). To learn more about observability experiences offered by Application Insights, see [Application Insights overview](/azure/azure-monitor/app/app-insights-overview).
+
+### Monitoring scenarios
+
+The following table lists monitoring methods to use for different scenarios.
+
+|Scenario|Monitoring method |
+|----------|-----------|
+|I want to monitor platform metrics and logs | [Azure Monitor platform metrics](#platform-metrics)|
+|I want to monitor application performance and usage | (Azure Monitor) [Application Insights](#application-insights)|
+|I want to monitor built-in logs for testing and development|[Log stream](troubleshoot-diagnostic-logs.md#stream-logs)|
+|I want to monitor resource limits and configure alerts|[Quotas and alerts](web-sites-monitor.md)|
+|I want to monitor web app resource events|[Activity logs](#activity-log)|
+|I want to monitor metrics visually|[Metrics](web-sites-monitor.md#metrics-granularity-and-retention-policy)|
 
 [!INCLUDE [horz-monitor-insights](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-insights.md)]
 
@@ -36,16 +51,44 @@ For more information about the resource types for App Service, see [App Service
 
 [!INCLUDE [horz-monitor-data-storage](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-data-storage.md)]
 
+<a name="platform-metrics"></a>
 [!INCLUDE [horz-monitor-platform-metrics](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-platform-metrics.md)]
 For a list of available metrics for App Service, see [App Service monitoring data reference](monitor-app-service-reference.md#metrics).
 
+For help understanding metrics in App Service, see [Understand metrics](web-sites-monitor.md#understand-metrics). Metrics can be viewed by aggregates on data (ie. average, max, min, etc.), instances, time range, and other filters. Metrics can monitor performance, memory, CPU, and other attributes.
+
 [!INCLUDE [horz-monitor-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-resource-logs.md)]
 For the available resource log categories, their associated Log Analytics tables, and the logs schemas for App Service, see [App Service monitoring data reference](monitor-app-service-reference.md#resource-logs).
 
 [!INCLUDE [audit log categories tip](./includes/azure-monitor-log-category-groups-tip.md)]
 
+<a name="activity-log"></a>
 [!INCLUDE [horz-monitor-activity-log](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-activity-log.md)]
 
+### Azure activity logs for App Service
+
+Azure activity logs for App Service include details such as:
+
+- What operations were taken on the resources (ex: App Service Plans)
+- Who started the operation
+- When the operation occurred
+- Status of the operation
+- Property values to help you research the operation
+
+Azure activity logs can be queried using the Azure portal, PowerShell, REST API, or CLI.
+
+### Ship activity logs to Event Grid
+
+While activity logs are user-based, there's a new [Azure Event Grid](../event-grid/index.yml) integration with App Service (preview) that logs both user actions and automated events. With Event Grid, you can configure a handler to react to the said events. For example, use Event Grid to instantly trigger a serverless function to run image analysis each time a new photo is added to a blob storage container.
+
+Alternatively, you can use Event Grid with Logic Apps to process data anywhere, without writing code. Event Grid connects data sources and event handlers.
+
+To view the properties and schema for App Service events, see [Azure App Service as an Event Grid source](../event-grid/event-schema-app-service.md).
+
+## Log stream (via App Service Logs)
+
+Azure provides built-in diagnostics to assist during testing and development to debug an App Service app. [Log stream](troubleshoot-diagnostic-logs.md#stream-logs) can be used to get quick access to output and errors written by your application, and logs from the web server. These are standard output/error logs in addition to web server logs.
+
 [!INCLUDE [horz-monitor-analyze-data](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-analyze-data.md)]
 
 [!INCLUDE [horz-monitor-external-tools](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-external-tools.md)]
@@ -85,6 +128,10 @@ See [Azure Monitor queries for App Service](https://github.com/microsoft/AzureMo
 
 [!INCLUDE [horz-monitor-insights-alerts](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-insights-alerts.md)]
 
+### Quotas and alerts
+
+Apps that are hosted in App Service are subject to certain limits on the resources they can use. [The limits](web-sites-monitor.md#understand-quotas) are defined by the App Service plan that's associated with the app. Metrics for an app or an App Service plan can be hooked up to alerts.
+
 ### App Service alert rules
 
 The following table lists common and recommended alert rules for App Service.