Skip to content

Commit 9d73c65

Browse files
authored
Merge pull request #183457 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 01bbb42 + 9ea15c4 commit 9d73c65

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

articles/active-directory/saas-apps/documo-tutorial.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
144144

145145
### Create Documo test user
146146

147-
In this section, a user called Britta Simon is created in Documo. Documo supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in Documo, a new one is created after authentication.
147+
In this section, a user called B.Simon is created in Documo.
148+
149+
1. Navigate to the [Users page](https://app.documo.com?redirectTo=/users) on the Documo app.
150+
1. Click the **New user** button.
151+
1. Fill out the user form with name, email, phone number, user role, and password information. Make sure the **email** field matches the email for B.Simon in **Azure AD**.
152+
1. Click **Create**.
148153

149154
## Test SSO
150155

articles/azure-percept/azure-percept-devkit-container-release-notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ This page provides information of changes and fixes for Azure Percept DK Contain
1414

1515
To download the container updates, go to [Azure Percept Studio](https://ms.portal.azure.com/#blade/AzureEdgeDevices/main/overview), select Devices from the left navigation pane, choose the specific device, and then select Vision and Speech tabs to initiate container downloads.
1616

17+
## December (2112) Release
18+
19+
- Removed lines in the image frames using automatic image capture in Azure Percept Studio. This issue was introduced in the 2108 module release.
20+
- Security fixes for docker services running as root in azureeyemodule, azureearspeechclientmodule, and webstreammodule.
21+
1722
## August (2108) Release
1823

1924
- Azureyemodule (mcr.microsoft.com/azureedgedevices/azureeyemodule:2108-1)

articles/azure-video-analyzer/video-analyzer-docs/live-pipeline-topologies.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Live pipeline topologies
3-
description: This article describes the supported by Azure Video Analyzer live pipeline topologies in detail.
2+
title: List of pipeline topologies
3+
description: This article lists the live pipeline topologies supported by Azure Video Analyzer.
44
ms.topic: conceptual
5-
ms.date: 12/13/2021
5+
ms.date: 12/15/2021
66
---
77

8-
# Live pipeline topologies
8+
# List of pipeline topologies
99

1010
The tables that follow list the [live pipeline topologies](terminology.md#pipeline-topology) supported by Azure Video Analyzer. The tables also provide
1111

@@ -15,9 +15,9 @@ The tables that follow list the [live pipeline topologies](terminology.md#pipeli
1515

1616
Clicking on a topology name redirects to the corresponding JSON file located in [this GitHub folder](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/), clicking on a sample redirects to the corresponding sample document.
1717

18-
## Pipeline topology tables
18+
## Live pipeline topologies
1919

20-
## Continuous video recording
20+
### Continuous video recording
2121

2222
Name | Description | Samples | VSCode Name
2323
:----- | :---- | :---- | :---
@@ -28,7 +28,7 @@ Name | Description | Samples | VSCode Name
2828
[cvr-with-motion](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/cvr-with-motion/topology.json) | Perform CVR. When motion is detected from a live video feed, relevant inferencing events are published to the IoT Edge Hub. | | Continuous Video Recording > Record on motion detection
2929
[audio-video](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/audio-video/topology.json) | Perform CVR and record audio using the outputSelectors property. | | Continuous Video Recording > Record audio with video
3030

31-
## Event-based video recording
31+
### Event-based video recording
3232

3333
Name | Description | Samples | VSCode Name
3434
:----- | :---- | :---- | :---
@@ -40,23 +40,23 @@ Name | Description | Samples | VSCode Name
4040
[evr-motion-video-sink](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/evr-motion-video-sink/topology.json) | When motion is detected, those events are published to the IoT Edge Hub. In addition, the motion events are used to trigger the signal gate processor node that will send frames to the video sink node when motion is detected. As a result, new video clips are appended to the Azure Video Analyzer video, corresponding to when motion was detected. | [Detect motion, record video to Video Analyzer](edge/detect-motion-record-video-clips-cloud.md) | Event-based Video Recording > Record motion events to Video Analyzer video
4141
[evr-motion-file-sink](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/evr-motion-file-sink/topology.json) | When motion is detected from a live video feed, events are sent to a signal gate processor node that opens, sending frames to a file sink node. As a result, new files are created on the local file system of the edge device, containing the frames where motion was detected. | [Detect motion and record video on edge devices](edge/detect-motion-record-video-edge-devices.md) | Event-based Video Recording > Record motion events to local files
4242

43-
## Motion detection
43+
### Motion detection
4444

4545
Name | Description | Samples | VSCode Name
4646
:----- | :---- | :---- | :---
4747
[motion-detection](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/motion-detection/topology.json) | Detect motion in a live video feed. When motion is detected, those events are published to the IoT Hub. | [Get started with Azure Video Analyzer](edge/get-started-detect-motion-emit-events.md), [Get started with Video Analyzer in the portal](edge/get-started-detect-motion-emit-events-portal.md), [Detect motion and emit events](detect-motion-emit-events-quickstart.md) | Motion Detection > Publish motion events to IoT Hub
4848
[motion-with-grpcExtension](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/motion-with-grpcExtension/topology.json) | Perform event-based recording in the presence of motion. When motion is detected from a live video feed, those events are published to the IoT Edge Hub. In addition, the motion events are used to trigger a signal gate processor node that will send frames to a video sink node only when motion is present. As a result, new video clips are appended to the Azure Video Analyzer video, corresponding to when motion was detected. Additionally, run video analytics only when motion is detected. Upon detecting motion, a subset of the video frames is sent to an external AI inference engine via the gRPC extension. The results are then published to the IoT Edge Hub. | [Analyze live video with your own model - gRPC](analyze-live-video-use-your-model-grpc.md) | Motion Detection > Publish motion events using gRPC Extension
4949
[motion-with-httpExtension](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/motion-with-httpExtension/topology.json) | Perform event-based recording in the presence of motion. When motion is detected in a live video feed, those events are published to the IoT Edge Hub. In addition, the motion events are used to trigger a signal gate processor node that will send frames to a video sink node only when motion is present. As a result, new video clips are appended to the Azure Video Analyzer video, corresponding to when motion was detected. Additionally, run video analytics only when motion is detected. Upon detecting motion, a subset of the video frames is sent to an external AI inference engine via the HTTP extension. The results are then published to the IoT Edge Hub. | [Analyze live video with your own model - HTTP](edge/analyze-live-video-use-your-model-http.md#generate-and-deploy-the-iot-edge-deployment-manifest) | Motion Detection > Publish motion events using HTTP Extension
5050

51-
## Extensions
51+
### Extensions
5252

5353
Name | Description | Samples | VSCode Name
5454
:----- | :---- | :---- | :---
5555
[grpcExtensionOpenVINO](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/grpcExtensionOpenVINO/topology.json) | Run video analytics on a live video feed. The gRPC extension allows you to create images at video frame rate from the camera that are converted to images, and sent to the [OpenVINO™ DL Streamer - Edge AI Extension module](https://aka.ms/ava-intel-ovms) provided by Intel. The results are then published to the IoT Edge Hub. | [Analyze live video with Intel OpenVINO™ DL Streamer – Edge AI Extension](use-intel-grpc-video-analytics-serving-tutorial.md)
5656
[httpExtension](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/httpExtension/topology.json) | Run video analytics on a live video feed. A subset of the video frames from the camera are converted to images, and sent to an external AI inference engine. The results are then published to the IoT Edge Hub. | [Analyze live video with your own model - HTTP](analyze-live-video-use-your-model-http.md), [Analyze live video with Azure Video Analyzer on IoT Edge and Azure Custom Vision](edge/analyze-live-video-custom-vision.md) | Extensions > Analyzer video using HTTP Extension
5757
[httpExtensionOpenVINO](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/httpExtensionOpenVINO/topology.json) | Run video analytics on a live video feed. A subset of the video frames from the camera are converted to images, and sent to the [OpenVINO™ Model Server – AI Extension module](https://aka.ms/ava-intel-ovms) provided by Intel. The results are then published to the IoT Edge Hub. | [Analyze live video using OpenVINO™ Model Server – AI Extension from Intel](https://aka.ms/ava-intel-ovms-tutorial) | Extensions > Analyzer video with Intel OpenVINO Model Server
5858

59-
## Computer vision
59+
### Computer vision
6060

6161
Name | Description | Samples | VSCode Name
6262
:----- | :---- | :---- | :---
@@ -66,13 +66,13 @@ Name | Description | Samples | VSCode Name
6666
[spatial-analysis/person-distance-operation-topology](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/spatial-analysis/person-distance-operation-topology.json) | Live video is sent to an external [spatialAnalysis](../../cognitive-services/computer-vision/spatial-analysis-operations.md) module that tracks when people violate a distance rule. When the criteria defined by the AI operation is met, events are sent to a signal gate processor that opens, sending the frames to a video sink node. As a result, a new clip is appended to the Azure Video Analyzer video resource. | | Computer Vision > Person distance operation with Computer Vision for Spatial Analysis
6767
[spatial-analysis/custom-operation-topology](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/spatial-analysis\custom-operation-topology.json) | Live video is sent to an external [spatialAnalysis](../../cognitive-services/computer-vision/spatial-analysis-operations.md) module that carries out a supported AI operation. When the criteria defined by the AI operation is met, events are sent to a signal gate processor that opens, sending the frames to a video sink node. As a result, a new clip is appended to the Azure Video Analyzer video resource. | | Computer Vision > Custom operation with Computer Vision for Spatial Analysis
6868

69-
## AI composition
69+
### AI composition
7070

7171
Name | Description | Samples | VSCode Name
7272
:----- | :---- | :---- | :---
7373
[ai-composition](https://github.com/Azure/video-analyzer/blob/main/pipelines/live/topologies/ai-composition/topology.json) | Run 2 AI inferencing models of your choice. In this example, classified video frames are sent from an AI inference engine using the [Tiny YOLOv3 model](https://github.com/Azure/video-analyzer/tree/main/edge-modules/extensions/yolo/tinyyolov3/grpc-cpu) to another engine using the [YOLOv3 model](https://github.com/Azure/video-analyzer/tree/main/edge-modules/extensions/yolo/yolov3/grpc-cpu). Having such a topology enables you to trigger a heavy AI module, only when a light AI module indicates a need to do so. | [Analyze live video streams with multiple AI models using AI composition](edge/analyze-ai-composition.md) | AI composition > Record to the Video Analyzer service using multiple AI models
7474

75-
## Miscellaneous
75+
### Miscellaneous
7676

7777
Name | Description | Samples | VSCode Name
7878
:----- | :---- | :---- | :---

articles/cost-management-billing/reservations/understand-suse-reservation-charges.md

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,39 +56,29 @@ The ratio for 5 or more vCPUs is 2.6. So a reservation for SUSE with a VM with 5
5656

5757
The following tables show the software plans you can buy a reservation for, their associated usage meters, and the ratios for each.
5858

59-
### SUSE Linux Enterprise Server for HPC Priority
60-
61-
|SUSE VM | MeterId| Ratio| Example VM size|
62-
| -------| ------------------------| --- |--- |
63-
|SUSE Linux Enterprise Server for HPC Priority 1-2 vCPUs|e275a668-ce79-44e2-a659-f43443265e98|1|D2s_v3|
64-
|SUSE Linux Enterprise Server for HPC Priority 3-4 vCPUs|e531e1c0-09c9-4d83-b7d0-a2c6741faa22|2|D4s_v3|
65-
|SUSE Linux Enterprise Server for HPC Priority 5+ vCPUs|4edcd5a5-8510-49a8-a9fc-c9721f501913|2.6|D8s_v3|
66-
67-
### SUSE Linux Enterprise Server for HPC Standard
59+
### SUSE Linux Enterprise Server for HPC
6860

6961
|SUSE VM | MeterId | Ratio|Example VM size|
7062
| ------- | --- | ------------------------| --- |
71-
|SUSE Linux Enterprise Server for HPC Standard 1-2 vCPUs |8c94ad45-b93b-4772-aab1-ff92fcec6610|1|D2s_v3|
72-
|SUSE Linux Enterprise Server for HPC Standard 3-4 vCPUs|4ed70d2d-e2bb-4dcd-b6fa-42da71861a1c|1.92308|D4s_v3|
73-
|SUSE Linux Enterprise Server for HPC Standard 5+ vCPUs |907a85de-024f-4dd6-969c-347d47a1bdff|2.92308|D8s_v3|
74-
75-
### SUSE Linux Enterprise Server for SAP Standard
63+
|SUSE Linux Enterprise Server for HPC 1-2 vCPUs |8c94ad45-b93b-4772-aab1-ff92fcec6610|1|D2s_v3|
64+
|SUSE Linux Enterprise Server for HPC 3-4 vCPUs|4ed70d2d-e2bb-4dcd-b6fa-42da71861a1c|1.92308|D4s_v3|
65+
|SUSE Linux Enterprise Server for HPC 5+ vCPUs |907a85de-024f-4dd6-969c-347d47a1bdff|2.92308|D8s_v3|
7666

77-
Previously, SUSE Linux Enterprise Server for SAP Standard was named SUSE Linux Enterprise Server for SAP Priority.
67+
### SUSE Linux Enterprise Server for SAP applications
7868

7969
|SUSE VM | MeterId | Ratio|Example VM size|
8070
| ------- |------------------------| --- | --- |
81-
|SUSE Linux Enterprise Server for SAP Standard 1-2 vCPUs|497fe0b6-fa3c-4e3d-a66b-836097244142|1|D2s_v3|
82-
|SUSE Linux Enterprise Server for SAP Standard 3-4 vCPUs |847887de-68ce-4adc-8a33-7a3f4133312f|2|D4s_v3|
83-
|SUSE Linux Enterprise Server for SAP Standard 5+ vCPUs |18ae79cd-dfce-48c9-897b-ebd3053c6058|2.41176|D8s_v3|
71+
|SUSE Linux Enterprise Server for SAP applications 1-2 vCPUs|497fe0b6-fa3c-4e3d-a66b-836097244142|1|D2s_v3|
72+
|SUSE Linux Enterprise Server for SAP applications 3-4 vCPUs |847887de-68ce-4adc-8a33-7a3f4133312f|2|D4s_v3|
73+
|SUSE Linux Enterprise Server for SAP applications 5+ vCPUs |18ae79cd-dfce-48c9-897b-ebd3053c6058|2.41176|D8s_v3|
8474

85-
### SUSE Linux Enterprise Server Standard
75+
### SUSE Linux Enterprise Server
8676

8777
|SUSE VM | MeterId | Ratio|Example VM size|
8878
| ------- |------------------------| --- |--- |
89-
|SUSE Linux Enterprise Server Standard 1-2 cores vCPUs |4b2fecfc-b110-4312-8f9d-807db1cb79ae|1|D2s_v3|
90-
|SUSE Linux Enterprise Server Standard 3-4 cores vCPUs |0c3ebb4c-db7d-4125-b45a-0534764d4bda|1.92308|D4s_v3|
91-
|SUSE Linux Enterprise Server Standard 5+ vCPUs |7b349b65-d906-42e5-833f-b2af38513468|2.30769| D8s_v3|
79+
|SUSE Linux Enterprise Server 1-2 cores vCPUs |4b2fecfc-b110-4312-8f9d-807db1cb79ae|1|D2s_v3|
80+
|SUSE Linux Enterprise Server 3-4 cores vCPUs |0c3ebb4c-db7d-4125-b45a-0534764d4bda|1.92308|D4s_v3|
81+
|SUSE Linux Enterprise Server 5+ vCPUs |7b349b65-d906-42e5-833f-b2af38513468|2.30769| D8s_v3|
9282

9383
## Need help? Contact us
9484

@@ -103,4 +93,4 @@ To learn more about reservations, see the following articles:
10393
- [Prepay for Virtual Machines with Azure Reserved VM Instances](../../virtual-machines/prepay-reserved-vm-instances.md)
10494
- [Manage Azure Reservations](manage-reserved-vm-instance.md)
10595
- [Understand reservation usage for your Pay-As-You-Go subscription](understand-reserved-instance-usage.md)
106-
- [Understand reservation usage for your Enterprise enrollment](understand-reserved-instance-usage-ea.md)
96+
- [Understand reservation usage for your Enterprise enrollment](understand-reserved-instance-usage-ea.md)

articles/role-based-access-control/transfer-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: rolyon
1414

1515
# Transfer an Azure subscription to a different Azure AD directory
1616

17-
Organizations might have several Azure subscriptions. Each subscription is associated with a particular Azure Active Directory (Azure AD) directory. To make management easier, you might want to transfer a subscription to a different Azure AD directory. When you transfer a subscription to a different Azure AD directory, some resources are not transferred to the target directory. For example, all role assignments and custom roles in Azure role-based access control (Azure RBAC) are **permanently** deleted from the source directory and are not be transferred to the target directory.
17+
Organizations might have several Azure subscriptions. Each subscription is associated with a particular Azure Active Directory (Azure AD) directory. To make management easier, you might want to transfer a subscription to a different Azure AD directory. When you transfer a subscription to a different Azure AD directory, some resources are not transferred to the target directory. For example, all role assignments and custom roles in Azure role-based access control (Azure RBAC) are **permanently** deleted from the source directory and are not transferred to the target directory.
1818

1919
This article describes the basic steps you can follow to transfer a subscription to a different Azure AD directory and re-create some of the resources after the transfer.
2020

0 commit comments

Comments
 (0)