Skip to content

Commit d2735e9

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 10ea304 + 288c38f commit d2735e9

35 files changed

+78
-61
lines changed

articles/expressroute/design-architecture-for-resiliency.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Users of ExpressRoute rely on the availability and performance of edge sites, WA
2525
There are three ExpressRoute resiliency architectures that can be utilized to ensure high availability and resiliency in your network connections between on-premises and Azure. These architecture designs include:
2626

2727
* [Maximum resiliency](#maximum-resiliency)
28-
* [High resiliency](#high-resiliency---in-preview)
28+
* [High resiliency](#high-resiliency)
2929
* [Standard resiliency](#standard-resiliency)
3030

3131
### Maximum resiliency
@@ -34,7 +34,7 @@ The Maximum resiliency architecture in ExpressRoute is structured to eliminate a
3434

3535
:::image type="content" source="./media/design-architecture-for-resiliency/maximum-resiliency.png" alt-text="Diagram illustrating a pair of ExpressRoute circuits, configured at two distinct peering locations, between an on-premises network and Microsoft.":::
3636

37-
### High resiliency - In Preview
37+
### High resiliency
3838

3939
High resiliency, also referred to as ExpressRoute Metro, enables the use of multiple sites within the same metropolitan (Metro) area to connect your on-premises network through ExpressRoute to Azure. High resiliency offers site diversity by splitting a single circuit across two sites. The first connection is established at one site and the second connection at a different site. The objective of ExpressRoute Metro is to mitigate the effect of edge-sites isolation and failures by introducing capabilities to enable site diversity. Site diversity is achieved by using a single circuit across paired sites within a metropolitan city, which offers resiliency to failures between edge and region. ExpressRoute Metro provides a higher level of site resiliency than Standard resiliency, but not as much as Maximum resiliency. ExpressRoute Metro architecture can be used for business and mission-critical workloads within a region. For more information, see [ExpressRoute Metro](metro.md)
4040

articles/extended-zones/request-access.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Request access to Azure Extended Zones
3-
description: Learn how to request and gain access to Azure Extended Zone using PowerShell or Azure CLI.
3+
description: Learn how to request and gain access to an Azure Extended Zone by using Azure PowerShell or Azure CLI.
44
author: halkazwini
55
ms.author: halkazwini
66
ms.service: azure-extended-zones
77
ms.topic: how-to
8-
ms.date: 08/02/2024
8+
ms.date: 10/18/2024
99
---
1010

1111
# Request access to an Azure Extended Zone
@@ -22,7 +22,7 @@ In this article, you learn how to request and gain access to an Azure Extended Z
2222

2323
# [**PowerShell**](#tab/powershell)
2424

25-
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
25+
- A billable Azure account.
2626

2727
- Azure Cloud Shell or Azure PowerShell.
2828

@@ -32,7 +32,7 @@ In this article, you learn how to request and gain access to an Azure Extended Z
3232

3333
# [**Azure CLI**](#tab/cli)
3434

35-
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
35+
- A billable Azure account.
3636

3737
- Azure Cloud Shell or Azure CLI.
3838

@@ -96,6 +96,9 @@ In this section, you register resource provider **Microsoft.EdgeZones** to your
9696
9797
To register for an Azure Extended Zone, you must select the subscription that you wish to register Azure Extended Zones for and specify the Extended Zone name.
9898
99+
> [!NOTE]
100+
> The Azure account that you're using to register for Azure Extended Zones must be a billable account. To share your feedback or ask questions about Azure Extended Zones, contact [Azure Extended Zones support](mailto:[email protected]).
101+
99102
# [**PowerShell**](#tab/powershell)
100103
101104
1. Use [Get-AzEdgeZonesExtendedZone](/powershell/module/az.edgezones/get-azedgezonesextendedzone) cmdlet to list all Azure Extended Zones available to your subscription.

articles/healthcare-apis/availability-zones.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ Here's a list of the availability zones for Azure Health Data Services.
3636
- UK South
3737
- Sweden Central
3838
- Germany West Central*
39-
- Qatar Central*
4039
- East US*
4140
- East US 2
4241
- South Central US*
4342
- West US 2*
4443
- West US 3*
4544
- Canada Central
4645

47-
Zones marked with a star ("*") have quota issues due to high demand. Enabling AZ features in these zones may take longer.
46+
Regions marked with a star ("*") have quota issues due to high demand. Enabling AZ features in these regions may take longer.
4847

4948
### Limitations
5049

@@ -74,4 +73,4 @@ To enable the availability zone on a specific instance, customers need to submit
7473

7574
More information can be found at [Create an Azure support request](/azure/azure-portal/supportability/how-to-create-azure-support-request).
7675

77-
[!INCLUDE [FHIR trademark statement](includes/healthcare-apis-fhir-trademark.md)]
76+
[!INCLUDE [FHIR trademark statement](includes/healthcare-apis-fhir-trademark.md)]

articles/iot-operations/manage-mqtt-broker/howto-configure-authentication.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ To link a BrokerListener to a *BrokerAuthentication* resource, specify the `auth
3030

3131
## Default BrokerAuthentication resource
3232

33-
Azure IoT Operations Preview deploys a default *BrokerAuthentication* resource named `default` linked with the *default* listener in the `azure-iot-operations` namespace. It's configured to only use Kubernetes Service Account Tokens (SATs) for authentication. To inspect it, run:
33+
Azure IoT Operations Preview deploys a default *BrokerAuthentication* resource named `authn` linked with the *default* listener named `listener` in the `azure-iot-operations` namespace. It's configured to only use Kubernetes Service Account Tokens (SATs) for authentication. To inspect it, run:
3434

3535
```bash
36-
kubectl get brokerauthentication default -n azure-iot-operations -o yaml
36+
kubectl get brokerauthentication authn -n azure-iot-operations -o yaml
3737
```
3838

3939
The output shows the default *BrokerAuthentication* resource, with metadata removed for brevity:
@@ -42,7 +42,7 @@ The output shows the default *BrokerAuthentication* resource, with metadata remo
4242
apiVersion: mqttbroker.iotoperations.azure.com/v1beta1
4343
kind: BrokerAuthentication
4444
metadata:
45-
name: default
45+
name: authn
4646
namespace: azure-iot-operations
4747
spec:
4848
authenticationMethods:
@@ -79,7 +79,7 @@ With multiple authentication methods, MQTT broker has a fallback mechanism. For
7979
apiVersion: mqttbroker.iotoperations.azure.com/v1beta1
8080
kind: BrokerAuthentication
8181
metadata:
82-
name: default
82+
name: authn
8383
namespace: azure-iot-operations
8484
spec:
8585
authenticationMethods:

articles/iot-operations/manage-mqtt-broker/howto-configure-brokerlistener.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Each listener port can have its own authentication and authorization rules that
2626
2727
Listeners have the following characteristics:
2828

29-
- You can have up to three listeners. One listener per service type of `loadBalancer`, `clusterIp`, or `nodePort`. The default *BrokerListener* named *default* is service type `clusterIp`.
29+
- You can have up to three listeners. One listener per service type of `loadBalancer`, `clusterIp`, or `nodePort`. The default *BrokerListener* named *listener* is service type `clusterIp`.
3030
- Each listener supports multiple ports
3131
- BrokerAuthentication and BrokerAuthorization references are per port
3232
- TLS configuration is per port
@@ -59,7 +59,7 @@ To view or edit the listener:
5959
To view the default *BrokerListener* resource, use the following command:
6060

6161
```bash
62-
kubectl get brokerlistener default -n azure-iot-operations -o yaml
62+
kubectl get brokerlistener listener -n azure-iot-operations -o yaml
6363
```
6464

6565
The output should look similar to this, with most metadata removed for brevity:
@@ -68,14 +68,14 @@ The output should look similar to this, with most metadata removed for brevity:
6868
apiVersion: mqttbroker.iotoperations.azure.com/v1beta1
6969
kind: BrokerListener
7070
metadata:
71-
name: default
71+
name: listener
7272
namespace: azure-iot-operations
7373
spec:
7474
brokerRef: default
7575
serviceName: aio-broker
7676
serviceType: ClusterIp
7777
ports:
78-
- authenticationRef: default
78+
- authenticationRef: authn
7979
port: 18883
8080
protocol: Mqtt
8181
tls:
@@ -94,7 +94,7 @@ To learn more about the default BrokerAuthentication resource linked to this lis
9494
The default *BrokerListener* uses the service type *ClusterIp*. You can have only one listener per service type. If you want to add more ports to service type *ClusterIp*, you can update the default listener to add more ports. For example, you could add a new port 1883 with no TLS and authentication off with the following kubectl patch command:
9595
9696
```bash
97-
kubectl patch brokerlistener default -n azure-iot-operations --type='json' -p='[{"op": "add", "path": "/spec/ports/", "value": {"port": 1883, "protocol": "Mqtt"}}]'
97+
kubectl patch brokerlistener listener -n azure-iot-operations --type='json' -p='[{"op": "add", "path": "/spec/ports/", "value": {"port": 1883, "protocol": "Mqtt"}}]'
9898
```
9999
100100
---
@@ -146,7 +146,7 @@ spec:
146146
- port: 1883
147147
protocol: Mqtt
148148
- port: 18883
149-
authenticationRef: default
149+
authenticationRef: authn
150150
protocol: Mqtt
151151
tls:
152152
mode: Automatic

articles/modeling-simulation-workbench/disaster-recovery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Disaster recovery: Azure Modeling and Simulation Workbench"
33
description: This article provides an overview of disaster recovery for Azure Modeling and Simulation Workbench.
44
author: meaghanlewis
55
ms.author: mosagie
6-
ms.service: modeling-simulation-workbench
6+
ms.service: azure-modeling-simulation-workbench
77
ms.topic: conceptual
88
ms.date: 08/21/2024
99
---

articles/modeling-simulation-workbench/refresh-remote-connection-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Refresh remote connection keys in Azure Modeling and Simulation Workbench
33
description: Learn how to refresh remote connection keys in Azure Modeling and Simulation Workbench.
44
author: meaghanlewis
55
ms.author: mosagie
6-
ms.service: modeling-simulation-workbench
6+
ms.service: azure-modeling-simulation-workbench
77
ms.topic: how-to
88
ms.date: 09/05/2024
99
# Customer intent: As a Chamber User in Azure Modeling and Simulation Workbench, I want to refresh remote connection keys.

articles/modeling-simulation-workbench/shared-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Shared storage: Azure Modeling and Simulation Workbench"
33
description: This article provides an overview of shared storage for Azure Modeling and Simulation Workbench workbench component.
44
author: meaghanlewis
55
ms.author: mosagie
6-
ms.service: modeling-simulation-workbench
6+
ms.service: azure-modeling-simulation-workbench
77
ms.topic: conceptual
88
ms.date: 08/21/2024
99
---
43.1 KB
Loading

articles/network-watcher/vnet-flow-logs-overview.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: halkazwini
66
ms.author: halkazwini
77
ms.service: azure-network-watcher
88
ms.topic: concept-article
9-
ms.date: 08/29/2024
9+
ms.date: 10/20/2024
1010

1111
#CustomerIntent: As an Azure administrator, I want to learn about virtual network flow logs so that I can log my network traffic to analyze and optimize network performance.
1212
---
@@ -59,7 +59,9 @@ Virtual network flow logs also avoid the need to enable multiple-level flow logg
5959
In addition to existing support to identify traffic that [network security group rules](../virtual-network/network-security-groups-overview.md) allow or deny, Virtual network flow logs support identification of traffic that [Azure Virtual Network Manager security admin rules](../virtual-network-manager/concept-security-admins.md) allow or deny. Virtual network flow logs also support evaluating the encryption status of your network traffic in scenarios where you're using [virtual network encryption](../virtual-network/virtual-network-encryption-overview.md?toc=/azure/network-watcher/toc.json).
6060

6161
> [!IMPORTANT]
62-
> We recommend disabling network security group flow logs before enabling virtual network flow logs on the same underlying workloads to avoid duplicate traffic recording and additional costs. If you enable network security group flow logs on the network security group of a subnet, then you enable virtual network flow logs on the same subnet or parent virtual network, you might get duplicate logging (both network security group flow logs and virtual network flow logs generated for all supported workloads in that particular subnet).
62+
> We recommend disabling network security group flow logs before enabling virtual network flow logs on the same underlying workloads to avoid duplicate traffic recording and additional costs.
63+
>
64+
> If you enable network security group flow logs on the network security group of a subnet, then you enable virtual network flow logs on the same subnet or parent virtual network, you might get duplicate logging or only virtual network flow logs.
6365
6466
## How logging works
6567

@@ -133,15 +135,15 @@ In the following example of virtual network flow logs, multiple records follow t
133135
"time": "2022-09-14T09:00:52.5625085Z",
134136
"flowLogVersion": 4,
135137
"flowLogGUID": "66aa66aa-bb77-cc88-dd99-00ee00ee00ee",
136-
"macAddress": "00224871C205",
138+
"macAddress": "112233445566",
137139
"category": "FlowLogFlowEvent",
138-
"flowLogResourceID": "/SUBSCRIPTIONS/00000000-0000-0000-0000-000000000000/RESOURCEGROUPS/NETWORKWATCHERRG/PROVIDERS/MICROSOFT.NETWORK/NETWORKWATCHERS/NETWORKWATCHER_EASTUS2EUAP/FLOWLOGS/VNETFLOWLOG",
139-
"targetResourceID": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
140+
"flowLogResourceID": "/SUBSCRIPTIONS/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/RESOURCEGROUPS/NETWORKWATCHERRG/PROVIDERS/MICROSOFT.NETWORK/NETWORKWATCHERS/NETWORKWATCHER_EASTUS2EUAP/FLOWLOGS/VNETFLOWLOG",
141+
"targetResourceID": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
140142
"operationName": "FlowLogFlowEvent",
141143
"flowRecords": {
142144
"flows": [
143145
{
144-
"aclID": "00000000-1234-abcd-ef00-c1c2c3c4c5c6",
146+
"aclID": "00aa00aa-bb11-cc22-dd33-44ee44ee44ee",
145147
"flowGroups": [
146148
{
147149
"rule": "DefaultRule_AllowInternetOutBound",
@@ -161,7 +163,7 @@ In the following example of virtual network flow logs, multiple records follow t
161163
]
162164
},
163165
{
164-
"aclID": "01020304-abcd-ef00-1234-102030405060",
166+
"aclID": "00aa00aa-bb11-cc22-dd33-44ee44ee44ee",
165167
"flowGroups": [
166168
{
167169
"rule": "BlockHighRiskTCPPortsFromInternet",
@@ -196,15 +198,15 @@ In the following example of virtual network flow logs, multiple records follow t
196198

197199
:::image type="content" source="media/vnet-flow-logs-overview/vnet-flow-log-format.png" alt-text="Table that shows the format of a virtual network flow log."lightbox="media/vnet-flow-logs-overview/vnet-flow-log-format.png"
198200

199-
Here's an example bandwidth calculation for flow tuples from a TCP conversation between `203.0.113.105:35370` and `10.2.0.4:23`:
201+
Here's an example bandwidth calculation for flow tuples from a TCP conversation between `203.0.113.105:35370` and `10.0.0.5:23`:
200202

201-
`1493763938,203.0.113.105,10.2.0.4,35370,23,6,I,B,NX,,,,`
202-
`1493695838,203.0.113.105,10.2.0.4,35370,23,6,I,C,NX,1021,588096,8005,4610880`
203-
`1493696138,203.0.113.105,10.2.0.4,35370,23,6,I,E,NX,52,29952,47,27072`
203+
`1708978215,203.0.113.105,10.0.0.5,35370,23,6,I,B,NX,,,,`
204+
`1708978215,203.0.113.105,10.0.0.5,35370,23,6,I,C,NX,1021,588096,8005,4610880`
205+
`1708978215,203.0.113.105,10.0.0.5,35370,23,6,I,E,NX,52,29952,47,27072`
204206

205207
For continuation (`C`) and end (`E`) flow states, byte and packet counts are aggregate counts from the time of the previous flow's tuple record. In the example conversation, the total number of packets transferred is 1,021 + 52 + 8,005 + 47 = 9,125. The total number of bytes transferred is 588,096 + 29,952 + 4,610,880 + 27,072 = 5,256,000.
206208

207-
## Storage account considerations for virtual network flow logs
209+
## Storage account considerations for virtual network flow logs
208210

209211
- **Location**: The storage account must be in the same region as the virtual network.
210212
- **Subscription**: The storage account must be in the same subscription of the virtual network or in a subscription associated with the same Microsoft Entra tenant of the virtual network's subscription.

0 commit comments

Comments
 (0)