Skip to content

Commit ab37451

Browse files
Merge pull request #196993 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 488f0e1 + 279e5c0 commit ab37451

File tree

8 files changed

+20
-26
lines changed

8 files changed

+20
-26
lines changed

articles/active-directory-b2c/string-transformations.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,9 @@ Returns a string array that contains the substrings in this instance that are de
11781178
| InputParameter | delimiter | string | The string to use as a separator, such as comma `,`. |
11791179
| OutputClaim | outputClaim | stringCollection | A string collection whose elements contain the substrings in this string that are delimited by the `delimiter` input parameter. |
11801180

1181+
> [!NOTE]
1182+
> Any existing elements in the `OutputClaim` stringCollection will be removed.
1183+
11811184
### Example of StringSplit
11821185

11831186
The following example takes a comma delimiter string of user roles, and converts it to a string collection.

articles/active-directory/cloud-sync/what-is-cloud-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.collection: M365-identity-device-management
1414
---
1515

1616
# What is Azure AD Connect cloud sync?
17-
Azure AD Connect cloud sync is new offering from Microsoft designed to meet and accomplish your hybrid identity goals for synchronization of users, groups, and contacts to Azure AD. It accomplishes this by using the Azure AD cloud provisioning agent instead of the Azure AD Connect application. However, it can be used alongside Azure AD Connect sync and it provides the following benefits:
17+
Azure AD Connect cloud sync is a new offering from Microsoft designed to meet and accomplish your hybrid identity goals for synchronization of users, groups, and contacts to Azure AD. It accomplishes this by using the Azure AD cloud provisioning agent instead of the Azure AD Connect application. However, it can be used alongside Azure AD Connect sync and it provides the following benefits:
1818

1919
- Support for synchronizing to an Azure AD tenant from a multi-forest disconnected Active Directory forest environment: The common scenarios include merger & acquisition (where the acquired company's AD forests are isolated from the parent company's AD forests), and companies that have historically had multiple AD forests.
2020
- Simplified installation with light-weight provisioning agents: The agents act as a bridge from AD to Azure AD, with all the sync configuration managed in the cloud.

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ The following are the user properties that you can use to create a single expres
103103
| mailNickName |Any string value (mail alias of the user) |(user.mailNickName -eq "value") |
104104
| mobile |Any string value or *null* |(user.mobile -eq "value") |
105105
| objectId |GUID of the user object |(user.objectId -eq "11111111-1111-1111-1111-111111111111") |
106+
| onPremisesDistinguishedName (preview)| Any string value or *null* |(user.onPremisesDistinguishedName -eq "value") |
106107
| onPremisesSecurityIdentifier | On-premises security identifier (SID) for users who were synchronized from on-premises to the cloud. |(user.onPremisesSecurityIdentifier -eq "S-1-1-11-1111111111-1111111111-1111111111-1111111") |
107108
| passwordPolicies |None DisableStrongPassword DisablePasswordExpiration DisablePasswordExpiration, DisableStrongPassword |(user.passwordPolicies -eq "DisableStrongPassword") |
108109
| physicalDeliveryOfficeName |Any string value or *null* |(user.physicalDeliveryOfficeName -eq "value") |

articles/azure-monitor/app/javascript-sdk-load-failure.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,9 @@ To minimize intermittent network connectivity failure, we have implemented Cache
6262

6363
## Application Insights CDN outage
6464

