Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into 2023-07-AVG-Oracle

Author: b-ahibbard

articles/aks/best-practices-performance-scale-large.md

@@ -52,7 +52,7 @@ You can leverage API Priority and Fairness (APF) to throttle specific clients an
 
 Kubernetes clients are the applications clients, such as operators or monitoring agents, deployed in the Kubernetes cluster that need to communicate with the kube-api server to perform read or mutate operations. It's important to optimize the behavior of these clients to minimize the load they add to the kube-api server and Kubernetes control plane.
 
-AKS doesn't expose control plane and API server metrics via Prometheus or through platform metrics. However, you can analyze API server traffic and client behavior through Kube Audit logs. For more information, see [Troubleshoot the Kubernetes control plane](/troubleshoot/azure/azure-kubernetes/troubleshoot-apiserver-etcd).
+You can analyze API server traffic and client behavior through Kube Audit logs. For more information, see [Troubleshoot the Kubernetes control plane](/troubleshoot/azure/azure-kubernetes/troubleshoot-apiserver-etcd).
 
 LIST requests can be expensive. When working with lists that might have more than a few thousand small objects or more than a few hundred large objects, you should consider the following guidelines:
 
@@ -87,7 +87,7 @@ Always upgrade your Kubernetes clusters to the latest version. Newer versions co
 
 As you scale your AKS clusters to larger scale points, keep the following feature limitations in mind:
 
-* AKS supports scaling up to 5,000 nodes by default for all Standard Tier / LTS clusters. AKS scales your cluster's control plane at runtime based on cluster size and API server resource utilization. If you cannot scale up to the supported limit, enable [control plane metrics (Preview)](./monitor-control-plane-metrics.md) with the [Azure Monitor managed service for Prometheus](../azure-monitor/essentials/prometheus-metrics-overview.md) to monitor the control plane. To help troubleshoot scaling performance or reliability issues, see the following resources:
+* AKS supports scaling up to 5,000 nodes by default for all Standard Tier / LTS clusters. AKS scales your cluster's control plane at runtime based on cluster size and API server resource utilization. If you can't scale up to the supported limit, enable [control plane metrics (Preview)](./monitor-control-plane-metrics.md) with the [Azure Monitor managed service for Prometheus](../azure-monitor/essentials/prometheus-metrics-overview.md) to monitor the control plane. To help troubleshoot scaling performance or reliability issues, see the following resources:
   * [AKS at scale troubleshooting guide](/troubleshoot/azure/azure-kubernetes/aks-at-scale-troubleshoot-guide) 
   * [Troubleshoot the Kubernetes control plane](/troubleshoot/azure/azure-kubernetes/troubleshoot-apiserver-etcd)
 

articles/azure-monitor/logs/restore.md

@@ -6,7 +6,7 @@ ms.date: 10/01/2022
 ---
 
 # Restore logs in Azure Monitor
-The restore operation makes a specific time range of data in a table available in the hot cache for high-performance queries. This article describes how to restore data, query that data, and then dismiss the data when you're done. 
+The restore operation makes a specific time range of data in a table available in the hot cache for high-performance queries. This article describes how to restore data, query that data, and then dismiss the data when you're done.  
 
 ## Permissions
 
@@ -21,7 +21,7 @@ Use the restore operation to query data in [Archived Logs](data-retention-archiv
 ## What does restore do?
 When you restore data, you specify the source table that contains the data you want to query and the name of the new destination table to be created. 
 
-The restore operation creates the restore table and allocates additional compute resources for querying the restored data using high-performance queries that support full KQL.
+The restore operation creates the restore table and allocates extra compute resources for querying the restored data using high-performance queries that support full KQL.
 
 The destination table provides a view of the underlying source data, but doesn't affect it in any way. The table has no retention setting, and you must explicitly [dismiss the restored data](#dismiss-restored-data) when you no longer need it. 
 
@@ -124,27 +124,36 @@ You can:
 
 - Restore up to 60 TB.
 - Run up to two restore processes in a workspace concurrently.
-- Run only one active restore on a specific table at a given time. Executing a second restore on a table that already has an active restore will fail. 
+- Run only one active restore on a specific table at a given time. Executing a second restore on a table that already has an active restore fails. 
 - Perform up to four restores per table per week. 
 
 ## Pricing model
 
-The charge for restored logs is based on the volume of data you restore, and the duration for which the restore is active. Data restores are billed on each UTC-day that the restore is active. 
+The charge for restored logs is based on the volume of data you restore, and the duration for which the restore is active. Thus, the units of price are *per GB per day*. Data restores are billed on each UTC-day that the restore is active. 
 
 - Charges are subject to a minimum restored data volume of 2 TB per restore. If you restore less data, you will be charged for the 2 TB minimum each day until the [restore is dismissed](#dismiss-restored-data).
-- On the first and last days that the restore is active, charges are prorated based on the period that the restore is active. 
+- On the first and last days that the restore is active, you're only billed for the part of the day the restore was active. 
 
-- The minimum charge will be for a 12-hour restore duration, even if the restore is active for less than 12-hours.
+- The minimum charge is for a 12-hour restore duration, even if the restore is active for less than 12-hours.
 
-- For more information, see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/).
+- For more information on your data restore price, see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/) on the Logs tab.
 
