Skip to content

Commit ed2d4ef

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into edgiocert
2 parents 036e80a + e39d9d4 commit ed2d4ef

22 files changed

+116
-74
lines changed

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Before following the steps in this article, make sure you have the following pre
149149
* The managed virtual network is deleted when the Azure AI is deleted.
150150
* Data exfiltration protection is automatically enabled for the only approved outbound mode. If you add other outbound rules, such as to FQDNs, Microsoft can't guarantee that you're protected from data exfiltration to those outbound destinations.
151151
* Using FQDN outbound rules increases the cost of the managed virtual network because FQDN rules use Azure Firewall. For more information, see [Pricing](#pricing).
152+
* FQDN outbound rules only support ports 80 and 443.
152153
* When using a compute instance with a managed network, use the `az ml compute connect-ssh` command to connect to the compute using SSH.
153154

154155
### Connectivity to other services

articles/cost-management-billing/automate/understand-usage-details-fields.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,21 @@ The cost details file itself doesn’t uniquely identify individual records with
129129

130130
Some fields might differ in casing and spacing between account types. Older versions of pay-as-you-go cost details files have separate sections for the statement and daily cost.
131131

132-
## Reconcile charges for MCA accounts
132+
## Reconcile charges in the cost and usage details file
133133

134-
MCA customers can use the following information to reconcile charges between billing and pricing currencies.
134+
Microsoft Customer Agreement (MCA) customers can use the following information to reconcile charges between billing and pricing currencies.
135135

136-
1. Manually calculate the `CostInPricingCurrency` by: `(EffectivePrice)` * `(Quantity)`
137-
2. Convert the calculated `CostInPricingCurrency` to the `CostInBillingCurrency` by: `(CalculatedCostinPricingCurrency)` * `(ExchangeRatePricingToBilling)`
138-
3. Summarize the values that you calculated for `CostInBillingCurrency` and compare them to the invoice.
136+
1. Manually calculate the `CostInPricingCurrency` by: `(EffectivePrice)` * `(Quantity)`
137+
138+
1. Convert the calculated `CostInPricingCurrency` to the `CostInBillingCurrency` by: `(CalculatedCostinPricingCurrency)` * `(ExchangeRatePricingToBilling)`
139+
140+
1. Summarize the values that you calculated for `CostInBillingCurrency` and compare them to the invoice.
141+
142+
Enterprise Agreement (EA) customers can reconcile their charges using the following computation:
143+
144+
Manually calculate the cost by multiplying the **Effective Price** by the **Quantity**:
145+
146+
`Cost` = `(EffectivePrice)` * `(Quantity)`
139147

140148
## Reconcile reservation purchases with usage records
141149

articles/cost-management-billing/costs/tutorial-improved-exports.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ All types of data support various schedule frequency options, as described in th
139139

140140
## Understand data types
141141

142+
For a comprehensive reference of all available datasets, including the schema for current and historical versions, please visit [Cost Management dataset schema index](/azure/cost-management-billing/dataset-schema/schema-index).
143+
142144
- Cost and usage details (actual) - Select this option to export standard usage and purchase charges.
143145
- Cost and usage details (amortized) - Select this option to export amortized costs for purchases like Azure reservations and Azure savings plan for compute.
144146
- Cost and usage details (FOCUS) - Select this option to export cost and usage details using the open-source FinOps Open Cost and Usage Specification ([FOCUS](https://focus.finops.org/)) format. It combines actual and amortized costs. This format reduces data processing time and storage and compute charges for exports. The management group scope isn't supported for Cost and usage details (FOCUS) exports.

articles/expressroute/expressroute-bfd.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: expressroute
55
author: duongau
66
ms.service: expressroute
77
ms.topic: article
8-
ms.date: 06/30/2023
8+
ms.date: 06/03/2024
99
ms.author: duau
1010
---
1111

@@ -34,6 +34,10 @@ In this scenario, BFD can help. BFD provides low-overhead link failure detection
3434

3535
BFD is configured by default under all the newly created ExpressRoute private and Microsoft peering interfaces on the MSEEs. As such, to enable BFD, you only need to configure BFD on both your primary and secondary devices. Configuring BFD is two-step process. You configure the BFD on the interface and then link it to the BGP session.
3636

37+
> [!NOTE]
38+
> BFD is only supported on IPv4 peering.
39+
>
40+
3741
An example CE/PE (using Cisco IOS XE) configuration is shown as followed:
3842

3943
```console

articles/expressroute/metro.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: expressroute
55
author: duongau
66
ms.service: expressroute
77
ms.topic: conceptual
8-
ms.date: 04/24/2024
8+
ms.date: 06/03/2024
99
ms.author: duau
1010
ms.custom: references_regions, ai-usage
1111
---
@@ -44,8 +44,8 @@ The following diagram allows for a comparison between the standard ExpressRoute
4444

4545
| Metro location | Peering locations | Location address | Zone | Local Azure Region | ER Direct | Service Provider |
4646
|--|--|--|--|--|--|--|
47-
| Amsterdam Metro | Amsterdam<br>Amsterdam2 | Equinix AM5<br>Digital Realty AMS8 | 1 | West Europe | &check; | Megaport<br>Equinix<sup>1</sup><br>euNetworks<sup>1</sup><br>Colt<sup>1</sup><br>Console Connect<sup>1</sup><br>Digital Realty<sup>1</sup> |
48-
| Singapore Metro | Singapore<br>Singapore2 | Equinix SG1<br>Global Switch Tai Seng | 2 | Southeast Asia | &check; | Megaport<sup>1</sup><br>Equinix<sup>1</sup><br>Console Connect<sup>1</sup> |
47+
| Amsterdam Metro | Amsterdam<br>Amsterdam2 | Equinix AM5<br>Digital Realty AMS8 | 1 | West Europe | &check; | Colt<sup>1</sup><br>Console Connect<sup>1</sup><br>Digital Realty<br>Equinix<sup>1</sup><br>euNetworks<br><br>Megaport<br> |
48+
| Singapore Metro | Singapore<br>Singapore2 | Equinix SG1<br>Global Switch Tai Seng | 2 | Southeast Asia | &check; | Console Connect<sup>1</sup><br>Equinix<sup>1</sup><br>Megaport |
4949
| Zurich Metro | Zurich<br>Zurich2 | Digital Realty ZUR2<br>Equinix ZH5 | 1 | Switzerland North | &check; | Colt<sup>1</sup><br>Digital Realty<sup>1</sup> |
5050

5151
<sup>1<sup> These service providers will be available in the future.

articles/governance/machine-configuration/overview.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Examples of each scenario are provided in the following table.
3333
| [Configuration management][05] | You want a complete representation of a server, as code in source control. The deployment should include properties of the server (size, network, storage) and configuration of operating system and application settings. | "This machine should be a web server configured to host my website." |
3434
| [Compliance][06] | You want to audit or deploy settings to all machines in scope either reactively to existing machines or proactively to new machines as they're deployed. | "All machines should use TLS 1.2. Audit existing machines so I can release change where it's needed, in a controlled way, at scale. For new machines, enforce the setting when they're deployed." |
3535

36-
You can view the per-setting results from configurations in the [Guest assignments page][07]. If an
36+
You can view the per-setting results from configurations in the [Guest assignments page][44]. If an
3737
Azure Policy assignment orchestrated the configuration is orchestrated, you can select the "Last
3838
evaluated resource" link on the ["Compliance details" page][07].
3939

@@ -473,9 +473,10 @@ Machine configuration built-in policy samples are available in the following loc
473473
[35]: /azure/virtual-machines/windows/run-command
474474
[36]: /azure/virtual-machines/linux/run-command
475475
[37]: https://github.com/azure/nxtools#getting-started
476-
[38]: ../policy/samples/built-in-policies.md
477-
[39]: ../policy/samples/built-in-initiatives.md
476+
[38]: ../policy/samples/built-in-policies.md#guest-configuration
477+
[39]: ../policy/samples/built-in-initiatives.md#guest-configuration
478478
[40]: https://github.com/Azure/azure-policy/tree/master/built-in-policies/policySetDefinitions/Guest%20Configuration
479479
[41]: https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules
480480
[42]: ./how-to/develop-custom-package/overview.md
481481
[43]: ./how-to/create-policy-definition.md
482+
[44]: ../policy/how-to/determine-non-compliance.md#compliance-details-for-guest-configuration

articles/iot-edge/how-to-create-iot-edge-device.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Create an IoT Edge device - Azure IoT Edge | Microsoft Docs
2+
title: Create an IoT Edge device - Azure IoT Edge
33
description: Learn about the platform and provisioning options for creating an IoT Edge device
44
author: PatAltimore
55
ms.service: iot-edge
66
services: iot-edge
77
ms.topic: conceptual
8-
ms.date: 10/01/2022
8+
ms.date: 06/03/2024
99
ms.author: patricka
1010
---
1111

@@ -107,7 +107,7 @@ Using X.509 certificates as an attestation mechanism is the recommended way to s
107107

108108
You create two X.509 identity certificates and place them on the device. When you create a new device identity in IoT Hub, you provide thumbprints from both certificates. When the device authenticates to IoT Hub, it presents one certificate and IoT Hub verifies that the certificate matches its thumbprint. The X.509 keys on the device should be stored in a Hardware Security Module (HSM). For example, PKCS#11 modules, ATECC, dTPM, etc.
109109

110-
This authentication method is more secure than symmetric keys and supports group enrollments which provides a simplified management experience for a high number of devices. This authentication method is recommended for production scenarios.
110+
This authentication method is more secure than symmetric keys and supports group enrollments that provide a simplified management experience for a high number of devices. This authentication method is recommended for production scenarios.
111111

112112
### Trusted platform module (TPM) attestation
113113

@@ -131,7 +131,7 @@ This authentication method is faster to get started but not as secure. Device pr
131131

132132
You can use the table of contents to navigate to the appropriate end-to-end guide for creating an IoT Edge device for your IoT Edge solution's platform, provisioning, and authentication requirements.
133133

134-
You can also use the links below to go to the relevant article.
134+
You can also use the following links to go to the relevant article.
135135

136136
### Linux containers on Linux hosts
137137

articles/iot-edge/how-to-create-test-certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: Create test certificates - Azure IoT Edge | Microsoft Docs
2+
title: Create test certificates - Azure IoT Edge
33
description: Create test certificates and learn how to install them on an Azure IoT Edge device to prepare for production deployment.
44
author: PatAltimore
55

66
ms.author: patricka
7-
ms.date: 05/05/2022
7+
ms.date: 06/03/2024
88
ms.topic: conceptual
99
ms.service: iot-edge
1010
services: iot-edge

articles/iot-edge/how-to-create-transparent-gateway.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use an Azure IoT Edge device as a transparent gateway that can proc
44
author: PatAltimore
55

66
ms.author: patricka
7-
ms.date: 01/17/2022
7+
ms.date: 06/03/2024
88
ms.topic: conceptual
99
ms.service: iot-edge
1010
services: iot-edge
@@ -48,7 +48,7 @@ If you don't have a device ready, you can create one in an Azure virtual machine
4848
# [IoT Edge for Linux on Windows](#tab/eflow)
4949

5050
>[!WARNING]
51-
> Because the IoT Edge for Linux on Windows (EFLOW) virtual machine needs to be accessible from external devices, ensure to deploy EFLOW with an _external_ virtual switch. For more information about EFLOW networking configurations, see [Networking configuration for Azure IoT Edge for Linux on Windows](./how-to-configure-iot-edge-for-linux-on-windows-networking.md).
51+
> Because the IoT Edge for Linux on Windows (EFLOW) virtual machine needs to be accessible from external devices, ensure to deploy EFLOW with an *external* virtual switch. For more information about EFLOW networking configurations, see [Networking configuration for Azure IoT Edge for Linux on Windows](./how-to-configure-iot-edge-for-linux-on-windows-networking.md).
5252
5353
A Windows device with IoT Edge for Linux on Windows installed.
5454

articles/iot-edge/how-to-deploy-at-scale.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy modules at scale in Azure portal - Azure IoT Edge
33
description: Use the Azure portal to create automatic deployments for groups of IoT Edge devices
44
author: PatAltimore
55
ms.author: patricka
6-
ms.date: 9/22/2022
6+
ms.date: 06/03/2024
77
ms.topic: conceptual
88
ms.service: iot-edge
99
services: iot-edge
@@ -39,7 +39,7 @@ For more information about device twins and tags, see [Understand and use device
3939

4040
IoT Edge provides two different types of automatic deployments that you can use to customize your scenario. You can create a standard *deployment*, which includes that system runtime modules and any additional modules and routes. Each device can only apply one deployment. Or you can create a *layered deployment*, which only includes custom modules and routes, not the system runtime. Many layered deployments can be combined on a device, on top of a standard deployment. For more information about how the two types of automatic deployments work together, see [Understand IoT Edge automatic deployments for single devices or at scale](module-deployment-monitoring.md).
4141

42-
The steps for creating a deployment and a layered deployment are very similar. Any differences are called out in the following steps.
42+
The steps for creating a deployment and a layered deployment are similar. Any differences are called out in the following steps.
4343

4444
1. In the [Azure portal](https://portal.azure.com), go to your IoT Hub.
4545
1. On the menu in the left pane, select **Configurations + Deployments** under **Device Management**.
@@ -78,7 +78,7 @@ To add custom code as a module, or to manually add an Azure service module, foll
7878

7979
After you add a module to a deployment, you can select its name to open the **Update IoT Edge Module** page. On this page, you can edit the module settings, environment variables, create options, startup order, and module twin. If you added a module from the marketplace, it may already have some of these parameters filled in. For more information about the available module settings, see [Module configuration and management](module-composition.md#module-configuration-and-management).
8080

81-
If you're creating a layered deployment, you may be configuring a module that exists in other deployments targeting the same devices. To update the module twin without overwriting other versions, open the **Module Twin Settings** tab. Create a new **Module Twin Property** with a unique name for a subsection within the module twin's desired properties, for example `properties.desired.settings`. If you define properties within just the `properties.desired` field, it will overwrite the desired properties for the module defined in any lower priority deployments.
81+
If you're creating a layered deployment, you may be configuring a module that exists in other deployments targeting the same devices. To update the module twin without overwriting other versions, open the **Module Twin Settings** tab. Create a new **Module Twin Property** with a unique name for a subsection within the module twin's desired properties, for example `properties.desired.settings`. If you define properties within just the `properties.desired` field, it overwrites the desired properties for the module defined in any lower priority deployments.
8282

8383
:::image type="content" source="./media/how-to-deploy-monitor/module-twin-property.png" alt-text="Screenshot showing how to set the module twin property for layered deployment.":::
8484

@@ -109,7 +109,7 @@ If multiple deployments target the same device, then only the one with the highe
109109
Any layered deployment targeting a device must have a higher priority than the base deployment in order to be applied.
110110

111111
1. Enter a positive integer for the deployment **Priority**.
112-
1. Enter a **Target condition** to determine which devices will be targeted with this deployment. The condition is based on device twin tags or device twin reported properties and should match the expression format. For example, `tags.environment='test'` or `properties.reported.devicemodel='4000x'`.
112+
1. Enter a **Target condition** to determine which devices are targeted with this deployment. The condition is based on device twin tags or device twin reported properties and should match the expression format. For example, `tags.environment='test'` or `properties.reported.devicemodel='4000x'`.
113113

114114
Select **Next: Metrics**.
115115

@@ -161,7 +161,7 @@ When you modify a deployment, the changes immediately replicate to all targeted
161161
* If a device currently running this deployment no longer meets the target condition, it uninstalls this deployment and takes on the next highest priority deployment.
162162
* If a device currently running this deployment no longer meets the target condition and doesn't meet the target condition of any other deployments, then no change occurs on the device. The device continues running its current modules in their current state, but is not managed as part of this deployment anymore. Once it meets the target condition of any other deployment, it uninstalls this deployment and takes on the new one.
163163

164-
1. Select the **Metrics** tab and click the **Edit Metrics** button. Add or modify custom metrics, using the example syntax as a guide. Select **Save**.
164+
1. Select the **Metrics** tab and select the **Edit Metrics** button. Add or modify custom metrics, using the example syntax as a guide. Select **Save**.
165165

166166
:::image type="content" source="./media/how-to-deploy-monitor/metric-list.png" alt-text="Screenshot showing how to edit custom metrics in a deployment.":::
167167

@@ -175,7 +175,7 @@ When you delete a deployment, any deployed devices take on their next highest pr
175175
1. Select **Configurations + Deployments**.
176176
1. Use the checkbox to select the deployment that you want to delete.
177177
1. Select **Delete**.
178-
1. A prompt will inform you that this action will delete this deployment and revert to the previous state for all devices. A deployment with a lower priority will apply. If no other deployment is targeted, no modules will be removed. If you want to remove all modules from your device, create a deployment with zero modules and deploy it to the same devices. Select **Yes** to continue.
178+
1. A prompt informs you that this action deletes this deployment and revert to the previous state for all devices. A deployment with a lower priority will apply. If no other deployment is targeted, no modules are removed. If you want to remove all modules from your device, create a deployment with zero modules and deploy it to the same devices. Select **Yes** to continue.
179179

180180
## Next steps
181181

0 commit comments

Comments
 (0)