Skip to content

Commit 5e4c935

Browse files
committed
Fresh top 40
1 parent 26e2774 commit 5e4c935

9 files changed

+172
-189
lines changed

AKS-Arc/aks-vmware-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: AKS enabled by Azure Arc on VMware overview (preview)
33
description: Learn about AKS enabled by Azure Arc deployment options on VMware.
44
ms.topic: overview
5-
ms.date: 03/22/2024
5+
ms.date: 05/08/2025
66
author: sethmanheim
77
ms.author: sethm
88
ms.reviewer: leslielin

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

Lines changed: 2 additions & 2 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: 12/18/2024
6+
ms.date: 05/08/2024
77
ms.author: sethm
88
ms.lastreviewed: 02/26/2024
99
ms.reviewer: guanghu
@@ -14,7 +14,7 @@ ms.reviewer: guanghu
1414

1515
[!INCLUDE [hci-applies-to-23h2](includes/hci-applies-to-23h2.md)], AKS enabled by Azure Arc on VMware (preview)
1616

17-
You can access Kubernetes audit logs in Kubernetes control plane logs. Control plane logs for AKS clusters are implemented as [resource logs](/azure/azure-monitor/essentials/resource-logs)in Azure Monitor. Resource logs aren't collected and stored until you create a diagnostic setting to route them to one or more locations. You typically send them to a Log Analytics workspace, which is where most of the data for Container Insights is stored.
17+
You can access Kubernetes audit logs in Kubernetes control plane logs. Control plane logs for AKS clusters are implemented as [resource logs](/azure/azure-monitor/essentials/resource-logs) in Azure Monitor. Resource logs aren't collected and stored until you create a diagnostic setting to route them to one or more locations. You typically send them to a Log Analytics workspace, which is where most of the data for Container Insights is stored.
1818

1919
## Create a diagnostic setting
2020

azure-local/concepts/azure-hybrid-benefit.md

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: sethm
66
ms.topic: conceptual
77
ms.service: azure-local
88
ms.custom: devx-track-azurepowershell
9-
ms.date: 12/09/2024
9+
ms.date: 05/08/2025
1010
---
1111

1212
# Azure Hybrid Benefit for Azure Local
@@ -48,6 +48,7 @@ The following prerequisites are required to activate Azure Hybrid Benefit for yo
4848
### Activate Azure Hybrid Benefit
4949

5050
# [Azure portal](#tab/azure-portal)
51+
5152
Follow these steps to activate Azure Hybrid Benefit for Azure Local via the Azure portal:
5253

5354
1. Use your Microsoft Azure credentials to sign in to the Azure portal at this URL: https://portal.azure.com.
@@ -73,83 +74,88 @@ Follow these steps to activate Azure Hybrid Benefit for Azure Local via the Azur
7374
:::image type="content" source="media/azure-hybrid-benefit/activate-windows-server-subscription.png" alt-text="Screenshot showing how to activate Windows Server subscription." lightbox="media/azure-hybrid-benefit/activate-windows-server-subscription.png":::
7475

7576
# [Azure PowerShell](#tab/azure-powershell)
76-
Azure PowerShell can be run in Azure Cloud Shell. This document details how to use PowerShell in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
77+
78+
Azure PowerShell can be run in Azure Cloud Shell. This section describes how to use PowerShell in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
7779

