Skip to content

Commit 5a8c65d

Browse files
authored
Merge pull request #96114 from MicrosoftDocs/master
11/15 AM Publish
2 parents 157e41d + 622060a commit 5a8c65d

File tree

68 files changed

+374
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+374
-317
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4776,6 +4776,11 @@
47764776
"redirect_url": "/azure/app-service-mobile",
47774777
"redirect_document_id": false
47784778
},
4779+
{
4780+
"source_path": "articles/application-gateway/application-gateway-ssl-cli.md",
4781+
"redirect_url": "/azure/application-gateway/tutorial-ssl-cli",
4782+
"redirect_document_id": false
4783+
},
47794784
{
47804785
"source_path": "articles/application-gateway/application-gateway-ssl-arm.md",
47814786
"redirect_url": "/azure/application-gateway/tutorial-ssl-powershell",

articles/aks/concepts-clusters-workloads.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: mlearned
1414

1515
As application development moves towards a container-based approach, the need to orchestrate and manage resources is important. Kubernetes is the leading platform that provides the ability to provide reliable scheduling of fault-tolerant application workloads. Azure Kubernetes Service (AKS) is a managed Kubernetes offering that further simplifies container-based application deployment and management.
1616

17-
This article introduces the core Kubernetes infrastructure components such as the *cluster master*, *nodes*, and *node pools*. Workload resources such as *pods*, *deployments*, and *sets* are also introduced, along with how to group resources into *namespaces*.
17+
This article introduces the core Kubernetes infrastructure components such as the *control plane*, *nodes*, and *node pools*. Workload resources such as *pods*, *deployments*, and *sets* are also introduced, along with how to group resources into *namespaces*.
1818

1919
## What is Kubernetes?
2020

@@ -24,41 +24,41 @@ You can build and run modern, portable, microservices-based applications that be
2424

2525
As an open platform, Kubernetes allows you to build your applications with your preferred programming language, OS, libraries, or messaging bus. Existing continuous integration and continuous delivery (CI/CD) tools can integrate with Kubernetes to schedule and deploy releases.
2626

27-
Azure Kubernetes Service (AKS) provides a managed Kubernetes service that reduces the complexity for deployment and core management tasks, including coordinating upgrades. The AKS cluster masters are managed by the Azure platform, and you only pay for the AKS nodes that run your applications. AKS is built on top of the open-source Azure Kubernetes Service Engine ([aks-engine][aks-engine]).
27+
Azure Kubernetes Service (AKS) provides a managed Kubernetes service that reduces the complexity for deployment and core management tasks, including coordinating upgrades. The AKS control plane is managed by the Azure platform, and you only pay for the AKS nodes that run your applications. AKS is built on top of the open-source Azure Kubernetes Service Engine ([aks-engine][aks-engine]).
2828

2929
## Kubernetes cluster architecture
3030

3131
A Kubernetes cluster is divided into two components:
3232

33-
- *Cluster master* nodes provide the core Kubernetes services and orchestration of application workloads.
33+
- *Control plane* nodes provide the core Kubernetes services and orchestration of application workloads.
3434
- *Nodes* run your application workloads.
3535

36-
![Kubernetes cluster master and node components](media/concepts-clusters-workloads/cluster-master-and-nodes.png)
36+
![Kubernetes control plane and node components](media/concepts-clusters-workloads/control-plane-and-nodes.png)
3737

38-
## Cluster master
38+
## Control plane
3939

40-
When you create an AKS cluster, a cluster master is automatically created and configured. This cluster master is provided as a managed Azure resource abstracted from the user. There's no cost for the cluster master, only the nodes that are part of the AKS cluster.
40+
When you create an AKS cluster, a control plane is automatically created and configured. This control plane is provided as a managed Azure resource abstracted from the user. There's no cost for the control plane, only the nodes that are part of the AKS cluster.
4141

42-
The cluster master includes the following core Kubernetes components:
42+
The control plane includes the following core Kubernetes components:
4343

4444
- *kube-apiserver* - The API server is how the underlying Kubernetes APIs are exposed. This component provides the interaction for management tools, such as `kubectl` or the Kubernetes dashboard.
4545
- *etcd* - To maintain the state of your Kubernetes cluster and configuration, the highly available *etcd* is a key value store within Kubernetes.
4646
- *kube-scheduler* - When you create or scale applications, the Scheduler determines what nodes can run the workload and starts them.
4747
- *kube-controller-manager* - The Controller Manager oversees a number of smaller Controllers that perform actions such as replicating pods and handling node operations.
4848

49-
AKS provides a single-tenant cluster master, with a dedicated API server, Scheduler, etc. You define the number and size of the nodes, and the Azure platform configures the secure communication between the cluster master and nodes. Interaction with the cluster master occurs through Kubernetes APIs, such as `kubectl` or the Kubernetes dashboard.
49+
AKS provides a single-tenant control plane, with a dedicated API server, Scheduler, etc. You define the number and size of the nodes, and the Azure platform configures the secure communication between the control plane and nodes. Interaction with the control plane occurs through Kubernetes APIs, such as `kubectl` or the Kubernetes dashboard.
5050

51-
This managed cluster master means that you don't need to configure components like a highly available *etcd* store, but it also means that you can't access the cluster master directly. Upgrades to Kubernetes are orchestrated through the Azure CLI or Azure portal, which upgrades the cluster master and then the nodes. To troubleshoot possible issues, you can review the cluster master logs through Azure Monitor logs.
51+
This managed control plane means that you don't need to configure components like a highly available *etcd* store, but it also means that you can't access the control plane directly. Upgrades to Kubernetes are orchestrated through the Azure CLI or Azure portal, which upgrades the control plane and then the nodes. To troubleshoot possible issues, you can review the control plane logs through Azure Monitor logs.
5252

53-
If you need to configure the cluster master in a particular way or need direct access to them, you can deploy your own Kubernetes cluster using [aks-engine][aks-engine].
53+
If you need to configure the control plane in a particular way or need direct access to it, you can deploy your own Kubernetes cluster using [aks-engine][aks-engine].
5454

5555
For associated best practices, see [Best practices for cluster security and upgrades in AKS][operator-best-practices-cluster-security].
5656

5757
## Nodes and node pools
5858

5959
To run your applications and supporting services, you need a Kubernetes *node*. An AKS cluster has one or more nodes, which is an Azure virtual machine (VM) that runs the Kubernetes node components and container runtime:
6060

61-
- The `kubelet` is the Kubernetes agent that processes the orchestration requests from the cluster master and scheduling of running the requested containers.
61+
- The `kubelet` is the Kubernetes agent that processes the orchestration requests from the control plane and scheduling of running the requested containers.
6262
- Virtual networking is handled by the *kube-proxy* on each node. The proxy routes network traffic and manages IP addressing for services and pods.
6363
- The *container runtime* is the component that allows containerized applications to run and interact with additional resources such as the virtual network and storage. In AKS, Moby is used as the container runtime.
6464

Binary file not shown.
17.4 KB
Loading

articles/application-gateway/application-gateway-ssl-cli.md

Lines changed: 0 additions & 172 deletions
This file was deleted.

articles/azure-arc/servers/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Log data collected by the [Microsoft Monitoring Agent (MMA)](https://docs.micros
128128

129129
- Machines that already have the MMA agent installed, will have **Azure Arc** functionality enabled via updated Management Packs.
130130
- [MMA agent version 10.20.18011 or above](https://docs.microsoft.com/azure/virtual-machines/extensions/oms-windows#agent-and-vm-extension-version) is required for Azure Arc for servers integration.
131-
- When querying for log data in [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview#log-queries), the returned data schema will contain the Hybrid **ResourceId** in the form `/subscriptions/<SubscriptionId/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<MachineName>`.
131+
- When querying for log data in [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview), the returned data schema will contain the Hybrid **ResourceId** in the form `/subscriptions/<SubscriptionId/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<MachineName>`.
132132

133133
For more information, see [Get started with Log Analytics in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/get-started-portal).
134134

articles/azure-databricks/databricks-stream-from-eventhubs.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ ms.author: alehall
1515

1616
# Tutorial: Stream data into Azure Databricks using Event Hubs
1717

18-
> [!IMPORTANT]
19-
> This tutorial works with the version of Azure Databricks runtime 5.2.
20-
2118
In this tutorial, you connect a data ingestion system with Azure Databricks to stream data into an Apache Spark cluster in near real-time. You set up data ingestion system using Azure Event Hubs and then connect it to Azure Databricks to process the messages coming through. To access a stream of data, you use Twitter APIs to ingest tweets into Event Hubs. Once you have the data in Azure Databricks, you can run analytical jobs to further analyze the data.
2219

2320
By the end of this tutorial, you would have streamed tweets from Twitter (that have the term "Azure" in them) and read the tweets in Azure Databricks.
@@ -100,7 +97,7 @@ In this section, you create an Azure Databricks workspace using the Azure portal
10097
Accept all other default values other than the following:
10198

10299
* Enter a name for the cluster.
103-
* For this article, create a cluster with **5.2** runtime.
100+
* For this article, create a cluster with **6.0* runtime.
104101
* Make sure you select the **Terminate after \_\_ minutes of inactivity** checkbox. Provide a duration (in minutes) to terminate the cluster, if the cluster is not being used.
105102

106103
Select cluster worker and driver node size suitable for your technical criteria and [budget](https://azure.microsoft.com/pricing/details/databricks/).

articles/azure-monitor/platform/metrics-supported.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,7 @@ Azure Monitor provides several ways to interact with metrics, including charting
14441444
|cpu_limit|CPU limit|Count|Average|CPU limit. Applies to vCore-based databases.|No Dimensions|
14451445
|cpu_used|CPU used|Count|Average|CPU used. Applies to vCore-based databases.|No Dimensions|
14461446
|deadlock|Deadlocks|Count|Total|Deadlocks. Not applicable to data warehouses.|No Dimensions|
1447+
|diff_backup_size_bytes|Differential backup storage size|Bytes|Maximum|Cumulative differential backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14471448
|dtu_limit|DTU Limit|Count|Average|DTU Limit. Applies to DTU-based databases.|No Dimensions|
14481449
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage. Applies to DTU-based databases.|No Dimensions|
14491450
|dtu_used|DTU used|Count|Average|DTU used. Applies to DTU-based databases.|No Dimensions|
@@ -1452,7 +1453,9 @@ Azure Monitor provides several ways to interact with metrics, including charting
14521453
|dwu_consumption_percent|DWU percentage|Percent|Maximum|DWU percentage. Applies only to data warehouses.|No Dimensions|
14531454
|dwu_limit|DWU limit|Count|Maximum|DWU limit. Applies only to data warehouses.|No Dimensions|
14541455
|dwu_used|DWU used|Count|Maximum|DWU used. Applies only to data warehouses.|No Dimensions|
1456+
|full_backup_size_bytes|Full backup storage size|Bytes|Maximum|Cumulative full backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14551457
|local_tempdb_usage_percent|Local tempdb percentage|Percent|Average|Local tempdb percentage. Applies only to data warehouses.|No Dimensions|
1458+
|log_backup_size_bytes|Log backup storage size|Bytes|Maximum|Cumulative log backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14561459
|log_write_percent|Log IO percentage|Percent|Average|Log IO percentage. Not applicable to data warehouses.|No Dimensions|
14571460
|physical_data_read_percent|Data IO percentage|Percent|Average|Data IO percentage|No Dimensions|
14581461
|sessions_percent|Sessions percentage|Percent|Average|Sessions percentage. Not applicable to data warehouses.|No Dimensions|

0 commit comments

Comments
 (0)