65-
You can confirm if there is an Application Insights CDN outage by attempting to access the CDN endpoint directly from the browser (for example, https://az416426.vo.msecnd.net/scripts/b/ai.2.min.js or https://js.monitor.azure.com/scripts/b/ai.2.min.js) from a different location than your end users' probably from your own development machine (assuming that your organization has not blocked this domain).
65+
You can confirm if there is an Application Insights CDN outage by attempting to access the CDN endpoint directly from the browser (for example, https://js.monitor.azure.com/scripts/b/ai.2.min.js) from a different location than your end users' probably from your own development machine (assuming that your organization has not blocked this domain).
6666

67-
If you confirm there is an outage, you can [create a new support ticket](https://azure.microsoft.com/support/create-ticket/) or try changing the URL used to download the SDK.
68-
69-
### Change the CDN endpoint
70-
71-
As the snippet and its configuration are returned by your application as part of each generated page, you can change the snippet `src` configuration to use a different URL for the SDK. By using this approach, you could bypass the CDN blocked issue as the new URL should not be blocked.
72-
73-
Current Application Insights JavaScript SDK CDN endpoints
74-
- `https://az416426.vo.msecnd.net/scripts/b/ai.2.min.js`
75-
- `https://js.monitor.azure.com/scripts/b/ai.2.min.js`
76-
77-
> [!NOTE]
78-
> The `https://js.monitor.azure.com/` endpoint is an alias that allows us to switch between CDN providers within approximately 5 minutes, without the need for you to change any config. This is to enable us to fix detected CDN related issues more rapidly if a CDN provider is having regional or global issues without requiring everyone to adjust their settings.
67+
If you confirm there is an outage, you can [create a new support ticket](https://azure.microsoft.com/support/create-ticket/).
7968

8069
## SDK failed to initialize after loading the script
8170

@@ -159,8 +148,6 @@ Depending on the frequency that the application, firewall, or environment update
159148

160149
If the CDN endpoint is identified as unsafe, [create a support ticket](https://azure.microsoft.com/support/create-ticket/) to ensure that the issue is resolved as soon as possible.
161150

162-
To *potentially* bypass this issue more rapidly, you can [change the SDK CDN endpoint](#change-the-cdn-endpoint).
163-
164151
### Application Insights JavaScript CDN is blocked (by end user - blocked by browser; installed blocker; personal firewall)
165152

166153
Check if your end users have:

articles/azure-monitor/app/javascript.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.custom: devx-track-js
1111

1212
Find out about the performance and usage of your web page or app. If you add [Application Insights](app-insights-overview.md) to your page script, you get timings of page loads and AJAX calls, counts, and details of browser exceptions and AJAX failures, as well as users and session counts. All these can be segmented by page, client OS and browser version, geo location, and other dimensions. You can set alerts on failure counts or slow page loading. And by inserting trace calls in your JavaScript code, you can track how the different features of your web page application are used.
1313

14-
Application Insights can be used with any web pages - you just add a short piece of JavaScript. If your web service is [Java](java-in-process-agent.md) or [ASP.NET](asp-net.md), you can use the server-side SDKs with the client-side JavaScript SDK to get an end-to-end understanding of your app's performance.
14+
Application Insights can be used with any web pages - you just add a short piece of JavaScript, Node.js has a [standalone SDK](nodejs.md). If your web service is [Java](java-in-process-agent.md) or [ASP.NET](asp-net.md), you can use the server-side SDKs with the client-side JavaScript SDK to get an end-to-end understanding of your app's performance.
1515

1616
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-instrumentation-key-deprecation.md)]
1717

@@ -23,6 +23,9 @@ Application Insights can be used with any web pages - you just add a short piece
2323
* [npm Setup](#npm-based-setup)
2424
* [JavaScript Snippet](#snippet-based-setup)
2525

26+
> [!WARNING]
27+
> `@microsoft/applicationinsights-web-basic - AISKULight` does not support the use of connection strings.
28+
2629
> [!IMPORTANT]
2730
> Only use one method to add the JavaScript SDK to your application. If you use the NPM Setup, don't use the Snippet and vice versa.
2831

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,11 +495,11 @@ The following limits apply when you use Azure Resource Manager and Azure resourc
495495

496496
[!INCLUDE [azure-virtual-machines-limits-azure-resource-manager](../../../includes/azure-virtual-machines-limits-azure-resource-manager.md)]
497497

498-
### Shared Image Gallery limits
498+
### Compute Gallery limits
499499

500-
There are limits, per subscription, for deploying resources using Shared Image Galleries:
500+
There are limits, per subscription, for deploying resources using Compute Galleries:
501501

502-
- 100 shared image galleries, per subscription, per region
502+
- 100 compute galleries, per subscription, per region
503503
- 1,000 image definitions, per subscription, per region
504504
- 10,000 image versions, per subscription, per region
505505

articles/defender-for-iot/organizations/ot-pre-configured-appliances.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ You can order any of the following preconfigured appliances for monitoring your
3131

3232
|Hardware profile |Appliance |Performance / Monitoring |Physical specifications |
3333
|---------|---------|---------|---------|
34-
|Corporate | [HPE ProLiant DL360](appliance-catalog/hpe-proliant-dl360.md) | **Max bandwidth**: 3Gbp/s <br>**Max devices**: 12,000 | **Mounting**: 1U <br>**Ports**: 15x RJ45 or 8x SFP (OPT) |
35-
|Enterprise | [HPE ProLiant DL20/DL20 Plus](appliance-catalog/hpe-proliant-dl20-plus-enterprise.md) <br> (4SFF) | **Max bandwidth**: 1 Gbp/s<br>**Max devices**: 10,000 | **Mounting**: 1U <br>**Ports**: 8x RJ45 or 6x SFP (OPT) |
36-
|SMB | [HPE ProLiant DL20/DL20 Plus](appliance-catalog/hpe-proliant-dl20-plus-smb.md) <br> (NHP 2LFF) | **Max bandwidth**: 200Mbp/s<br>**Max devices**: 1,000 | **Mounting**: 1U<br>**Ports**: 4x RJ45 |
37-
|SMB | [Dell Edge 5200](appliance-catalog/dell-edge-5200.md) <br> (Rugged MIL-STD-810G) | **Max bandwidth**: 60Mbp/s<br>**Max devices**: 1,000 | **Mounting**: Wall Mount<br>**Ports**: 3x RJ45 |
38-
|Office | [YS-Techsystems YS-FIT2](appliance-catalog/ys-techsystems-ys-fit2.md) <br>(Rugged MIL-STD-810G) | **Max bandwidth**: 10Mbp/s <br>**Max devices**: 100 | **Mounting**: DIN/VESA<br>**Ports**: 2x RJ45 |
34+
|Corporate | [HPE ProLiant DL360](appliance-catalog/hpe-proliant-dl360.md) | **Max bandwidth**: 3Gbp/s <br>**Max devices**: 12,000 <br> 32 Cores/32G RAM/5.6TB | **Mounting**: 1U <br>**Ports**: 15x RJ45 or 8x SFP (OPT) |
35+
|Enterprise | [HPE ProLiant DL20/DL20 Plus](appliance-catalog/hpe-proliant-dl20-plus-enterprise.md) <br> (4SFF) | **Max bandwidth**: 1 Gbp/s<br>**Max devices**: 10,000 <br> 8 Cores/32G RAM/1.8TB | **Mounting**: 1U <br>**Ports**: 8x RJ45 or 6x SFP (OPT) |
36+
|SMB | [HPE ProLiant DL20/DL20 Plus](appliance-catalog/hpe-proliant-dl20-plus-smb.md) <br> (NHP 2LFF) | **Max bandwidth**: 200Mbp/s<br>**Max devices**: 1,000 <br> 4 Cores/8G RAM/500GB | **Mounting**: 1U<br>**Ports**: 4x RJ45 |
37+
|SMB | [Dell Edge 5200](appliance-catalog/dell-edge-5200.md) <br> (Rugged MIL-STD-810G) | **Max bandwidth**: 60Mbp/s<br>**Max devices**: 1,000 <br> 8 Cores/32G RAM/100GB | **Mounting**: Wall Mount<br>**Ports**: 3x RJ45 |
38+
|Office | [YS-Techsystems YS-FIT2](appliance-catalog/ys-techsystems-ys-fit2.md) <br>(Rugged MIL-STD-810G) | **Max bandwidth**: 10Mbp/s <br>**Max devices**: 100 <br> 4 Cores/8G RAM/128GB | **Mounting**: DIN/VESA<br>**Ports**: 2x RJ45 |
3939

4040

4141
> [!NOTE]

articles/virtual-machines/linux/quick-create-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
5858

5959
1. On the **Create a virtual machine** page, you can see the details about the VM you are about to create. When you are ready, select **Create**.
6060

61-
1. When the **Generate new key pair** window opens, select **Download private key and create resource**. Your key file will be download as **myKey.pem**. Make sure you know where the `.pem` file was downloaded, you will need the path to it in the next step.
61+
1. When the **Generate new key pair** window opens, select **Download private key and create resource**. Your key file will be download as **myKey.pem**. Make sure you know where the `.pem` file was downloaded; you will need the path to it in the next step.
6262

6363
1. When the deployment is finished, select **Go to resource**.
6464

0 commit comments

Comments
 (0)