7880
Launch [Azure Cloud Shell](https://shell.azure.com/) and use Azure PowerShell to perform the following steps:
7981

8082
1. Set up parameters from your subscription, resource group, and system name
81-
```powershell
82-
$subscription = "00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
83-
$resourceGroup = "local-rg" # Replace with your resource group name
84-
$clusterName = "MyLocal" # Replace with your system name
8583

86-
Set-AzContext -Subscription "${subscription}"
87-
```
84+
```powershell
85+
$subscription = "00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
86+
$resourceGroup = "local-rg" # Replace with your resource group name
87+
$clusterName = "MyLocal" # Replace with your system name
88+
89+
Set-AzContext -Subscription "${subscription}"
90+
```
91+
92+
1. To view Azure Hybrid Benefit status on a system, run the following command:
8893

94+
```powershell
95+
Install-Module -Name Az.ResourceGraph
96+
Search-AzGraph -Query "resources | where type == 'microsoft.azurestackhci/clusters'| where name == '${clusterName}' | project id, properties['softwareAssuranceProperties']['softwareAssuranceStatus']"
97+
```
8998

90-
1. To view Azure Hybrid Benefits status on a system, run the following command:
91-
```powershell
92-
Install-Module -Name Az.ResourceGraph
93-
Search-AzGraph -Query "resources | where type == 'microsoft.azurestackhci/clusters'| where name == '${clusterName}' | project id, properties['softwareAssuranceProperties']['softwareAssuranceStatus']"
94-
```
99+
1. To enable Azure Hybrid Benefit, run the following command and check if Azure Hybrid Benefit was enabled using the previous command:
95100

96-
97-
1. To enable Azure Hybrid Benefits, run the following command and check if Azure Hybrid Benefits got enabled using above command:
98-
```powershell
99-
Invoke-AzStackHciExtendClusterSoftwareAssuranceBenefit -ClusterName "${clusterName}" -ResourceGroupName "${resourceGroup}" -SoftwareAssuranceIntent "Enable"
100-
```
101+
```powershell
102+
Invoke-AzStackHciExtendClusterSoftwareAssuranceBenefit -ClusterName "${clusterName}" -ResourceGroupName "${resourceGroup}" -SoftwareAssuranceIntent "Enable"
103+
```
101104

102105
# [Azure CLI](#tab/azure-cli)
103-
Azure CLI is available to install in Windows, macOS and Linux environments. It can also be run in Azure Cloud Shell. This document details how to use Bash in Azure Cloud Shell. For more information, refer [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
106+
107+
Azure CLI is available to install in Windows, macOS and Linux environments. It can also be run in Azure Cloud Shell. This section describes how to use Bash in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
104108

105109
Launch [Azure Cloud Shell](https://shell.azure.com/) and use Azure CLI to configure Azure Hybrid Benefits following these steps:
106110

107-
1. Set up parameters from your subscription, resource group, and system name
108-
```azurecli
109-
subscription="00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
110-
resourceGroup="hcicluster-rg" # Replace with your resource group name
111-
clusterName="HCICluster" # Replace with your system name
112-
113-
az account set --subscription "${subscription}"
114-
```
115-
116-
1. To view Azure Hybrid Benefits status on a system, run the following command:
117-
```azurecli
118-
az stack-hci cluster list \
119-
--resource-group "${resourceGroup}" \
120-
--query "[?name=='${clusterName}'].{Name:name, SoftwareAssurance:softwareAssuranceProperties.softwareAssuranceStatus}" \
121-
-o table
122-
```
123-
124-
125-
1. To enable Azure Hybrid Benefits, run the following command:
126-
```azurecli
127-
az stack-hci cluster extend-software-assurance-benefit \
128-
--cluster-name "${clusterName}" \
129-
--resource-group "${resourceGroup}" \
130-
--software-assurance-intent enable
131-
```
111+
1. Set up parameters for your subscription, resource group, and system name:
112+
113+
```azurecli
114+
subscription="00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
115+
resourceGroup="hcicluster-rg" # Replace with your resource group name
116+
clusterName="HCICluster" # Replace with your system name
117+
118+
az account set --subscription "${subscription}"
119+
```
120+
121+
1. To view Azure Hybrid Benefit status on a system, run the following command:
122+
123+
```azurecli
124+
az stack-hci cluster list \
125+
--resource-group "${resourceGroup}" \
126+
--query "[?name=='${clusterName}'].{Name:name, SoftwareAssurance:softwareAssuranceProperties.softwareAssuranceStatus}" \
127+
-o table
128+
```
129+
130+
1. To enable Azure Hybrid Benefit, run the following command:
131+
132+
```azurecli
133+
az stack-hci cluster extend-software-assurance-benefit \
134+
--cluster-name "${clusterName}" \
135+
--resource-group "${resourceGroup}" \
136+
--software-assurance-intent enable
137+
```
132138

133139
---
134140

135141
## Maintain compliance for Azure Hybrid Benefit
136142

137-
After you activate Azure Local with Azure Hybrid Benefit, you must regularly check status and maintain compliance for Azure Hybrid Benefit. An Azure Local instance using Azure Hybrid Benefit can run only during the Software Assurance term. When the Software Assurance term is nearing expiry, you need to either renew your agreement with Software Assurance, disable the Azure Hybrid Benefit functionality, or de-provision the systems that are using Azure Hybrid Benefit.
143+
After you activate Azure Local with Azure Hybrid Benefit, you must regularly check status and maintain compliance for Azure Hybrid Benefit. An Azure Local instance using Azure Hybrid Benefit can run only during the Software Assurance term. When the Software Assurance term is nearing expiration, you must either renew your agreement with Software Assurance, disable the Azure Hybrid Benefit functionality, or de-provision the systems that are using Azure Hybrid Benefit.
138144

139145
You can perform an inventory of your systems through the Azure portal and [Azure Resource Graph](/azure/governance/resource-graph/first-query-azurecli) as described in the following section.
140146

141147
### Verify that your system is using Azure Hybrid Benefit
142148

143-
You can verify if your system is using Azure Hybrid Benefit via Azure portal, PowerShell, or Azure CLI.
149+
You can verify if your system is using Azure Hybrid Benefit via the Azure portal, PowerShell, or Azure CLI.
144150

145151
# [Azure portal](#tab/azure-portal)
146152

147153
1. In your Azure Local resource page, under **Settings**, select **Configuration**.
148154
1. Under **Azure Hybrid Benefit**, the status shows as:
149-
- Activated - indicates Azure Hybrid Benefit is activated
150-
- Not activated - indicates Azure Hybrid Benefit isn't activated
155+
- **Activated** - indicates Azure Hybrid Benefit is activated
156+
- **Not activated** - indicates Azure Hybrid Benefit isn't activated
151157

152-
You can also navigate to **Cost Analysis** > **Cost by Resource** > **Cost by Resource**. Expand your Azure Local resource to check that the meter is under **Software Assurance**.
158+
You can also navigate to **Cost Analysis > Cost by Resource > Cost by Resource**. Expand your Azure Local resource to check that the meter is under **Software Assurance**.
153159

154160
# [Azure PowerShell](#tab/azure-powershell)
155161

@@ -196,17 +202,17 @@ az graph query -q "Resources | where type == 'microsoft.azurestackhci/clusters'
196202

197203
This section describes the errors that you might get when activating Azure Hybrid Benefit for Azure Local.
198204

199-
**Error**
205+
### Error
200206

201-
*Failed to activate Azure Hybrid Benefit. We couldnt find your Software Assurance contract.*
207+
Failed to activate Azure Hybrid Benefit. We couldn't find your Software Assurance contract.
202208

203-
**Suggested solution**
209+
#### Suggested solution
204210

205-
This error can occur if you have a new Software Assurance contract or if you have set up this Azure subscription recently, but your information isn't updated in the portal yet. If you get this error, reach out to us at [[email protected]](mailto:[email protected]) and share the following information:
211+
This error can occur if you have a new Software Assurance contract or if you set up this Azure subscription recently, but your information isn't updated in the portal yet. If you get this error, reach out to us at [[email protected]](mailto:[email protected]) and share the following information:
206212

207213
- Customer/organization name - the name registered on your Software Assurance contract.
208214
- Azure subscription ID – to which your Azure Local instance is registered.
209-
- Agreement number for Software Assurance – this can be found on your purchase order, and is the number you would use to install software from the Volume Licensing Service Center (VLSC).
215+
- Agreement number for Software Assurance – this can be found on your purchase order, and is the number you use to install software from the Volume Licensing Service Center (VLSC).
210216

211217
## FAQs
212218

@@ -228,12 +234,10 @@ No additional costs are incurred, as Azure Hybrid Benefit is included as part of
228234

229235
Consult your Account Manager or licensing partner.
230236

231-
### When would the new pricing benefit for Azure Hybrid Benefit take effect?
237+
### When does the new pricing benefit for Azure Hybrid Benefit take effect?
232238

233239
The pricing benefit for Azure Local host fees takes effect immediately upon activation of Azure Hybrid Benefit for your system. The pricing benefit for Windows Server subscription takes effect immediately after you activate both Azure Hybrid Benefit and Windows Server subscription.
234240

235241
## Next steps
236242

237-
For related information, see also:
238-
239243
- [Azure Hybrid Benefit for Windows Server](/windows-server/get-started/azure-hybrid-benefit).

0 commit comments

Comments
 (0)