Skip to content

Commit 70b2e9d

Browse files
authored
Merge pull request #16634 from MicrosoftDocs/main
12/18/2024 PM Publish
2 parents d06c196 + 95515ec commit 70b2e9d

19 files changed

+109
-98
lines changed

AKS-Hybrid/TOC.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,18 @@
130130
items:
131131
- name: Monitor Kubernetes object events
132132
href: kubernetes-monitor-object-events.md
133-
- name: Monitor Kubernetes audit events
134-
href: kubernetes-monitor-audit-events.md
135-
- name: Monitor logs reference
136-
href: kubernetes-monitor-metrics.md
133+
- name: Get kubelet logs
134+
href: aks-get-kubelet-logs.md
137135
- name: Enable Container Insights
138136
href: /azure/azure-monitor/containers/kubernetes-monitoring-enable
137+
- name: Monitor Kubernetes audit events
138+
href: kubernetes-monitor-audit-events.md
139139
- name: Use on-premises monitoring
140140
href: aks-monitor-logging.md
141-
- name: Get kubelet logs
142-
href: aks-get-kubelet-logs.md
143141
- name: Get on-demand logs for troubleshooting
144142
href: get-on-demand-logs.md
143+
- name: Monitoring data reference
144+
href: kubernetes-monitor-metrics.md
145145
- name: Troubleshooting
146146
items:
147147
- name: Troubleshoot & known issues

AKS-Hybrid/aks-create-clusters-cli.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Local using Azure
44
ms.topic: how-to
55
ms.custom: devx-track-azurecli
66
author: sethmanheim
7-
ms.date: 11/18/2024
7+
ms.date: 12/18/2024
88
ms.author: sethm
99
ms.lastreviewed: 01/25/2024
1010
ms.reviewer: guanghu
@@ -96,7 +96,7 @@ moc-l0ttdmaioew Ready control-plane,master 34m v1.24.11
9696
moc-ls38tngowsl Ready <none> 32m v1.24.11
9797
```
9898

99-
## Deploy the application
99+
## Deploy the application and load balancer
100100

101101
[Kubernetes manifest file](kubernetes-concepts.md#deployments) defines a cluster's desired state, such as which container images to run.
102102

@@ -215,6 +215,8 @@ deployment "azure-vote-front" created
215215
service "azure-vote-front" created
216216
```
217217

218+
Deploy a MetalLB load balancer so it can assign an external IP for the application front end. You can [follow these instructions](deploy-load-balancer-cli.md) to deploy the MetalLB extension from the Azure portal, or using CLI.
219+
218220
## Test the application
219221

220222
When the application runs, a Kubernetes service exposes the application frontend to the internet. This process can take a few minutes to complete.

