Skip to content

Commit 6717640

Browse files
authored
Merge pull request #273869 from MicrosoftDocs/main
4/30/2024 AM Publish
2 parents 5a53c17 + b95c977 commit 6717640

File tree

63 files changed

+466
-602
lines changed

Some content is hidden

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

63 files changed

+466
-602
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,12 @@
872872
"branch": "master",
873873
"branch_mapping": {}
874874
},
875+
{
876+
"path_to_root": "blob-devguide-go",
877+
"url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
878+
"branch": "main",
879+
"branch_mapping": {}
880+
},
875881
{
876882
"path_to_root": "azure-sdk-for-net",
877883
"url": "https://github.com/Azure/azure-sdk-for-net/",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
10+
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1015
"redirect_url": "/azure/azure-monitor/getting-started",

articles/aks/egress-outboundtype.md

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
title: Customize cluster egress with outbound types in Azure Kubernetes Service (AKS)
3-
description: Learn how to define a custom egress route in Azure Kubernetes Service (AKS)
3+
description: Learn how to define a custom egress route in Azure Kubernetes Service (AKS).
44
author: asudbring
55
ms.subservice: aks-networking
66
ms.custom:
77
ms.author: allensu
88
ms.topic: how-to
9-
ms.date: 02/06/2024
9+
ms.date: 04/29/2024
1010
#Customer intent: As a cluster operator, I want to define my own egress paths with user-defined routes. Since I define this up front I do not want AKS provided load balancer configurations.
1111
---
1212

1313
# Customize cluster egress with outbound types in Azure Kubernetes Service (AKS)
1414

15-
You can customize egress for an AKS cluster to fit specific scenarios. By default, AKS will provision a standard SKU load balancer to be set up and used for egress. However, the default setup may not meet the requirements of all scenarios if public IPs are disallowed or additional hops are required for egress.
15+
You can customize egress for an AKS cluster to fit specific scenarios. By default, AKS provisions a standard SKU load balancer to be set up and used for egress. However, the default setup may not meet the requirements of all scenarios if public IPs are disallowed or extra hops are required for egress.
1616

1717
This article covers the various types of outbound connectivity that are available in AKS clusters.
1818

@@ -21,7 +21,7 @@ This article covers the various types of outbound connectivity that are availabl
2121
2222
## Limitations
2323

24-
* Setting `outboundType` requires AKS clusters with a `vm-set-type` of `VirtualMachineScaleSets` and `load-balancer-sku` of `Standard`.
24+
- Setting `outboundType` requires AKS clusters with a `vm-set-type` of `VirtualMachineScaleSets` and `load-balancer-sku` of `Standard`.
2525

2626
## Outbound types in AKS
2727

@@ -36,9 +36,9 @@ The load balancer is used for egress through an AKS-assigned public IP. An outbo
3636

3737
If `loadBalancer` is set, AKS automatically completes the following configuration:
3838

39-
* A public IP address is provisioned for cluster egress.
40-
* The public IP address is assigned to the load balancer resource.
41-
* Backend pools for the load balancer are set up for agent nodes in the cluster.
39+
- A public IP address is provisioned for cluster egress.
40+
- The public IP address is assigned to the load balancer resource.
41+
- Backend pools for the load balancer are set up for agent nodes in the cluster.
4242

4343
![Diagram shows ingress I P and egress I P, where the ingress I P directs traffic to a load balancer, which directs traffic to and from an internal cluster and other traffic to the egress I P, which directs traffic to the Internet, M C R, Azure required services, and the A K S Control Plane.](media/egress-outboundtype/outboundtype-lb.png)
4444

@@ -48,8 +48,8 @@ For more information, see [using a standard load balancer in AKS](load-balancer-
4848

4949
If `managedNatGateway` or `userAssignedNatGateway` are selected for `outboundType`, AKS relies on [Azure Networking NAT gateway](../virtual-network/nat-gateway/manage-nat-gateway.md) for cluster egress.
5050

51-
* Select `managedNatGateway` when using managed virtual networks. AKS will provision a NAT gateway and attach it to the cluster subnet.
52-
* Select `userAssignedNatGateway` when using bring-your-own virtual networking. This option requires that you have provisioned a NAT gateway before cluster creation.
51+
- Select `managedNatGateway` when using managed virtual networks. AKS provisions a NAT gateway and attach it to the cluster subnet.
52+
- Select `userAssignedNatGateway` when using bring-your-own virtual networking. This option requires that you have provisioned a NAT gateway before cluster creation.
5353

5454
For more information, see [using NAT gateway with AKS](nat-gateway.md).
5555

@@ -72,10 +72,10 @@ The following tables show the supported migration paths between outbound types f
7272

7373
### Supported Migration Paths for Managed VNet
7474

75-
| Managed VNet |loadBalancer | managedNATGateway | userAssignedNATGateway | userDefinedRouting |
75+
| Managed VNet | loadBalancer | managedNATGateway | userAssignedNATGateway | userDefinedRouting |
7676
|------------------------|---------------|-------------------|------------------------|--------------------|
77-
| loadBalancer | N/A | Supported | Not Supported | Supported |
78-
| managedNATGateway | Supported | N/A | Not Supported | Supported |
77+
| loadBalancer | N/A | Supported | Not Supported | Not Supported |
78+
| managedNATGateway | Supported | N/A | Not Supported | Not Supported |
7979
| userAssignedNATGateway | Not Supported | Not Supported | N/A | Not Supported |
8080
| userDefinedRouting | Supported | Supported | Not Supported | N/A |
8181

@@ -131,24 +131,21 @@ az aks update -g <resourceGroup> -n <clusterName> --outbound-type userDefinedRou
131131

132132
### Update cluster from loadbalancer to userAssignedNATGateway in BYO vnet scenario
133133

134-
- Associate nat gateway with subnet where the workload is associated with. Please refer to [Create a managed or user-assigned NAT gateway](nat-gateway.md)
134+
- Associate nat gateway with subnet where the workload is associated with. Refer to [Create a managed or user-assigned NAT gateway](nat-gateway.md)
135135

136136
```azurecli-interactive
137137
az aks update -g <resourceGroup> -n <clusterName> --outbound-type userAssignedNATGateway
138138
```
139139

140140
## Next steps
141141

142-
* [Configure standard load balancing in an AKS cluster](load-balancer-standard.md)
143-
* [Configure NAT gateway in an AKS cluster](nat-gateway.md)
144-
* [Configure user-defined routing in an AKS cluster](egress-udr.md)
145-
* [NAT gateway documentation](./nat-gateway.md)
146-
* [Azure networking UDR overview](../virtual-network/virtual-networks-udr-overview.md)
147-
* [Manage route tables](../virtual-network/manage-route-table.yml)
142+
- [Configure standard load balancing in an AKS cluster](load-balancer-standard.md)
143+
- [Configure NAT gateway in an AKS cluster](nat-gateway.md)
144+
- [Configure user-defined routing in an AKS cluster](egress-udr.md)
145+
- [NAT gateway documentation](./nat-gateway.md)
146+
- [Azure networking UDR overview](../virtual-network/virtual-networks-udr-overview.md)
147+
- [Manage route tables](../virtual-network/manage-route-table.yml)
148148

149149
<!-- LINKS - internal -->
150-
[az-feature-register]: /cli/azure/feature#az_feature_register
151-
[az-feature-show]: /cli/azure/feature#az_feature_show
152-
[az-provider-register]: /cli/azure/provider#az_provider_register
153150
[az-aks-update]: /cli/azure/aks#az_aks_update
154151

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,17 @@ DELETE https://management.azure.com/providers/Microsoft.Insights/monitoredObject
291291
```PowerShell
292292
$TenantID = "xxxxxxxxx-xxxx-xxx" #Your Tenant ID
293293
$SubscriptionID = "xxxxxx-xxxx-xxxxx" #Your Subscription ID
294-
$ResourceGroup = "rg-yourResourseGroup" #Your resroucegroup
294+
$ResourceGroup = "rg-yourResourceGroup" #Your resourcegroup
295295
296-
Connect-AzAccount -Tenant $TenantID
296+
#If cmdlet below produces an error stating 'Interactive authentication is not supported in this session, please run cmdlet 'Connect-AzAccount -UseDeviceAuthentication
297+
#uncomment next to -UseDeviceAuthentication below
298+
Connect-AzAccount -Tenant $TenantID #-UseDeviceAuthentication
297299
298300
#Select the subscription
299301
Select-AzSubscription -SubscriptionId $SubscriptionID
300302
301303
#Grant Access to User at root scope "/"
302-
$user = Get-AzADUser -UserPrincipalName (Get-AzContext).Account
304+
$user = Get-AzADUser -SignedIn
303305
304306
New-AzRoleAssignment -Scope '/' -RoleDefinitionName 'Owner' -ObjectId $user.Id
305307
@@ -336,7 +338,7 @@ Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -B
336338
#2. Create a monitored object
337339
338340
# "location" property value under the "body" section should be the Azure region where the MO object would be stored. It should be the "same region" where you created the Data Collection Rule. This is the location of the region from where agent communications would happen.
339-
$Location = "eastus" #Use your own loacation
341+
$Location = "eastus" #Use your own location
340342
$requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
341343
$body = @"
342344
{
@@ -368,8 +370,9 @@ $body = @"
368370
369371
Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body
370372
371-
#(Optional example). Associate another DCR to monitored object
373+
#(Optional example). Associate another DCR to monitored object. Remove comments around text below to use.
372374
#See reference documentation https://learn.microsoft.com/en-us/rest/api/monitor/data-collection-rule-associations/create?tabs=HTTP
375+
<#
373376
$associationName = "assoc02" #You must change the association name to a unique name, if you want to associate multiple DCR to monitored object
374377
$DCRName = "dcr-PAW-WindowsClientOS" #Your Data collection rule name
375378
@@ -388,7 +391,7 @@ Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -B
388391
#4. (Optional) Get all the associatation.
389392
$requestURL = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations?api-version=2021-09-01-preview"
390393
(Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method get).value
391-
394+
#>
392395
393396
```
394397
## Verify successful setup

0 commit comments

Comments
 (0)