Skip to content

Commit 29f2d80

Browse files
authored
Merge pull request #91101 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 7c16f1a + 8802b13 commit 29f2d80

24 files changed

+77
-47
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,15 @@ Extension attributes and custom extension properties are supported as string pro
339339
(user.extensionAttribute15 -eq "Marketing")
340340
```
341341

342-
Custom extension properties are synced from on-premises Windows Server AD or from a connected SaaS application and are of the format of `user.extension_[GUID]__[Attribute]`, where:
342+
Custom extension properties are synced from on-premises Windows Server AD or from a connected SaaS application and are of the format of `user.extension_[GUID]_[Attribute]`, where:
343343

344344
* [GUID] is the unique identifier in Azure AD for the application that created the property in Azure AD
345345
* [Attribute] is the name of the property as it was created
346346

347347
An example of a rule that uses a custom extension property is:
348348

349349
```
350-
user.extension_c272a57b722d4eb29bfe327874ae79cb__OfficeNumber -eq "123"
350+
user.extension_c272a57b722d4eb29bfe327874ae79cb_OfficeNumber -eq "123"
351351
```
352352

353353
The custom property name can be found in the directory by querying a user's property using Graph Explorer and searching for the property name. Also, you can now select **Get custom extension properties** link in the dynamic user group rule builder to enter a unique app ID and receive the full list of custom extension properties to use when creating a dynamic membership rule. This list can also be refreshed to get any new custom extension properties for that app.

articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ To enable API server authorized IP ranges, you provide a list of authorized IP a
226226

227227
Use [az aks update][az-aks-update] command and specify the *--api-server-authorized-ip-ranges* to allow. These IP address ranges are usually address ranges used by your on-premises networks. Add the public IP address of your own Azure firewall obtained in the previous step, such as *20.42.25.196/32*.
228228

229-
The following example enables API server authorized IP ranges on the cluster named *myAKSCluster* in the resource group named *myResourceGroup*. The IP address ranges to authorize are *20.42.25.196/32* (the Azure firewall public IP address), then *172.0.0.0/16* and *168.10.0.0/18*:
229+
The following example enables API server authorized IP ranges on the cluster named *myAKSCluster* in the resource group named *myResourceGroup*. The IP address ranges to authorize are *20.42.25.196/32* (the Azure firewall public IP address), then *172.0.0.0/16* (Pod/Nodes Address Range) and *168.10.0.0/18* (ServiceCidr):
230230

231231
```azurecli-interactive
232232
az aks update \
@@ -235,6 +235,13 @@ az aks update \
235235
--api-server-authorized-ip-ranges 20.42.25.196/32,172.0.0.0/16,168.10.0.0/18
236236
```
237237

238+
> [!NOTE]
239+
> You should add these ranges to an allow list:
240+
> - The firewall public IP address
241+
> - The service CIDR
242+
> - The address range for the subnets, with the nodes and pods
243+
> - Any range that represents networks that you'll administer the cluster from
244+
238245
## Update or disable authorized IP ranges
239246

240247
To update or disable authorized IP ranges, you again use [az aks update][az-aks-update] command. Specify the updated CIDR range you wish to allow, or specify an empty range to disable API server authorized IP ranges, as shown in the following example:

articles/aks/cluster-container-registry-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ az aks create -n myAKSCluster -g myResourceGroup --attach-acr <acr-name-or-resou
3535
```
3636
**An ACR resource ID has the following format:**
3737

38-
/subscriptions/<subscription-d>/resourceGroups/<resource-group-name>/providers/Microsoft.ContainerRegistry/registries/{name}
38+
/subscriptions/\<subscription-id\>/resourceGroups/\<resource-group-name\>/providers/Microsoft.ContainerRegistry/registries/\<name\>
3939

4040
This step may take several minutes to complete.
4141

articles/aks/windows-container-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ az aks create \
139139
--generate-ssh-keys \
140140
--windows-admin-password $PASSWORD_WIN \
141141
--windows-admin-username azureuser \
142-
--vm-set-type VirtualMachineScaleSets \
142+
--enable-vmss \
143143
--network-plugin azure
144144
```
145145

articles/api-management/api-management-policy-expressions.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ Multi-statement expressions are enclosed in `@{expression}`. All code paths with
4747
@(context.Variables.ContainsKey("maxAge") ? int.Parse((string)context.Variables["maxAge"]) : 3600)
4848
4949
@{
50-
string value;
50+
string[] value;
5151
if (context.Request.Headers.TryGetValue("Authorization", out value))
5252
{
53-
return Encoding.UTF8.GetString(Convert.FromBase64String(value));
54-
}
55-
else
56-
{
57-
return null;
53+
if(value != null && value.Length > 0)
54+
{
55+
return Encoding.UTF8.GetString(Convert.FromBase64String(value[0]));
56+
}
5857
}
58+
return null;
59+
5960
}
6061
```
6162

