Merge branch 'MicrosoftDocs:main' into connected-registry

tejaswikolli-web · web-flow · commit 8523367c7a9c · 2024-06-11T13:07:12.000-07:00
diff --git a/articles/aks/gpu-cluster.md b/articles/aks/gpu-cluster.md
@@ -164,7 +164,7 @@ To use Azure Linux, you specify the OS SKU by setting `os-sku` to `AzureLinux` d
     kind: DaemonSet
     metadata:
       name: nvidia-device-plugin-daemonset
-      namespace: gpu-resources
+      namespace: kube-system
     spec:
       selector:
         matchLabels:
@@ -173,40 +173,35 @@ To use Azure Linux, you specify the OS SKU by setting `os-sku` to `AzureLinux` d
         type: RollingUpdate
       template:
         metadata:
-          # Mark this pod as a critical add-on; when enabled, the critical add-on scheduler
-          # reserves resources for critical add-on pods so that they can be rescheduled after
-          # a failure.  This annotation works in tandem with the toleration below.
-          annotations:
-            scheduler.alpha.kubernetes.io/critical-pod: ""
           labels:
             name: nvidia-device-plugin-ds
         spec:
           tolerations:
-          # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
-          # This, along with the annotation above marks this pod as a critical add-on.
-          - key: CriticalAddonsOnly
-            operator: Exists
           - key: nvidia.com/gpu
             operator: Exists
             effect: NoSchedule
-          - key: "sku"
-            operator: "Equal"
-            value: "gpu"
-            effect: "NoSchedule"
+          # Mark this pod as a critical add-on; when enabled, the critical add-on
+          # scheduler reserves resources for critical add-on pods so that they can
+          # be rescheduled after a failure.
+          # See https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
+          priorityClassName: "system-node-critical"
           containers:
-          - image: mcr.microsoft.com/oss/nvidia/k8s-device-plugin:v0.14.1
+          - image: nvcr.io/nvidia/k8s-device-plugin:v0.15.0
             name: nvidia-device-plugin-ctr
+            env:
+              - name: FAIL_ON_INIT_ERROR
+                value: "false"
             securityContext:
               allowPrivilegeEscalation: false
               capabilities:
                 drop: ["ALL"]
             volumeMounts:
-              - name: device-plugin
-                mountPath: /var/lib/kubelet/device-plugins
-          volumes:
             - name: device-plugin