AKS-Hybrid/kubernetes-monitor-audit-events.md

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Monitor Kubernetes audit events in AKS enabled by Azure Arc
33
description: Learn how to create a diagnostic setting to access Kubernetes audit logs.
44
author: sethmanheim
55
ms.topic: how-to
6-
ms.date: 02/26/2024
6+
ms.date: 12/18/2024
77
ms.author: sethm
88
ms.lastreviewed: 02/26/2024
99
ms.reviewer: guanghu
@@ -26,7 +26,7 @@ Install the Arc K8S extension by running the following command:
2626
az k8s-extension create -g <resouerce-group-name> -c <cluster-name> --cluster-type connectedClusters --extension-type Microsoft.AKSArc.AzureMonitor --name "aksarc-azuremonitor" --auto-upgrade true
2727
```
2828

29-
After the extension installs successfully, follow the instructions in [Diagnostic settings in Azure Monitor](/azure/azure-monitor/essentials/diagnostic-settings#resource-logs) to create a diagnostic setting using the Azure portal, Azure CLI, or PowerShell. During this process, you can specify which categories of logs to collect. The categories for AKS Arc are listed in the [Azure Monitor reference](/azure/azure-monitor/logs/manage-logs-tables).
29+
After the extension installs successfully, follow the instructions in [Diagnostic settings in Azure Monitor](/azure/azure-monitor/essentials/diagnostic-settings#resource-logs) to create a diagnostic setting using the Azure portal, Azure CLI, or PowerShell. During this process, you can specify which categories of logs to collect. The categories for AKS Arc are listed in the [Monitoring data reference](/azure/azure-monitor/logs/manage-logs-tables).
3030

3131
The example command is as follows:
3232

@@ -36,32 +36,16 @@ az monitor diagnostic-settings create –name <Diagnostics_Setting_Name> --resou
3636

3737
:::image type="content" source="media/kubernetes-monitor-audit-events/diagnostic-settings.png" alt-text="Screenshot of portal blade showing diagnostic settings." lightbox="media/kubernetes-monitor-audit-events/diagnostic-settings.png":::
3838

39-
AKS supports either[Azure diagnostics mode](/azure/azure-monitor/essentials/resource-logs#azure-diagnostics-mode) or [resource-specific mode](/azure/azure-monitor/essentials/resource-logs#resource-specific)for resource logs. The mode specifies the tables in the Log Analytics workspace to which the data is sent. Azure diagnostics mode sends all data to the[AzureDiagnostics table](/azure/azure-monitor/reference/tables/azurediagnostics), while resource-specific mode sends data to[ArcK8SAudit](/azure/azure-monitor/reference/tables/arck8saudit),[ArcK8SAuditAdmin](/azure/azure-monitor/reference/tables/arck8sauditadmin), and[ArcK8SControlPlane](/azure/azure-monitor/reference/tables/arck8scontrolplane), as shown in the log category table in the next section.
39+
AKS supports either [Azure diagnostics mode](/azure/azure-monitor/essentials/resource-logs#azure-diagnostics-mode) or [resource-specific mode](/azure/azure-monitor/essentials/resource-logs#resource-specific) for resource logs. The mode specifies the tables in the Log Analytics workspace to which the data is sent. Azure diagnostics mode sends all data to the [AzureDiagnostics table](/azure/azure-monitor/reference/tables/azurediagnostics), while resource-specific mode sends data to [ArcK8SAudit](/azure/azure-monitor/reference/tables/arck8saudit), [ArcK8SAuditAdmin](/azure/azure-monitor/reference/tables/arck8sauditadmin), and [ArcK8SControlPlane](/azure/azure-monitor/reference/tables/arck8scontrolplane), as shown in the log category table in the next section.
4040

41-
After you save the setting, it can take an hour to see the events in the Log Analytics workspace or other supported destination. You can write a KQL query to extract the insights based on the log category you enabled.
42-
43-
### Log category
44-
45-
| Category | Description | Table (resource-specific mode) |
46-
|----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------|
47-
| kube-apiserver | Logs from the API server. | ArcK8SControlPlane. |
48-
| kube-audit | Audit log data for every audit event including get, list, create, update, delete, patch, and post. | ArcK8SAudit |
49-
| kube-audit-admin | Subset of the kube-audit log category. Significantly reduces the number of logs by excluding the get and list audit events from the log. | ArcK8SAuditAdmin |
50-
| kube-controller-manager | Gain deeper visibility of issues that may arise between Kubernetes and the Azure control plane. A typical example is the AKS cluster having a lack of permissions to interact with Azure. | ArcK8SControlPlane |
51-
| kube-scheduler | Logs from the scheduler. | ArcK8SControlPlane. |
52-
| cluster-autoscaler | Understand why the AKS cluster is scaling up or down, which may not be expected. This information is also useful to correlate time intervals where something interesting might have happened in the cluster. | ArcK8SControlPlane |
53-
| cloud-controller-manager | Logs from the cloud-node-manager component of the Kubernetes cloud controller manager. | ArcK8SControlPlane |
54-
| guard | Managed Microsoft Entra ID and Azure RBAC audits. For managed Microsoft Entra ID, this category includes token in and user info out. For Azure RBAC, it includes access reviews in and out. | ArcK8SControlPlane |
55-
| csi-aksarcdisk-controller | Logs from the AKS Arc CSI storage driver. | ArcK8SControlPlane. |
56-
| csi-aksarcsmb-controller | Logs from the AKS Arc SMB CSI storage driver. | ArcK8SControlPlane. |
57-
| csi-aksarcnfs-controller | Logs from the AKS Arc NFS CSI storage driver. | ArcK8SControlPlane. |
41+
After you save the settings, it can take up to an hour to see the events in the Log Analytics workspace or other supported destination. You can write a KQL query to extract the insights based on the log categories you enabled.
5842

5943
## Delete and disable the diagnostics setting
6044

6145
You can delete the diagnostics setting using the Azure portal, PowerShell, or Azure CLI:
6246

6347
```azurecli
64-
az monitor diagnostic-settings delete name <diagnostics-setting-name> --resource <resource-name> -g <resource-group-name>
48+
az monitor diagnostic-settings delete -name <diagnostics-setting-name> --resource <resource-name> -g <resource-group-name>
6549
```
6650

6751
After you successfully delete the setting, you can then delete the extension using Azure CLI:

AKS-Hybrid/kubernetes-monitor-metrics.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ title: Metrics and monitoring logs in AKS Arc
33
description: Learn about metrics and logs used to monitor Kubernetes clusters in AKS Arc.
44
author: sethmanheim
55
ms.topic: how-to
6-
ms.date: 05/30/2024
6+
ms.date: 12/18/2024
77
ms.author: sethm
88
ms.lastreviewed: 03/28/2024
9-
ms.reviewer: haojiehan
9+
ms.reviewer: haojiehang
1010

1111
---
1212

@@ -16,16 +16,27 @@ This article provides an overview of the metrics and logs used to monitor Kubern
1616

1717
## Metrics
1818

19-
The following table lists the platform metrics collected for AKS Arc. Follow each link for a detailed list of the metrics for each particular type.
19+
### Platform Metrics
20+
21+
The following table lists the platform metrics supported for AKS Arc. To view these basic platform metrics, you can install the observability extension on your Kubernetes cluster and wait a few minutes to start the automatic metrics ingestion. Follow each link for a detailed list of the metrics for each particular type:
2022

2123
| Metric type | Resource provider/type namespace |
2224
|-----------------------|--------------------------------------------------------|
2325
| Provisioned clusters | [Microsoft.HybridContainerService/provisionedClusters](/azure/azure-monitor/reference/supported-metrics/microsoft-hybridcontainerservice-provisionedclusters-metrics) |
2426
| Connected clusters | [Microsoft.Kubernetes/connectedClusters](/azure/azure-monitor/reference/supported-metrics/microsoft-kubernetes-connectedclusters-metrics) |
2527

26-
## Azure Monitor resource logs
28+
### Prometheus Metrics
29+
30+
To view more granular metrics, it's recommended that you enable the Managed Prometheus extension in your Kubernetes, and then query Prometheus metrics in Metrics Explorer or Managed Grafana. For the extension onboarding instructions, [see this article](/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#enable-prometheus-and-grafana).
31+
32+
33+
## Azure Monitor Logs
2734

28-
AKS Arc implements control plane logs (including audit logs) for clusters as [resource logs in Azure Monitor](/azure/azure-monitor/essentials/resource-logs). For more information about creating diagnostic settings to collect these logs, see [Monitor Kubernetes audit events](/azure/aks/hybrid/kubernetes-monitor-audit-events). The following table lists the resource log categories you can collect for AKS Arc:
35+
AKS Arc supports two types of logs: Control Plane logs implemented as resource logs, and container insights logs. For more information about exporting control plane logs such as audit logs using diagnostic settings, see [Monitor Kubernetes audit events](/azure/aks/hybrid/kubernetes-monitor-audit-events). For more information about enabling container insights, see [Enable Container Insights](/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli).
36+
37+
### Control Plane Logs
38+
39+
The following table lists the log categories available for AKS Arc. You can also see this table in the [Azure Monitor resource log reference](/azure/azure-monitor/reference/supported-logs/microsoft-kubernetes-connectedclusters-logs):
2940

3041
| Category | Description | Table (resource-specific mode) |
3142
|----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
@@ -43,23 +54,18 @@ AKS Arc implements control plane logs (including audit logs) for clusters as [re
4354

4455
For more information, see the list of [all resource log category types supported in Azure Monitor](/azure/azure-monitor/essentials/resource-logs-schema).
4556

46-
## Azure Monitor log tables
47-
48-
The following table lists all the Azure Monitor log tables relevant to AKS Arc:
57+
### Azure Monitor log tables
4958

50-
| Resource Type | Notes |
51-
|-------------------|--------------------------------------------------------------------------------------------------|
52-
| [ConnectedCluster](/azure/azure-monitor/logs/manage-logs-tables) | Follow this link for a list of all tables used by AKS Arc, and a description of their structure. |
59+
You can analyze both the control plane logs and the container insights in Log Analytics Workspace. See the Log Analytics tables in the [Azure Monitor Reference](/azure/azure-monitor/reference/tables-index#azure-arc-enabled-kubernetes).
5360

54-
## Azure Activity log
61+
## Activity log
5562

56-
The following table links to a few example operations related to AKS Arc that might be created in the [Activity log](/azure/azure-monitor/essentials/activity-log-insights). Use the activity log to track information such as when a cluster is created, or had its configuration change:
63+
The following table lists a few example operations related to AKS that might be created in the activity log. Use the activity log to track information such as when a cluster is created, or had its configuration change. You can view this information in the portal or by using other methods. You can also use it to create an activity log alert to be proactively notified when an event occurs:
5764

5865
| Resource Type | Notes |
5966
|------------------------------|----------------------------------------------------------------------------------|
6067
| [ProvisionedClusterInstances](/rest/api/hybridcontainer/provisioned-cluster-instances) | Follow this link for a list and descriptions of operations used in AKS Arc. |
6168

62-
For more information about the schema of Activity log entries, see the [Activity log schema](/azure/azure-monitor/essentials/activity-log-schema).
6369

6470
## Next steps
6571

AKS-Hybrid/resource-manager-quickstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy a Kubernetes (AKS) cluster using an Azure Resource Manager templat
33
description: Learn how to deploy a Kubernetes cluster in AKS enabled by Azure Arc using an Azure Resource Manager template.
44
ms.topic: quickstart-arm
55
ms.custom: devx-track-arm-template, devx-track-azurecli
6-
ms.date: 12/17/2024
6+
ms.date: 12/18/2024
77
author: sethmanheim
88
ms.author: sethm
99
ms.lastreviewed: 01/31/2024
@@ -125,7 +125,7 @@ az aksarc show --resource-group "<resource-group-name>" --name "<cluster-name>"
125125

126126
Similiar to step 3, download the node pool template and parameters from the [AKSArc repo](https://github.com/Azure/aksArc/tree/main/deploymentTemplates) and review the default values.
127127

128-
### Deploy the template and validate results using Azure CLI (optional)
128+
## Step 8: Deploy the template and validate the deployment (optional)
129129

130130
Review and apply the template. This process takes a few minutes to complete. You can use the Azure CLI to validate that the node pool is created successfully:
131131

azure-local/TOC.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,6 @@ items:
364364
href: manage/vm-affinity.md
365365
- name: VM load balancing
366366
href: manage/vm-load-balancing.md
367-
- name: Dynamic CPU compatibility
368-
href: /windows-server/virtualization/hyper-v/manage/dynamic-processor-compatibility-mode?pivots=azure-local&context=/azure/azure-local/context/context
369-
- name: GPU Partitioning
370-
href: /windows-server/virtualization/hyper-v/gpu-partitioning?pivots=azure-local&context=/azure/azure-local/context/context
371-
- name: Partition and assign GPUs to a virtual machine
372-
href: /windows-server/virtualization/hyper-v/partition-assign-vm-gpu?pivots=azure-local&context=/azure/azure-local/context/context
373367
- name: Attach GPU to Linux VM
374368
href: manage/attach-gpu-to-linux-vm.md
375369

azure-local/assurance/azure-stack-pci-dss-guidance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: PCI DSS guidance for Azure Local
33
description: Learn about PCI DSS compliance using Azure Local.
4-
ms.date: 11/07/2024
4+
ms.date: 12/17/2024
55
ms.topic: conceptual
66
ms.service: azure-stack-hci
77
ms.author: nguyenhung
@@ -95,9 +95,9 @@ By default, all host communications to local and remote endpoints are encrypted
9595

9696
Windows Defender Antivirus is a utility application that enables enforcement of real-time system scanning and periodic scanning to protect platform and workloads against viruses, malware, spyware, and other threats. By default, Microsoft Defender Antivirus is enabled on Azure Local. Microsoft recommends using Microsoft Defender Antivirus with Azure Local rather than third-party antivirus and malware detection software and services as they may impact the operating system's ability to receive updates. Learn more at [Microsoft Defender Antivirus on Windows Server](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-on-windows-server).
9797

98-
#### Windows Defender Application Control (WDAC)
98+
#### Application Control
9999

100-
Windows Defender Application Control (WDAC) is enabled by default on Azure Local to control which drivers and applications are allowed to run directly on each server, helping prevent malware from accessing the systems. Learn more about base policies included in Azure Local and how to create supplemental policies at [Windows Defender Application Control for Azure Local](/azure-stack/hci/concepts/security-windows-defender-application-control).
100+
Application Control is enabled by default on Azure Local to control which drivers and applications are allowed to run directly on each server, helping prevent malware from accessing the systems. Learn more about base policies included in Azure Local and how to create supplemental policies at [Application Control for Azure Local](/azure-stack/hci/concepts/security-windows-defender-application-control).
101101

102102
#### Microsoft Defender for Cloud
103103

0 commit comments

Comments
 (0)