articles/app-service/app-service-key-vault-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: seodec18
1818
# Use Key Vault references for App Service and Azure Functions (preview)
1919

2020
> [!NOTE]
21-
> Key Vault references are currently in preview.
21+
> Currently, Key Vault references are in preview, and they are not currently supported by Linux consumption plans.
2222
2323
This topic shows you how to work with secrets from Azure Key Vault in your App Service or Azure Functions application without requiring any code changes. [Azure Key Vault](../key-vault/key-vault-overview.md) is a service that provides centralized secrets management, with full control over access policies and audit history.
2424

articles/automation/automation-update-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ You can deploy and install software updates on computers that require the update
5454

5555
The scheduled deployment defines what target computers receive the applicable updates, either by explicitly specifying computers or by selecting a [computer group](../azure-monitor/platform/computer-groups.md) that's based on log searches of a specific set of computers, or an [Azure query](#azure-machines) that dynamically selects Azure VMs based on specified criteria. These groups are different from [Scope Configuration](../azure-monitor/insights/solution-targeting.md), which is only used to determine what machines get the management packs that enable the solution.
5656

57-
You also specify a schedule to approve and set a period of time during which updates can be installed. This period of time is called the maintenance window. Ten minutes of the maintenance window is reserved for reboots if a reboot is needed and you selected the appropriate reboot option. If patching takes longer than expected and there is less than ten minutes in the maintenance window, a reboot will not occur.
57+
You also specify a schedule to approve and set a period of time during which updates can be installed. This period of time is called the maintenance window. Twenty minutes of the maintenance window is reserved for reboots if a reboot is needed and you selected the appropriate reboot option. If patching takes longer than expected and there is less than twenty minutes in the maintenance window, a reboot will not occur.
5858

5959
Updates are installed by runbooks in Azure Automation. You can't view these runbooks, and the runbooks don’t require any configuration. When an update deployment is created, the update deployment creates a schedule that starts a master update runbook at the specified time for the included computers. The master runbook starts a child runbook on each agent to install the required updates.
6060

articles/azure-functions/functions-reference-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def main(req: azure.functions.HttpRequest,
327327
return f'{context.invocation_id}'
328328
```
329329

330-
The [**Context**](/python/api/azure-functions/azure.functions.context?view=azure-python) class has the following methods:
330+
The [**Context**](/python/api/azure-functions/azure.functions.context?view=azure-python) class has the following string attributes:
331331

332332
`function_directory`
333333
The directory in which the function is running.

articles/azure-monitor/learn/mobile-center-quickstart.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ To complete this quickstart, you need:
2626

2727
If you don't have an Azure subscription, create a [free](https://azure.microsoft.com/free/) account before you begin.
2828

29+
## Sign up with App Center
30+
To begin, create an account and [sign up with App Center](https://appcenter.ms/signup?utm_source=ApplicationInsights&utm_medium=Azure&utm_campaign=docs).
31+
2932
## Onboard to App Center
3033

3134
Before you can use Application Insights with your mobile app, you need to onboard your app to [App Center](https://docs.microsoft.com/mobile-center/). Application Insights does not receive telemetry from your mobile app directly. Instead, your app sends custom event telemetry to App Center. Then, App Center continuously exports copies of these custom events into Application Insights as the events are received. (This does not apply to the [Application Insights JS SDK](https://github.com/Microsoft/ApplicationInsights-JS) or the [React Native plugin](https://github.com/Microsoft/ApplicationInsights-JS/tree/master/vNext/extensions/applicationinsights-react-native) where telemetry is sent directly to Application Insights.)

articles/databox-online/data-box-edge-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ The following table describes the limits for the Data Box Edge device.
4949

5050
## Next steps
5151

52-
- [Prepare to deploy Azure Data Box Gateway](data-box-gateway-deploy-prep.md)
52+
- [Prepare to deploy Azure Data Box Edge](data-box-edge-deploy-prep.md)

0 commit comments

Comments
 (0)