Skip to content

Commit da44783

Browse files
authored
Merge pull request #198064 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 1049a89 + ac667da commit da44783

File tree

8 files changed

+20
-16
lines changed

8 files changed

+20
-16
lines changed

articles/active-directory/conditional-access/howto-conditional-access-apis.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ Many of the following examples use tools like [Managed Identities](../managed-id
3131

3232
### PowerShell
3333

34+
> [!IMPORTANT]
35+
> Due to the planned deprecation of PowerShell modules (MSOL & AAD) after December 2022, no further updates are planned for these modules to support new Conditional Access features. See recent announcements for more information: https://aka.ms/AzureADPowerShellDeprecation. New Conditional Access features may not be available or may not be functional within these PowerShell modules as a result of this announcement. Please consider [migrating to Microsoft Graph PowerShell](https://aka.ms/MigrateMicrosoftGraphPowerShell). Additional guidance and examples will be released soon.
36+
3437
For many administrators, PowerShell is already an understood scripting tool. The following example shows how to use the [Azure AD PowerShell module](https://www.powershellgallery.com/packages/AzureAD) to manage Conditional Access policies.
3538

3639
- [Configure Conditional Access policies with Azure AD PowerShell commands](https://github.com/Azure-Samples/azure-ad-conditional-access-apis/tree/main/01-configure/powershell)

articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ For each month, we truncate the SLA attainment at three places after the decimal
5555
| --- | --- | --- |
5656
| January | | 99.999% |
5757
| February | 99.999% | 99.999% |
58-
| March | 99.568% | |
59-
| April | 99.999% | |
58+
| March | 99.568% | 99.999% |
59+
| April | 99.999% | 99.999% |
6060
| May | 99.999% | |
6161
| June | 99.999% | |
6262
| July | 99.999% | |
@@ -89,4 +89,4 @@ All incidents that seriously impact Azure AD performance are documented in the [
8989

9090
* [Azure AD reports overview](overview-reports.md)
9191
* [Programmatic access to Azure AD reports](concept-reporting-api.md)
92-
* [Azure Active Directory risk detections](../identity-protection/overview-identity-protection.md)
92+
* [Azure Active Directory risk detections](../identity-protection/overview-identity-protection.md)

articles/api-management/how-to-configure-local-metrics-logs.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@ Now we have everything deployed and configured, the self-hosted gateway should r
190190

191191
Make some API calls through the self-hosted gateway, if everything is configured correctly, you should be able to view below metrics:
192192

193-
| Metric | Description |
193+
| Metric | Description |
194194
| ------------- | ------------- |
195-
| Requests | Number of API requests in the period |
196-
| DurationInMS | Number of milliseconds from the moment gateway received request until the moment response sent in full |
197-
| BackendDurationInMS | Number of milliseconds spent on overall backend IO (connecting, sending and receiving bytes) |
198-
| ClientDurationInMS | Number of milliseconds spent on overall client IO (connecting, sending and receiving bytes) |
195+
| requests_total | Number of API requests in the period |
196+
| request_duration_seconds | Number of milliseconds from the moment gateway received request until the moment response sent in full |
197+
| request_backend_duration_seconds | Number of milliseconds spent on overall backend IO (connecting, sending and receiving bytes) |
198+
| request_client_duration_seconds | Number of milliseconds spent on overall client IO (connecting, sending and receiving bytes) |
199199

200200
## Logs
201201

articles/azure-app-configuration/manage-feature-flags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ In the **Feature manager**, you can also change the state of a feature flag by c
6464

6565
## Access feature flags
6666

67-
In the **Operations** menu, select **Feature manager**. You can select **Edits Columns** to add or remove columns, and change the column order.
67+
In the **Operations** menu, select **Feature manager**. You can select **Edit Columns** to add or remove columns, and change the column order.
6868
create a label, lock or delete the feature flag.
6969
:::image type="content" source="media/edit-columns-feature-flag.png" alt-text="Screenshot of the Azure platform. Edit feature flag columns." lightbox="media/edit-columns-feature-flag-expanded.png":::
7070

articles/iot-edge/tutorial-deploy-function.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The Azure Function that you create in this tutorial filters the temperature data
3939
Before beginning this tutorial, you should have gone through the previous tutorial to set up your development environment for Linux container development: [Develop IoT Edge modules using Linux containers](tutorial-develop-for-linux.md). By completing that tutorial, you should have the following prerequisites in place:
4040

4141
* A free or standard-tier [IoT Hub](../iot-hub/iot-hub-create-through-portal.md) in Azure.
42-
* A device running Azure IoT Edge with Linux containers. You can use the quickstarts to set up a [Linux device](quickstart-linux.md) or [Windows device](quickstart.md).
42+
* An AMD64 device running Azure IoT Edge with Linux containers. You can use the quickstarts to set up a [Linux device](quickstart-linux.md) or [Windows device](quickstart.md).
4343
* A container registry, like [Azure Container Registry](../container-registry/index.yml).
4444
* [Visual Studio Code](https://code.visualstudio.com/) configured with the [Azure IoT Tools](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools).
4545
* [Docker CE](https://docs.docker.com/install/) configured to run Linux containers.
@@ -86,13 +86,13 @@ The IoT Edge extension tries to pull your container registry credentials from Az
8686
>[!NOTE]
8787
>This tutorial uses admin login credentials for Azure Container Registry, which are convenient for development and test scenarios. When you're ready for production scenarios, we recommend a least-privilege authentication option like service principals. For more information, see [Manage access to your container registry](production-checklist.md#manage-access-to-your-container-registry).
8888
89-
### Select your target architecture
89+
### Set target architecture to AMD64
9090

91-
Currently, Visual Studio Code can develop C modules for Linux AMD64 and Linux ARM32v7 devices. You need to select which architecture you're targeting with each solution, because the container is built and run differently for each architecture type. The default is Linux AMD64.
91+
Running Azure Functions modules on IoT Edge is supported only on Linux AMD64 based containers. The default target architecture for Visual Studio Code is Linux AMD64, but we will set it explicitly to Linux AMD64 here.
9292

9393
1. Open the command palette and search for **Azure IoT Edge: Set Default Target Platform for Edge Solution**, or select the shortcut icon in the side bar at the bottom of the window.
9494

95-
2. In the command palette, select the target architecture from the list of options. For this tutorial, we're using an Ubuntu virtual machine as the IoT Edge device, so will keep the default **amd64**.
95+
2. In the command palette, select the AMD64 target architecture from the list of options.
9696

9797
### Update the module with custom code
9898

articles/iot-hub/iot-hub-node-node-file-upload.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,8 @@ In this section, you create a Node.js console app that receives file upload noti
241241
}
242242
});
243243
```
244+
> [!NOTE]
245+
> If you want to receive disconnect notifications while you are listening to file upload notifications, you need to register `'error'` by using `receiver.on`. To continue to receive file upload notifications, you need to reconect to IoT Hub by using the `serviceClient.open` method.
244246
245247
1. Save and close the **FileUploadNotification.js** file.
246248

articles/machine-learning/how-to-deploy-mlflow-models.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ model_path = "model"
6060

6161
# define the model path and the name is the service name
6262
# the model gets registered automatically and a name is autogenerated using the "name" parameter below
63-
client.create_deployment(model_uri='runs:/{}/{}'.format(run.id, model_path),
64-
name="mlflow-test-aci")
63+
client.create_deployment(name="mlflow-test-aci", model_uri='runs:/{}/{}'.format(run.id, model_path))
6564
```
6665

6766
### Customize deployment configuration

includes/virtual-machines-disks-shared-limitations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Shared ultra disks are available in all regions that support ultra disks by defa
2828
- Can only be enabled on data disks, not OS disks.
2929
- Host caching isn't available for premium SSDs with `maxShares>1`.
3030
- Disk bursting isn't available for premium SSDs with `maxShares>1`.
31-
- When using Availability sets and virtual machine scale sets with Azure shared disks, [storage fault domain alignment](../articles/virtual-machines/availability.md) with virtual machine fault domain isn't enforced for the shared data disk.
31+
- When using Availability sets or virtual machine scale sets with Azure shared disks, [storage fault domain alignment](../articles/virtual-machines/availability.md) with virtual machine fault domain isn't enforced for the shared data disk.
3232
- When using [proximity placement groups (PPG)](../articles/virtual-machines/windows/proximity-placement-groups.md), all virtual machines sharing a disk must be part of the same PPG.
3333
- Only basic disks can be used with some versions of Windows Server Failover Cluster, for details see [Failover clustering hardware requirements and storage options](/windows-server/failover-clustering/clustering-requirements).
3434
- Azure Site Recovery support isn't yet available.

0 commit comments

Comments
 (0)