Skip to content

Commit 864df0b

Browse files
authored
Merge pull request #79402 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents b1325e1 + 13f41fc commit 864df0b

10 files changed

+52
-23
lines changed

articles/active-directory-b2c/active-directory-b2c-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A web API can receive tokens from many types of clients, including web applicati
9494
6. The `access_token` and `refresh_token` are returned to the web server.
9595
7. The web API is called with the `access_token` in an authorization header.
9696
8. The web API validates the token.
97-
9. Secure data is returned to the web server.
97+
9. Secure data is returned to the web application.
9898

9999
To learn more about authorization codes, refresh tokens, and the steps for getting tokens, read about the [OAuth 2.0 protocol](active-directory-b2c-reference-oauth-code.md).
100100

articles/active-directory-b2c/tutorial-add-identity-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ After you create the application for the identity provider that you want to add,
102102
For example, `https://login.microsoftonline.com/contoso.onmicrosoft.com/.well-known/openid-configuration`.
103103
104104
8. For **Client ID**, enter the application ID that you previously recorded and for **Client secret**, enter the key value that you previously recorded.
105-
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`. Domain hints(https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/configure-authentication-for-federated-users-portal) are directives that are included in the authentication request from an application. They can be used to accelerate the user to their federated IdP sign-in page. Or they can be used by a multi-tenant application to accelerate the user straight to the branded Azure AD sign-in page for their tenant.
105+
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`. Domain hints(https://docs.microsoft.com/azure/active-directory/manage-apps/configure-authentication-for-federated-users-portal) are directives that are included in the authentication request from an application. They can be used to accelerate the user to their federated IdP sign-in page. Or they can be used by a multi-tenant application to accelerate the user straight to the branded Azure AD sign-in page for their tenant.
106106
10. Click **OK**.
107107
11. Select **Map this identity provider's claims** and set the following claims:
108108

articles/active-directory/fundamentals/active-directory-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The directory model is one of eventual consistencies. One typical problem with d
9191

9292
Azure AD provides read-write consistency for applications targeting a secondary replica by routing its writes to the primary replica, and synchronously pulling the writes back to the secondary replica.
9393

94-
Application writes using the Graph API of Azure AD are abstracted from maintaining affinity to a directory replica for read-write consistency. The Azure AD Graph service maintains a logical session, which has affinity to a secondary replica used for reads; affinity is captured in a “replica token” that the graph service caches using a distributed cache. This token is then used for subsequent operations in the same logical session.
94+
Application writes using the Graph API of Azure AD are abstracted from maintaining affinity to a directory replica for read-write consistency. The Azure AD Graph service maintains a logical session, which has affinity to a secondary replica used for reads; affinity is captured in a “replica token” that the graph service caches using a distributed cache in the secondary replica datacenter. This token is then used for subsequent operations in the same logical session. To continue using the same logical session, subsequent requests must be routed to the same Azure AD datacenter. It is not possible to continue a logical session if the directory client requests are being routed to multiple Azure AD datacenters; if this happens then the client has multiple logical sessions which have independent read-write consistencies.
9595

9696
>[!NOTE]
9797
>Writes are immediately replicated to the secondary replica to which the logical session's reads were issued.

articles/iot-edge/how-to-install-iot-edge-linux.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@ Install the Moby command-line interface (CLI). The CLI is useful for development
7878
sudo apt-get install moby-cli
7979
```
8080

81+
### Verify your Linux kernel for Moby compatibility
82+
83+
Many embedded device manufacturers ship device images which contain custom Linux kernels that may be missing features required for container runtime compatibility. If you encounter issues when installing the recommended [Moby](https://github.com/moby/moby) container runtime, you may be able to troubleshoot your Linux kernel configuration using the [check-config](https://raw.githubusercontent.com/moby/moby/master/contrib/check-config.sh) script supplied in the official [Moby Github repository](https://github.com/moby/moby) by running the following commands on the device.
84+
85+
```bash
86+
curl -sSL https://raw.githubusercontent.com/moby/moby/master/contrib/check-config.sh -o check-config.sh
87+
chmod +x check-config.sh
88+
./check-config.sh
89+
```
90+
91+
This will provide a detailed output which contains the status of kernel features that are used by the Moby runtime. You will want to ensure that all items under `Generally Necessary` and `Network Drivers` are enabled to ensure that your kernel is fully compatible with the Moby runtime. If you have identified any missing features, you may enable them by rebuilding your kernel from source and selecting the associated modules for inclusion in the appropriate kernel .config. Similarly, if you are using a kernel configuration generator like defconfig or menuconfig, you will need to find and enable the respective features and rebuild your kernel accordingly. Once you have deployed your newly modified kernel, run the check-config script again to verify that your identified features have been successfully enabled.
92+
8193
## Install the Azure IoT Edge Security Daemon
8294

8395
The **IoT Edge security daemon** provides and maintains security standards on the IoT Edge device. The daemon starts on every boot and bootstraps the device by starting the rest of the IoT Edge runtime.

articles/logic-apps/logic-apps-track-integration-account-custom-tracking-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This article provides custom code that you can use in the layers outside of your
5454
| Property | Type | Description |
5555
| --- | --- | --- |
5656
| sourceType | | Type of the run source. Allowed values are **Microsoft.Logic/workflows** and **custom**. (Mandatory) |
57-
| Source | | If the source type is **Microsoft.Logic/workflows**, the source information needs to follow this schema. If the source type is **custom**, the schema is a JToken. (Mandatory) |
57+
| source | | If the source type is **Microsoft.Logic/workflows**, the source information needs to follow this schema. If the source type is **custom**, the schema is a JToken. (Mandatory) |
5858
| systemId | String | Logic app system ID. (Mandatory) |
5959
| runId | String | Logic app run ID. (Mandatory) |
6060
| operationName | String | Name of the operation (for example, action or trigger). (Mandatory) |
@@ -79,4 +79,4 @@ For information about B2B protocol tracking schemas, see:
7979
## Next steps
8080

8181
* Learn more about [monitoring B2B messages](logic-apps-monitor-b2b-message.md)
82-
* Learn about [tracking B2B messages in Azure Monitor logs](../logic-apps/logic-apps-track-b2b-messages-omsportal.md)
82+
* Learn about [tracking B2B messages in Azure Monitor logs](../logic-apps/logic-apps-track-b2b-messages-omsportal.md)

articles/media-services/latest/live-event-states-billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.author: juliako
2121

2222
In Azure Media Services, a Live Event begins billing as soon as its state transitions to **Running**. To stop the Live Event from billing, you have to stop the Live Event.
2323

24-
When **LiveEventEncodingType** on your [Live Event](https://docs.microsoft.com/rest/api/media/liveevents) is set to Standard, Media Services auto shuts off any Live Event that is still in the **Running** state 12 hours after the input feed is lost, and there are no **Live Output**s running. However, you will still be billed for the time the Live Event was in the **Running** state.
24+
When **LiveEventEncodingType** on your [Live Event](https://docs.microsoft.com/rest/api/media/liveevents) is set to Standard or Premium1080p, Media Services auto shuts off any Live Event that is still in the **Running** state 12 hours after the input feed is lost, and there are no **Live Output**s running. However, you will still be billed for the time the Live Event was in the **Running** state.
2525

2626
## States
2727

articles/media-services/latest/live-event-types-comparison.md

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ In Azure Media Services, a [Live Event](https://docs.microsoft.com/rest/api/med
2222

2323
## Types comparison
2424

25-
The following table compares features of the two Live Event types.
25+
The following table compares features of the Live Event types.
2626

27-
| Feature | Pass-through Live Event | Standard Live Event |
27+
| Feature | Pass-through Live Event | Standard or Premium1080p Live Event |
2828
| --- | --- | --- |
2929
| Single bitrate input is encoded into multiple bitrates in the cloud |No |Yes |
3030
| Maximum video resolution for contribution feed |4K (4096x2160 at 60 frames/sec) |1080p (1920x1088 at 30 frames/sec)|
@@ -38,26 +38,27 @@ The following table compares features of the two Live Event types.
3838
| Supported video bit depth, input, and output|Up to 10-bit including HDR 10/HLG|8-bit|
3939
| Supported input audio codecs|AAC-LC, HE-AAC v1, HE-AAC v2|AAC-LC, HE-AAC v1, HE-AAC v2|
4040
| Supported output audio codecs|Same as input|AAC-LC|
41-
| Maximum video resolution of output video|Same as input|720p (at 30 frames/second)|
41+
| Maximum video resolution of output video|Same as input|Standard - 720p, Premium1080p - 1080p|
42+
| Maximum frame rate of input video|60 frames/second|Standard or Premium1080p - 30 frames/second|
4243
| Input protocols|RTMP, fragmented-MP4 (Smooth Streaming)|RTMP, fragmented-MP4 (Smooth Streaming)|
4344
| Price|See the [pricing page](https://azure.microsoft.com/pricing/details/media-services/) and click on "Live Video" tab|See the [pricing page](https://azure.microsoft.com/pricing/details/media-services/) and click on "Live Video" tab|
4445
| Maximum run time| 24 hrs x 365 days, live linear | Up to 24 hours|
4546
| Ability to pass through embedded CEA 608/708 captions data|Yes|Yes|
4647
| Support for inserting slates|No|No|
4748
| Support for ad signaling via API| No|No|
4849
| Support for ad signaling via SCTE-35 in-band messages|Yes|Yes|
49-
| Ability to recover from brief stalls in contribution feed|Yes|No (Live Event will begin slating after 6+ seconds w/o input data)|
50+
| Ability to recover from brief stalls in contribution feed|Yes|Partial|
5051
| Support for non-uniform input GOPs|Yes|No – input must have fixed GOP duration|
51-
| Support for variable frame rate input|Yes|No – input must be fixed frame rate. Minor variations are tolerated, for example, during high motion scenes. But the contribution feed cannot drop the frame rate (for example, to 15 frames/sec).|
52+
| Support for variable frame rate input|Yes|No – input must be fixed frame rate. Minor variations are tolerated, for example, during high motion scenes. But the contribution feed cannot drop the frame rate (for example, to 15 frames/second).|
5253
| Auto-shutoff of Live Event when input feed is lost|No|After 12 hours, if there is no LiveOutput running|
5354

5455
## System presets
5556

56-
When using live encoding (Live Event set to **Standard**), the encoding preset defines how the incoming stream is encoded into multiple bitrates or layers. Currently, the only allowed value for the preset is *Default720p* (default).
57+
The resolutions and bitrates contained in the output from the live encoder is determined by the [presetName](https://docs.microsoft.com/rest/api/media/liveevents/create#liveeventencoding). If using a **Standard** live encoder (LiveEventEncodingType.Standard), then the *Default720p* preset specifies a set of 6 resolution/bit rate pairs described below. Otherwise, if using a **Premium1080p** live encoder (LiveEventEncodingType.Premium1080p), then the *Default1080p* preset specifiesthe output set of resolution/bit rate pairs.
5758

58-
**Default720p** will encode the video into the following 6 layers.
59+
### Output Video Streams for Default720p
5960

60-
### Output Video Stream
61+
**Default720p** will encode the input video into the following 6 layers.
6162

6263
| BitRate | Width | Height | MaxFPS | Profile | Output Stream Name |
6364
| --- | --- | --- | --- | --- | --- |
@@ -69,11 +70,27 @@ When using live encoding (Live Event set to **Standard**), the encoding preset d
6970
| 200 |340 |192 |30 |High |Video_340x192_200kbps |
7071

7172
> [!NOTE]
72-
> If you need to use a custom live encoding preset, please contact [email protected]. You should specify the desired table of resolution and bitrates. Do verify that there is only one layer at 720p, and at most 6 layers.
73+
> If you need to customize the live encoding preset, please open a support ticket via Azure Portal. You should specify the desired table of resolution and bitrates. Do verify that there is only one layer at 720p, and at most 6 layers. Also do specify that you are requesting a preset for a Standard live encoder.
7374
74-
### Output Audio Stream
75+
### Output Video Streams for Default1080p
7576

76-
Audio is encoded to stereo AAC-LC at 128 kbps, sampling rate of 48 kHz.
77+
**Default1080p** will encode the input video into the following 6 layers.
78+
79+
| BitRate | Width | Height | MaxFPS | Profile | Output Stream Name |
80+
| --- | --- | --- | --- | --- | --- |
81+
| 5500 |1920 |1080 |30 |High |Video_1920x1080_5500kbps |
82+
| 3000 |1280 |720 |30 |High |Video_1280x720_3000kbps |
83+
| 1600 |960 |540 |30 |High |Video_960x540_1600kbps |
84+
| 800 |640 |360 |30 |High |Video_640x360_800kbps |
85+
| 400 |480 |270 |30 |High |Video_480x270_400kbps |
86+
| 200 |320 |180 |30 |High |Video_320x180_200kbps |
87+
88+
> [!NOTE]
89+
> If you need to customize the live encoding preset, please open a support ticket via Azure Portal. You should specify the desired table of resolution and bitrates. Do verify that there is only one layer at 1080p, and at most 6 layers. Also do specify that you are requesting a preset for a Premium1080p live encoder.
90+
91+
### Output Audio Stream for Default720p and Default1080p
92+
93+
For both *Default720p* and *Default1080p* presets, audio is encoded to stereo AAC-LC at 128 kbps, sampling rate of 48 kHz.
7794

7895
## Next steps
7996

articles/media-services/latest/live-events-outputs-concept.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ See a .NET code example in [MediaV3LiveApp](https://github.com/Azure-Samples/med
5050

5151
![live encoding](./media/live-streaming/live-encoding.svg)
5252

53-
When using live encoding with Media Services, you would configure your on-premises live encoder to send a single bitrate video as the contribution feed to the Live Event (using RTMP or Fragmented-Mp4 protocol). The Live Event encodes that incoming single bitrate stream to a [multiple bitrate video stream](https://en.wikipedia.org/wiki/Adaptive_bitrate_streaming), makes it available for delivery to play back devices via protocols like MPEG-DASH, HLS, and Smooth Streaming. When creating this type of Live Event, specify the encoding type as **Standard** (LiveEventEncodingType.Standard).
53+
When using live encoding with Media Services, you would configure your on-premises live encoder to send a single bitrate video as the contribution feed to the Live Event (using RTMP or Fragmented-Mp4 protocol). You would then set up a Live Event so that it encodes that incoming single bitrate stream to a [multiple bitrate video stream](https://en.wikipedia.org/wiki/Adaptive_bitrate_streaming), and makes the output available for delivery to play back devices via protocols like MPEG-DASH, HLS, and Smooth Streaming.
5454

55-
You can send the contribution feed at up to 1080p resolution at a frame rate of 30 frames/second, with H.264/AVC video codec and AAC (AAC-LC, HE-AACv1, or HE-AACv2) audio codec. See the [Live Event types comparison](live-event-types-comparison.md) article for more details.
55+
When you use live encoding, you can send the contribution feed only at resolutions up to 1080p resolution at a frame rate of 30 frames/second, with H.264/AVC video codec and AAC (AAC-LC, HE-AACv1, or HE-AACv2) audio codec. Note that pass-through Live Events can support resolutions up to 4K at 60 frames/second. See the [Live Event types comparison](live-event-types-comparison.md) article for more details.
5656

57-
When using live encoding (Live Event set to **Standard**), the encoding preset defines how the incoming stream is encoded into multiple bitrates or layers. For information, see [System presets](live-event-types-comparison.md#system-presets).
57+
The resolutions and bitrates contained in the output from the live encoder is determined by the preset. If using a **Standard** live encoder (LiveEventEncodingType.Standard), then the *Default720p* preset specifies a set of 6 resolution/bit rate pairs, going from 720p at 3.5Mbps down to 192p at 200 kbps. Otherwise, if using a **Premium1080p** live encoder (LiveEventEncodingType.Premium1080p), then the *Default1080p* preset specifies a set of 6 resolution/bit rate pairs, going from 1080p at 3.5Mbps down to 180p at 200 kbps. For information, see [System presets](live-event-types-comparison.md#system-presets).
5858

5959
> [!NOTE]
60-
> Currently, the only allowed preset value for the Standard type of Live Event is *Default720p*. If you need to use a custom live encoding preset, please contact [email protected]. You should specify the desired table of resolution and bitrates. Do verify that there is only one layer at 720p, and at most 6 layers.
60+
> If you need to customize the live encoding preset, please open a support ticket via Azure portal. You should specify the desired table of resolution and bitrates. Do verify that there is only one layer at 720p(if requesting a preset for a Standard live encoder) or at 1080p (if requesting a preset for a Premium1080p live encoder), and at most 6 layers.
6161
6262
## Live Event creation options
6363

articles/sql-database/sql-database-managed-instance-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Managed Instance guarantee 99.99% availability even in the critical scenarios, s
5454

5555
If you need to compare the performance of your workload on Managed Instance with your original workload running on SQL Server, you would need to create a performance baseline that will be used for comparison. Some of the parameters that you would need to measure on your SQL Server instance are:
5656
- [Monitor CPU usage on your SQL Server instance](https://techcommunity.microsoft.com/t5/Azure-SQL-Database/Monitor-CPU-usage-on-SQL-Server/ba-p/680777#M131) and record the average and peak CPU usage.
57-
- [Monitor memory usage on your SQL Server instance](https://docs.microsoft.com/sql/relational-databases/performance-monitor/monitor-memory-usage) and determine the amount of memory used by different components such as buffer pool, plan cache, column-store pool, [In-memory OLTP](https://docs.microsoft.com/en-us/sql/relational-databases/in-memory-oltp/monitor-and-troubleshoot-memory-usage?view=sql-server-2017), etc. In addition, you should find average and peak values of Page Life Expectancy memory performance counter.
57+
- [Monitor memory usage on your SQL Server instance](https://docs.microsoft.com/sql/relational-databases/performance-monitor/monitor-memory-usage) and determine the amount of memory used by different components such as buffer pool, plan cache, column-store pool, [In-memory OLTP](https://docs.microsoft.com/sql/relational-databases/in-memory-oltp/monitor-and-troubleshoot-memory-usage?view=sql-server-2017), etc. In addition, you should find average and peak values of Page Life Expectancy memory performance counter.
5858
- Monitor disk IO usage on the source SQL Server instance using [sys.dm_io_virtual_file_stats](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-io-virtual-file-stats-transact-sql) view or [performance counters](https://docs.microsoft.com/sql/relational-databases/performance-monitor/monitor-disk-usage).
5959
- Monitor workload and query performance or your SQL Server instance by examining Dynamic Management Views or Query Store if you are migrating from SQL Server 2016+ version. Identify average duration and CPU usage of the most important queries in your workload to compare them with the queries that are running on the Managed Instance.
6060

0 commit comments

Comments
 (0)