-For example, if your table holds 500 GB a day and you restore 10 days data from that table, you'll be charged for 5 TB of restored data each day until you [dismiss the restored data](#dismiss-restored-data).
+Here are some examples to illustrate data restore cost calculations:
+
+1. If your table holds 500 GB a day and you restore 10 days data from that table, your total restore size is 5 TB. You are charged for this 5 TB of restored data each day until you [dismiss the restored data](#dismiss-restored-data). Your daily cost is 5,000 GB multiplied by your data restore price (see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/).) 
+
+1. If instead, only 700 GB of data is restored, each day that the restore is active is billed for the 2 TB minimum restore level. Your daily cost is 2,000 GB multiplied by your data restore price.
+
+1. If a 5 TB data restore is only kept active for 1 hour, it is billed for 12-hour minimum. The cost for this data restore is 5,000 GB multiplied by your data restore price multiplied by 0.5 days (the 12-hour minimum). 
+
+1. If a 700 GB data restore is only kept active for 1 hour, it is billed for 12-hour minimum. The cost for this data restore is 2,000 GB (the minimum billed restore size) multiplied by your data restore price multiplied by 0.5 days (the 12-hour minimum). 
 
 > [!NOTE]
 > There is no charge for querying restored logs since they are Analytics logs. 
 
 ## Next steps
 
 - [Learn more about data retention and archiving data.](data-retention-archive.md)
+
 - [Learn about Search jobs, which is another method for retrieving archived data.](search-jobs.md)
 

articles/index.yml

@@ -11,9 +11,9 @@ metadata:
   ms.custom:
     - ignite-2023
   ms.topic: hub-page
-  author: kcpitt
-  ms.author: kellypi
-  ms.date: 07/25/2023
+  author: JnHs
+  ms.author: jenhayes
+  ms.date: 04/17/2024
   featureFlags:
   - clicktale
 highlightedContent:
@@ -543,14 +543,6 @@ productDirectory:
         - containers
       url: container-apps/index.yml
     # Card
-    - title: Azure Dev Spaces
-      summary: Test and iteratively develop your microservices app in Azure AKS
-      imageSrc: ./media/index/AzureDevSpaceController_50x.svg
-      azureCategories:
-        - containers
-        - developer-tools
-      url: /previous-versions/azure/dev-spaces/
-    # Card
     - title: Azure Red Hat OpenShift
       summary: Fully managed OpenShift service, jointly operated with Red Hat
       imageSrc: ./media/index/openshift.svg
@@ -1133,13 +1125,13 @@ productDirectory:
         - media
       url: /azure/media-services/latest/player-media-players-concept
     # Card
-    - title: Content Delivery Network
+    - title: Azure Front Door and Content Delivery Network (CDN)
       summary: Ensure secure, reliable content delivery with broad global reach
       imageSrc: ./media/index/cdn-profiles.svg
       azureCategories:
         - media
         - web
-      url: cdn/index.yml
+      url: frontdoor/index.yml
     # Card
     - title: Content Protection
       summary: Securely deliver content using AES, PlayReady, Widevine, and Fairplay

articles/kubernetes-fleet/concepts-fleet.md

@@ -1,7 +1,7 @@
 ---
 title: "Azure Kubernetes Fleet Manager and member clusters"
 description: This article provides a conceptual overview of Azure Kubernetes Fleet Manager and member clusters.
-ms.date: 03/04/2024
+ms.date: 04/01/2024
 author: shashankbarsin
 ms.author: shasb
 ms.service: kubernetes-fleet
@@ -10,21 +10,24 @@ ms.topic: conceptual
 
 # Azure Kubernetes Fleet Manager and member clusters
 
-Azure Kubernetes Fleet Manager (Fleet) solves at-scale and multi-cluster problems for Kubernetes clusters.  This document provides a conceptual overview of fleet and its relationship with its member Kubernetes clusters. Right now Fleet supports joining AKS clusters as member clusters.
+This article provides a conceptual overview of fleets, member clusters, and hub clusters in Azure Kubernetes Fleet Manager (Fleet).
 
-[ ![Diagram that shows relationship between Fleet and Azure Kubernetes Service clusters.](./media/conceptual-fleet-aks-relationship.png) ](./media/conceptual-fleet-aks-relationship.png#lightbox)
+## What are fleets?
 
-## Fleet scenarios
+A fleet resource acts as a grouping entity for multiple AKS clusters. You can use them to manage multiple AKS clusters as a single entity, orchestrate updates across multiple clusters, propagate Kubernetes resources across multiple clusters, and provide a single pane of glass for managing multiple clusters. You can create a fleet with or without a [hub cluster](#what-is-a-hub-cluster-preview).
 
-A fleet is an Azure resource you can use to group and manage multiple Kubernetes clusters. Currently fleet supports the following scenarios:
-  * Create a Fleet resource and group AKS clusters as member clusters.
-  * Orchestrate latest or consistent Kubernetes version and node image upgrades across multiple clusters by using update runs, stages, and groups
-  * Create Kubernetes resource objects on the Fleet resource's hub cluster and control their propagation to member clusters (preview).
-  * Export and import services between member clusters, and load balance incoming L4 traffic across service endpoints on multiple clusters (preview).
+A fleet consists of the following components:
+
+:::image type="content" source="./media/concepts-fleet/fleet-architecture.png" alt-text="This screenshot shows a diagram of the fleet resource, including the hub cluster agent and the member cluster agent.":::
+
+* **fleet-hub-agent**: A Kubernetes controller that creates and reconciles all the fleet-related custom resources (CRs) in the hub cluster.
+* **fleet-member-agent**: A Kubernetes controller that creates and reconciles all the fleet-related CRs in the member clusters. This controller pulls the latest CRs from the hub cluster and consistently reconciles the member clusters to match the desired state.
 
 ## What are member clusters?
 
-You can join Azure Kubernetes Service (AKS) clusters to a fleet as member clusters. Member clusters must reside in the same Microsoft Entra tenant as the fleet. But they can be in different regions, different resource groups, and/or different subscriptions.
+The `MemberCluster` represents a cluster-scoped API established within the hub cluster, serving as a representation of a cluster within the fleet. This API offers a dependable, uniform, and automated approach for multi-cluster applications to identify registered clusters within a fleet. It also facilitates applications in querying a list of clusters managed by the fleet or in observing cluster statuses for subsequent actions. For more information, see [the upstream Fleet documentation](https://github.com/Azure/fleet/blob/main/docs/concepts/MemberCluster/README.md).
+
+You can join Azure Kubernetes Service (AKS) clusters to a fleet as member clusters. Member clusters must reside in the same Microsoft Entra tenant as the fleet, but they can be in different regions, different resource groups, and/or different subscriptions.
 
 ## What is a hub cluster (preview)?
 
@@ -36,7 +39,7 @@ For other scenarios such as Kubernetes resource propagation, a hub cluster is re
 
 The following table lists the differences between a fleet without hub cluster and a fleet with hub cluster:
 
-| Feature Dimension | Without hub cluster | With hub cluster (preview) |
+| Feature dimension | Without hub cluster | With hub cluster (preview) |
 |-|-|-|
 | Hub cluster hosting (preview) | :x: | :white_check_mark: |
 | Member cluster limit | Up to 100 clusters | Up to 20 clusters |
@@ -57,8 +60,9 @@ The fleet resource without hub cluster is currently free of charge. If your flee
 ## FAQs
 
 ### Can I change a fleet without hub cluster to a fleet with hub cluster?
-No during hub cluster preview, to be supported once hub clusters become generally available.
+
+Not during hub cluster preview. This is planned to be supported once hub clusters become generally available.
 
 ## Next steps
 
-* [Create a fleet and join member clusters](./quickstart-create-fleet-and-members.md).
+* [Create a fleet and join member clusters](./quickstart-create-fleet-and-members.md).

articles/kubernetes-fleet/concepts-scheduler-scheduling-framework.md

@@ -0,0 +1,49 @@
+---
+title: "Azure Kubernetes Fleet Manager scheduler and scheduling framework"
+description: This article provides a conceptual overview of the Azure Kubernetes Fleet Manager scheduler and scheduling framework.
+ms.date: 04/01/2024
+author: schaffererin
+ms.author: schaffererin
+ms.service: kubernetes-fleet
+ms.topic: conceptual
+---
+
+# Azure Kubernetes Fleet Manager scheduler and scheduling framework
+
+This article provides a conceptual overview of the scheduler and scheduling framework in Azure Kubernetes Fleet Manager (Fleet).
+
+## What is the scheduler?
+
+The scheduler is a core component in the fleet workload with the primary responsibility of determining scheduling decisions for a bundle of resources based on the latest `ClusterSchedulingPolicySnapshot` generated by the [`ClusterResourcePlacement`](./concepts-resource-propagation.md).
+
+By default, the scheduler operates in *batch mode*, which enhances performance. In this mode, it binds a `ClusterResourceBinding` from a `ClusterResourcePlacement` to multiple clusters whenever possible.
+
+### Batch mode
+
+Scheduling resources within a `ClusterResourcePlacement` involves more dependencies compared to scheduling pods within a Kubernetes Deployment. There are two notable distinctions:
+
+* In a `ClusterResourcePlacement`, multiple replicas of resources can't be scheduled on the same cluster.
+* The `ClusterResourcePlacement` supports different placement types within a single object.
+
+For more information, see [the upstream Fleet Scheduler documentation](https://github.com/Azure/fleet/blob/main/docs/concepts/Scheduler/README.md).
+
+## What is the scheduling framework?
+
+The fleet scheduling framework closely aligns with the native [Kubernetes scheduling framework](https://kubernetes.io/docs/concepts/scheduling-eviction/scheduling-framework/), incorporating several modifications and tailored functionalities to support the fleet workload.
+
+:::image type="content" source="./media/concepts-scheduler-scheduling-framework/scheduling-framework.png" alt-text="This screenshot shows an overview diagram of the fleet scheduling framework.":::
+
+The primary advantage of this framework is its capability to compile plugins directly into the scheduler. Its API facilitates the implementation of diverse scheduling features as plugins, ensuring a lightweight and maintainable core.
+
+The fleet scheduler integrates the following fundamental built-in plugins:
+
+* **Topology spread plugin**: Supports the `TopologySpreadConstraints` in the placement policy.
+* **Cluster affinity plugin**: Facilitates the affinity clause in the placement policy.
+* **Same placement affinity plugin**: Designed specifically for fleet and prevents multiple replicas from being placed within the same cluster.
+* **Cluster eligibility plugin**: Enables cluster selection based on specific status criteria.
+
+For more information, see the [upstream Fleet Scheduling Framework documentation](https://github.com/Azure/fleet/blob/main/docs/concepts/Scheduling-Framework/README.md).
+
+## Next steps
+
+* [Create a fleet and join member clusters](./quickstart-create-fleet-and-members.md).

articles/kubernetes-fleet/index.yml

@@ -20,6 +20,8 @@ landingContent:
         links:
           - text: Fleets and member clusters
             url: concepts-fleet.md
+          - text: Scheduler and scheduling framework
+            url: concepts-scheduler-scheduling-framework.md
           - text: Update orchestration across multiple member clusters
             url: concepts-update-orchestration.md
           - text: Kubernetes resource propagation from hub cluster to member clusters

articles/kubernetes-fleet/media/concepts-fleet/fleet-architecture.png

@@ -20,6 +20,8 @@
   items:
   - name: Fleets and member clusters
     href: concepts-fleet.md
+  - name: Scheduler and scheduling framework
+    href: concepts-scheduler-scheduling-framework.md
   - name: Update orchestration across multiple member clusters
     href: concepts-update-orchestration.md
   - name: Kubernetes workload orchestration