Skip to content

Commit 47bc8e3

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-work
2 parents 9e65e6a + 5bd9fb6 commit 47bc8e3

File tree

151 files changed

+874
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+874
-516
lines changed

articles/active-directory-b2c/best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ Stay up to date with the state of the service and find support options.
8787
|--|--|
8888
| [Service updates](https://azure.microsoft.com/updates/?product=active-directory-b2c) | Stay up to date with Azure AD B2C product updates and announcements. |
8989
| [Microsoft Support](support-options.md) | File a support request for Azure AD B2C technical issues. Billing and subscription management support is provided at no cost. |
90-
| [Azure status](https://status.azure.com/status) | View the current health status of all Azure services. |
90+
| [Azure status](https://azure.status.microsoft/status) | View the current health status of all Azure services. |

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-enable-tenant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To enable Permissions Management in your organization:
3737
## How to enable Permissions Management on your Azure AD tenant
3838

3939
1. In your browser:
40-
1. Go to [Entra services](https://entra.microsoft.com) and use your credentials to sign in to [Azure Active Directory](https://ms.portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Overview).
40+
1. Go to [Entra services](https://entra.microsoft.com) and use your credentials to sign in to [Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Overview).
4141
1. If you aren't already authenticated, sign in as a global administrator user.
4242
1. If needed, activate the global administrator role in your Azure AD tenant.
4343
1. In the Azure AD portal, select **Permissions Management**, and then select the link to purchase a license or begin a trial.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The numbers above are a global total of Azure AD authentications across all cust
8080

8181
## Incident history
8282

83-
All incidents that seriously impact Azure AD performance are documented in the [Azure status history](https://status.azure.com/status/history/). Not all events documented in Azure status history are serious enough to cause Azure AD to go below its SLA. You can view information about the impact of incidents, as well as a root cause analysis of what caused the incident and what steps Microsoft took to prevent future incidents.
83+
All incidents that seriously impact Azure AD performance are documented in the [Azure status history](https://azure.status.microsoft/status/history/). Not all events documented in Azure status history are serious enough to cause Azure AD to go below its SLA. You can view information about the impact of incidents, as well as a root cause analysis of what caused the incident and what steps Microsoft took to prevent future incidents.
8484

8585

8686

articles/aks/configure-kubenet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ You can create an AKS cluster using a system-assigned managed identity by runnin
132132

133133
> [!NOTE]
134134
> When using system-assigned identity, azure-cli will grant Network Contributor role to the system-assigned identity after the cluster is created.
135-
> System-assigned managed identity is only support for CLI. If you are using an ARM template or other clients, you need to use the [user-assigned managed identity][Create an AKS cluster with user-assigned managed identities]
135+
> If you are using an ARM template or other clients, you need to use the [user-assigned managed identity][Create an AKS cluster with user-assigned managed identities]
136136
137137
```azurecli-interactive
138138
az aks create \

articles/aks/limit-egress-traffic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn what ports and addresses are required to control egress traff
44
services: container-service
55
ms.topic: article
66
ms.author: jpalma
7-
ms.date: 07/05/2022
7+
ms.date: 07/26/2022
88
author: palma21
99

1010
#Customer intent: As an cluster operator, I want to restrict egress traffic for nodes to only access defined ports and addresses and improve cluster security.

articles/analysis-services/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
- name: Azure updates
130130
href: https://azure.microsoft.com/updates/?query=Analysis%20Services
131131
- name: Azure status
132-
href: https://status.azure.com/
132+
href: https://azure.status.microsoft/
133133
- name: Feedback
134134
href: https://feedback.azure.com/d365community/forum/d92323a0-0525-ec11-b6e6-000d3a4f0858
135135
- name: Pricing

articles/api-management/vscode-create-service-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ In the pane that opens, supply a name for the new API Management instance. It mu
4747
A new API Management instance (and parent resource group) will be created with the specified name. By default, the instance is created in the *West US* region with *Consumption* SKU.
4848

4949
> [!TIP]
50-
> If you enable **Advanced Creation** in the *Azure API Management Extension Settings*, you can also specify an [API Management SKU](https://azure.microsoft.com/pricing/details/api-management/), [Azure region](https://status.azure.com/en-us/status), and a [resource group](../azure-resource-manager/management/overview.md) to deploy your API Management instance.
50+
> If you enable **Advanced Creation** in the *Azure API Management Extension Settings*, you can also specify an [API Management SKU](https://azure.microsoft.com/pricing/details/api-management/), [Azure region](https://azure.status.microsoft/en-us/status), and a [resource group](../azure-resource-manager/management/overview.md) to deploy your API Management instance.
5151
>
5252
> While the *Consumption* SKU takes less than a minute to set up, other SKUs typically take 30-40 minutes to create.
5353

articles/application-gateway/application-gateway-key-vault-common-errors.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,35 @@ Select **Managed deleted vaults**. From here, you can find the deleted Key Vault
128128

129129
**Resolution:** Your Azure subscription can get disabled for various reasons. To take the necessary action to resolve, see [Reactivating a disabled Azure subscription](../cost-management-billing/manage/subscription-disabled.md).
130130

131+
[comment]: # (Error Code 8)
132+
### Error code: ApplicationGatewayCertificateDataOrKeyVaultSecretIdMustBeSpecified/ApplicationGatewaySslCertificateDataMustBeSpecified
133+
134+
**Description:** You may encounter this error when trying to update a listener certificate. When this error occurs, the change to update the certificate will be discarded and the listener will continue to handle traffic with the previously defined configuration.
135+
136+
**Resolution:** To resolve this issue please try uploading the certificate again. For example, the following PowerShell commands may be used to update certificates uploaded to Application Gateway or referenced via Azure Key Vault.
137+
138+
Update certificate uploaded directly to Application Gateway:
139+
```
140+
$appgw = Get-AzApplicationGateway -ResourceGroupName "<ResourceGroup>" -Name "<AppGatewayName>"
141+
142+
$password = ConvertTo-SecureString -String "<password>" -Force -AsPlainText
143+
144+
Set-AzApplicationGatewaySSLCertificate -Name "<oldcertname>" -ApplicationGateway $appgw -CertificateFile "<newcertPath>" -Password $password
145+
146+
Set-AzApplicationGateway -ApplicationGateway $appgw
147+
```
148+
149+
Update certificate referenced from Azure Key Vault:
150+
```
151+
$appgw = Get-AzApplicationGateway -ResourceGroupName "<ResourceGroup>" -Name "<AppGatewayName>"
152+
153+
$secret = Get-AzKeyVaultSecret -VaultName "<KeyVaultName>" -Name "<CertificateName>"
154+
$secretId = $secret.Id.Replace($secret.Version, "")
155+
$cert = Set-AzApplicationGatewaySslCertificate -ApplicationGateway $AppGW -Name "<CertificateName>" -KeyVaultSecretId $secretId
156+
157+
Set-AzApplicationGateway -ApplicationGateway $appgw
158+
```
159+
131160
## Next steps
132161

133162
These troubleshooting articles might be helpful as you continue to use Application Gateway:

articles/applied-ai-services/form-recognizer/concept-general-document.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ You'll need the following resources:
5454

5555
* An Azure subscription—you can [create one for free](https://azure.microsoft.com/free/cognitive-services/)
5656

57-
* A [Form Recognizer instance](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, select **Go to resource** to get your key and endpoint.
57+
* A [Form Recognizer instance](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, select **Go to resource** to get your key and endpoint.
5858

5959
:::image type="content" source="media/containers/keys-and-endpoint.png" alt-text="Screenshot: keys and endpoint location in the Azure portal.":::
6060

articles/applied-ai-services/form-recognizer/concept-w2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Try extracting data from W-2 forms using the Form Recognizer Studio. You'll need
3636

3737
* An Azure subscription—you can [create one for free](https://azure.microsoft.com/free/cognitive-services/)
3838

39-
* A [Form Recognizer instance](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, select **Go to resource** to get your key and endpoint.
39+
* A [Form Recognizer instance](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, select **Go to resource** to get your key and endpoint.
4040

4141
:::image type="content" source="media/containers/keys-and-endpoint.png" alt-text="Screenshot of keys and endpoint location in the Azure portal.":::
4242

0 commit comments

Comments
 (0)