-              hostPath:
-                path: /var/lib/kubelet/device-plugins
+              mountPath: /var/lib/kubelet/device-plugins
+          volumes:
+          - name: device-plugin
+            hostPath:
+              path: /var/lib/kubelet/device-plugins
     ```
 
 3. Create the DaemonSet and confirm the NVIDIA device plugin is created successfully using the [`kubectl apply`][kubectl-apply] command.
@@ -499,7 +494,7 @@ To see the GPU in action, you can schedule a GPU-enabled workload with the appro
 [kubectl-create]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#create
 [azure-pricing]: https://azure.microsoft.com/pricing/
 [azure-availability]: https://azure.microsoft.com/global-infrastructure/services/
-[nvidia-github]: https://github.com/NVIDIA/k8s-device-plugin
+[nvidia-github]: https://github.com/NVIDIA/k8s-device-plugin/blob/4b3d6b0a6613a3672f71ea4719fd8633eaafb4f3/deployments/static/nvidia-device-plugin.yml
 
 <!-- LINKS - internal -->
 [az-aks-create]: /cli/azure/aks#az_aks_create
diff --git a/articles/api-management/virtual-network-injection-resources.md b/articles/api-management/virtual-network-injection-resources.md
@@ -5,7 +5,7 @@ author: dlepow
 
 ms.service: api-management
 ms.topic: conceptual
-ms.date: 03/26/2024
+ms.date: 06/10/2024
 ms.author: danlep
 ---
 
@@ -18,18 +18,18 @@ The following are virtual network resource requirements for API Management injec
 #### [stv2](#tab/stv2)
 
 * An Azure Resource Manager virtual network is required.
-* You must provide a Standard SKU [public IPv4 address](../virtual-network/ip-services/public-ip-addresses.md#sku) in addition to specifying a virtual network and subnet.
-* The subnet used to connect to the API Management instance may contain other Azure resource types.
-* The subnet used to connect to the API Management instance should not have any delegations enabled. The "Delegate subnet to a service" setting for the subnet should be set to "None". 
+* The subnet used to connect to the API Management instance might contain other Azure resource types.
+* The subnet used to connect to the API Management instance shouldn't have any delegations enabled. The **Delegate subnet to a service** setting for the subnet should be set to *None*. 
 * A [network security group](../virtual-network/network-security-groups-overview.md) attached to the subnet above. A network security group (NSG) is required to explicitly allow inbound connectivity, because the load balancer used internally by API Management is secure by default and rejects all inbound traffic. 
-* The API Management service, virtual network and subnet, and public IP address resource must be in the same region and subscription.
+* Depending on whether you inject your API Management instance into a virtual network in external mode or internal mode, you may provide a Standard SKU [public IPv4 address](../virtual-network/ip-services/public-ip-addresses.md#sku) in addition to specifying a virtual network and subnet.
+* The API Management service, virtual network and subnet, and public IP address resource (if provided) must be in the same region and subscription.
 * For multi-region API Management deployments, configure virtual network resources separately for each location.
 
 #### [stv1](#tab/stv1)
 
 * An Azure Resource Manager virtual network is required.
 * The subnet used to connect to the API Management instance must be dedicated to API Management. It can't contain other Azure resource types.
-* The subnet used to connect to the API Management instance should not have any delegations enabled. The "Delegate subnet to a service" setting for the subnet should be set to "None". 
+* The subnet used to connect to the API Management instance shouldn't have any delegations enabled. The "Delegate subnet to a service" setting for the subnet should be set to "None". 
 * The API Management service, virtual network, and subnet resources must be in the same region and subscription.
 * For multi-region API Management deployments, configure virtual network resources separately for each location.
 ---
@@ -62,7 +62,7 @@ The minimum size of the subnet in which API Management can be deployed is /29, w
 > It is currently possible to scale the Premium SKU to 31 units. If you foresee demand approaching this limit, consider the /26 subnet or /25 submit.
 
 > [!IMPORTANT]
-> The private IP addresses of internal load balancer and API Management units are assigned dynamically. Therefore, it is impossible to anticipate the private IP of the API Management instance prior to its deployment. Additionally, changing to a different subnet and then returning may cause a change in the private IP address.
+> The private IP addresses of internal load balancer and API Management units are assigned dynamically. Therefore, it is impossible to anticipate the private IP of the API Management instance prior to its deployment. Additionally, changing to a different subnet and then returning might cause a change in the private IP address.
 
 ## Routing
 
diff --git a/articles/azure-monitor/app/live-stream.md b/articles/azure-monitor/app/live-stream.md
@@ -34,19 +34,29 @@ Live Metrics is currently supported for ASP.NET, ASP.NET Core, Azure Functions,
 ## Get started
 
 > [!IMPORTANT]
-> To enable Application Insights, ensure that it's activated in the Azure portal and your app is using a recent version of the [Application Insights](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) NuGet package. Without the NuGet package, some telemetry is sent to Application Insights, but that telemetry won't show in Live Metrics.
+> To enable Application Insights, ensure that it's activated in the Azure portal and your app is using a recent version of the [Azure Monitor OpenTelemetry Distro](opentelemetry-enable.md) or Classic [Application Insights](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) NuGet package. Without the NuGet package, some telemetry is sent to Application Insights, but that telemetry won't show in Live Metrics.
 
 1. Follow language-specific guidelines to enable Live Metrics:
+
+  Using OpenTelemetry (Recommended):
+
+   * [ASP.NET](opentelemetry-enable.md?tabs=net): Live Metrics is enabled by default.
+   * [ASP.NET Core](opentelemetry-enable.md?tabs=aspnetcore): Live Metrics is enabled by default.
+   * [Java](./opentelemetry-enable.md?tabs=java): Live Metrics is enabled by default.
+   * [Node.js](opentelemetry-enable.md?tabs=nodejs): Live Metrics is enabled by default.
+   * [Python](opentelemetry-enable.md?tabs=python): Live Metrics is enabled by default.
+  
+  Using Classic:
+  
    * [ASP.NET](./asp-net.md): Live Metrics is enabled by default.
    * [ASP.NET Core](./asp-net-core.md): Live Metrics is enabled by default.
    * [.NET/.NET Core Console/Worker](./worker-service.md): Live Metrics is enabled by default.
    * [.NET Applications: Enable using code](#enable-live-metrics-by-using-code-for-any-net-application).
-   * [Java](./opentelemetry-enable.md?tabs=java): Live Metrics is enabled by default.
    * [Node.js](./nodejs.md#live-metrics)
 
-1. In the [Azure portal](https://portal.azure.com), open the Application Insights resource for your app. Then open Live Stream.
+2. In the [Azure portal](https://portal.azure.com), open the Application Insights resource for your app. Then open Live Stream.
 
-1. [Secure the control channel](#secure-the-control-channel) if you might use sensitive data like customer names in your filters.
+3. [Secure the control channel](#secure-the-control-channel) if you might use sensitive data like customer names in your filters.
 
 [!INCLUDE [azure-monitor-log-analytics-rebrand](~/reusable-content/ce-skilling/azure/includes/azure-monitor-instrumentation-key-deprecation.md)]
 
diff --git a/articles/azure-monitor/includes/azure-monitor-app-insights-opentelemetry-faqs.md b/articles/azure-monitor/includes/azure-monitor-app-insights-opentelemetry-faqs.md
@@ -93,15 +93,16 @@ The following chart breaks out OpenTelemetry feature support for each language.
 | [Logs collection](../app/asp-net-trace-logs.md)                                                                       | :white_check_mark: | :warning:          | :white_check_mark: | :white_check_mark: |
 | [Custom Events](../app/usage-overview.md#custom-business-events)                                                      | :warning:          | :warning:          | :warning:          | :white_check_mark: |
 | [Microsoft Entra authentication](../app/azure-ad-authentication.md)                                                   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| [Live metrics](../app/live-stream.md)                                                                                 | :warning:          | :warning:          | :warning:          | :white_check_mark: |
+| [Live metrics](../app/live-stream.md)                                                                                 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| [Live Metrics Filtering](../app/live-stream.md#select-and-filter-your-metrics)                                        | :x:                | :x:                | :x:                | :x:                |
 | Detect Resource Context for VM/VMSS and App Service                                                                   | :white_check_mark: | :x:                | :white_check_mark: | :white_check_mark: |
-| Detect Resource Context for Azure Kubernetes Service (AKS) and Functions                                              | :x:                | :x:                | :x:                | :white_check_mark: |           
-| Availability Testing Span Filtering                                                                                   | :x:                | :x:                | :x:                | :white_check_mark: |
-| Autopopulation of user ID, authenticated user ID, and user IP                                                         | :x:                | :x:                | :x:                | :white_check_mark: |
-| Manually override/set operation name, user ID, or authenticated user ID                                               | :x:                | :x:                | :x:                | :white_check_mark: |
+| Detect Resource Context for Azure Kubernetes Service (AKS) and Functions                                              | :x:                | :x:                | :x:                | :white_check_mark: |
+| Availability Testing Events generated using the Track Availability API                                                | :x:                | :x:                | :x:                | :white_check_mark: |
+| Filter requests, dependencies, logs, and exceptions by anonymous user ID and synthetic source                         | :x:                | :x:                | :x:                | :white_check_mark: |
+| Filter dependencies, logs, and exceptions by operation name                                                           | :x:                | :x:                | :x:                | :white_check_mark: |
 | [Adaptive sampling](../app/sampling.md#adaptive-sampling)                                                             | :x:                | :x:                | :x:                | :white_check_mark: |
-| [Profiler](../profiler/profiler-overview.md)                                                                          | :x:                | :x:                | :x:                | :warning:          |
-| [Snapshot Debugger](../snapshot-debugger/snapshot-debugger.md)                                                        | :x:                | :x:                | :x:                | :x:                |
+| [Profiler](../profiler/profiler-overview.md)                                                                          | :white_check_mark: | :x:                | :x:                | :warning:          |
+| [Snapshot Debugger](../snapshot-debugger/snapshot-debugger.md)                                                        | :white_check_mark: | :x:                | :x:                | :x:                |
 
 **Key**
 - :white_check_mark: This feature is available to all customers with formal support.
diff --git a/articles/education-hub/azure-dev-tools-teaching/about-program.md b/articles/education-hub/azure-dev-tools-teaching/about-program.md
@@ -23,7 +23,7 @@ As an administrator of the Azure Dev Tools for Teaching subscription, you can:
 
 We designed Azure Dev Tools for Teaching to help professors teach and help students learn more effectively.
 
-Your Azure Dev Tools for Teaching subscription gives you access to certain software developer tools. These tools are available to download for free. If you're a faculty member who is enrolled in an approved course, you're eligible to install Azure Dev Tools for Teaching software on your computer for noncommercial use.
+Your Azure Dev Tools for Teaching subscription gives you access to certain software developer tools. These tools are available to download for free. If you're a faculty member presenting an approved course, you're eligible to install Azure Dev Tools for Teaching software on your computer for noncommercial use.
 
 Students don't need to sign up for an Azure subscription to get their software benefits. Microsoft offers USD$100 in Azure credit for students, along with access to free Azure services. Students can sign up for the [Azure for Students offer](azure-students-program.md) without needing a credit card.
 
diff --git a/articles/event-grid/event-domains.md b/articles/event-grid/event-domains.md
@@ -9,7 +9,7 @@ ms.date: 11/15/2023
 
 # Understand event domains for managing Event Grid topics
 
-An event domain is a management tool for large number of Event Grid topics related to the same application. You can think of it as a meta-topic that can have thousands of individual topics. It provides one publishing endpoint for all the topics in the domain. When publishing an event, the publisher must specify the target topic in the domain to which it wants to publish. The publisher can send an array or a batch of events where events are sent to different topics in the domain. See the [Publishing events to an event domain](#publishing-to-an-event-domain) section for details. 
+An event domain provides an endpoint for thousands of individual topics related to the same application. You can think of it as a meta-topic that can have thousands of individual topics. It provides one publishing endpoint for all the topics in the domain. When publishing an event, the publisher must specify the target topic in the domain to which it wants to publish. The publisher can send an array or a batch of events where events are sent to different topics in the domain. See the [Publishing events to an event domain](#publishing-to-an-event-domain) section for details. 
 
 Domains also give you authentication and authorization control over each topic so you can partition your tenants. This article describes how to use event domains to manage the flow of custom events to your various business organizations, customers, or applications. Use event domains to:
 
diff --git a/articles/event-grid/includes/limits.md b/articles/event-grid/includes/limits.md
@@ -102,7 +102,7 @@ The following limits apply to Azure Event Grid custom topic, system topic, and p
 |--------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
 | Custom topics per Azure subscription                   | 100<br/>When the limit is reached, you can consider a different region or consider using domains, which can support 100,000 topics. |
 | Event subscriptions per topic                          | 500<br/>This limit can’t be increased.                                                                                              |
-| Publish rate for a custom or a partner topic (ingress) | 5,000 events of 64 KB size per second or 5 MB per second (whichever comes first). An event is counted for limits and pricing purposes as a 64KB data chunk. So, if the event is 128 KB, it counts as two events. |
+| Publish rate for a custom or a partner topic (ingress) | 5,000 events or 5 MB per second (whichever comes first). An event is counted for limits and pricing purposes as a 64KB data chunk. So, if the event is 128 KB, it counts as two events. |
 | Event size                                             | 1 MB<br/>This limit can’t be increased.                                                                                             |
 | Maximum event retention on topics              | 1 day. This limit can't be increased. |
 | Number of incoming events per batch                    | 5,000<br/>This limit can’t be increased                                                                                             |
@@ -119,7 +119,7 @@ The following limits apply to Azure Event Grid domain resource.
 | Topics per domain                             | 100,000                                                            |
 | Event subscriptions per topic within a domain | 500<br/>This limit can’t be increased                              |
 | Domain scope event subscriptions              | 50<br/>This limit can’t be increased                               |
-| Publish rate for a domain (ingress)           | 5,000 events of 64 KB size per second or 5 MB per second (whichever comes first). An event is counted for limits and pricing purposes as a 64KB data chunk. So, if the event is 128 KB, it counts as two events. |
+| Publish rate for a domain (ingress)           | 5,000 events or 5 MB per second (whichever comes first). An event is counted for limits and pricing purposes as a 64KB data chunk. So, if the event is 128 KB, it counts as two events. |
 | Maximum event retention on domain topics              | 1 day. This limit can't be increased. |
 | Private endpoint connections per domain       | 64                                                                 |
 | IP Firewall rules per topic                   | 128                                                                |
diff --git a/articles/sentinel/connect-logstash-data-connection-rules.md b/articles/sentinel/connect-logstash-data-connection-rules.md
@@ -71,7 +71,7 @@ The Microsoft Sentinel output plugin for Logstash sends JSON-formatted data to y
 - Install a supported version of Logstash. The plugin supports the following Logstash versions: 
     - 7.0 - 7.17.13
     - 8.0 - 8.9
-    - 8.11
+    - 8.11 - 8.13
 
     > [!NOTE]
     > If you use Logstash 8, we recommended that you [disable ECS in the pipeline](https://www.elastic.co/guide/en/logstash/8.4/ecs-ls.html).
diff --git a/articles/storage/file-sync/file-sync-release-notes.md b/articles/storage/file-sync/file-sync-release-notes.md
diff --git a/articles/storage/files/files-nfs-protocol.md b/articles/storage/files/files-nfs-protocol.md
diff --git a/articles/storage/files/storage-files-quick-create-use-linux.md b/articles/storage/files/storage-files-quick-create-use-linux.md
diff --git a/includes/api-management-virtual-network-prerequisites.md b/includes/api-management-virtual-network-prerequisites.md
