Skip to content

Commit 1ba8380

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-vnetflow2
2 parents 556fe72 + fc6da31 commit 1ba8380

File tree

15 files changed

+67
-152
lines changed

15 files changed

+67
-152
lines changed
2.39 KB
Loading
56 Bytes
Loading
-15.2 KB
Loading
-87 Bytes
Loading
-81.3 KB
Loading
1.99 KB
Loading

articles/azure-maps/tutorial-ev-routing.md

Lines changed: 37 additions & 134 deletions
Large diffs are not rendered by default.

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/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:

0 commit comments

Comments
 (0)