Skip to content

Commit bb1c0bb

Browse files
authored
Merge pull request #224378 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents e1a86b1 + c99477f commit bb1c0bb

File tree

80 files changed

+2808
-851
lines changed

Some content is hidden

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

80 files changed

+2808
-851
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16269,6 +16269,11 @@
1626916269
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
1627016270
"redirect_document_id": ""
1627116271
},
16272+
{
16273+
"source_path_from_root": "/articles/search/search-get-started-vs-code.md",
16274+
"redirect_url": "/previous-versions/azure/search/search-get-started-vs-code",
16275+
"redirect_document_id": false
16276+
},
1627216277
{
1627316278
"source_path_from_root": "/articles/search/search-how-to-index-power-query-data-sources.md",
1627416279
"redirect_url": "/previous-versions/azure/search/search-how-to-index-power-query-data-sources",

articles/active-directory/develop/mark-app-as-publisher-verified.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Mark an app as publisher verified
3-
description: Describes how to mark an app as publisher verified. When an application is marked as publisher verified, it means that the publisher has verified their identity using a Microsoft Partner Network account that has completed the verification process and has associated this MPN account with their application registration.
3+
description: Describes how to mark an app as publisher verified. When an application is marked as publisher verified, it means that the publisher (application developer) has verified the authenticity of their organization using a Microsoft Partner Network (MPN) account that has completed the verification process and has associated this MPN account with that application registration.
44
services: active-directory
55
author: rwike77
66
manager: CelesteDG

articles/active-directory/develop/publisher-verification-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ms.reviewer: ardhanap, brianokoyo, jesakowi
1616

1717
# Publisher verification
1818

19-
Publisher verification gives app users and organization admins information about the authenticity of a developer who publishes an app that integrates with the Microsoft identity platform.
19+
Publisher verification gives app users and organization admins information about the authenticity of the developer's organization, who publishes an app that integrates with the Microsoft identity platform.
2020

21-
An app that's publisher verified means that the app's publisher has verified their identity with Microsoft. Identity verification includes using a [Microsoft Partner Network (MPN)](https://partner.microsoft.com/membership) account that's been [verified](/partner-center/verification-responses) and associating the MPN account with an app registration.
21+
An app that's publisher verified means that the app's publisher (app developer) has verified the authenticity of their organization with Microsoft. Verifying an app includes using a Microsoft Partner Network (MPN) account that's been [verified](/partner-center/verification-responses) and associating the MPN account with an app registration.
2222

2323
When the publisher of an app has been verified, a blue *verified* badge appears in the Azure Active Directory (Azure AD) consent prompt for the app and on other webpages:
2424

Loading
12.6 KB
Loading

articles/active-directory/external-identities/self-service-sign-up-add-api-connector.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
ms.service: active-directory
66
ms.subservice: B2B
77
ms.topic: article
8-
ms.date: 07/13/2021
8+
ms.date: 01/16/2023
99

1010
ms.author: mimart
1111
author: msmimart
@@ -30,13 +30,13 @@ To use an [API connector](api-connectors-overview.md), you first create the API
3030
3. In the left menu, select **External Identities**.
3131
4. Select **All API connectors**, and then select **New API connector**.
3232

33-
:::image type="content" source="media/self-service-sign-up-add-api-connector/api-connector-new.png" alt-text="Providing the basic configuration like target URL and display name for an API connector during the creation experience.":::
33+
:::image type="content" source="media/self-service-sign-up-add-api-connector/api-connector-new.png" alt-text="Screenshot of adding a new API connector to External Identities.":::
3434

3535
5. Provide a display name for the call. For example, **Check approval status**.
3636
6. Provide the **Endpoint URL** for the API call.
3737
7. Choose the **Authentication type** and configure the authentication information for calling your API. Learn how to [Secure your API Connector](self-service-sign-up-secure-api-connector.md).
3838

39-
:::image type="content" source="media/self-service-sign-up-add-api-connector/api-connector-config.png" alt-text="Providing authentication configuration for an API connector during the creation experience.":::
39+
:::image type="content" source="media/self-service-sign-up-add-api-connector/api-connector-config.png" alt-text="Screenshot of configuring an API connector.":::
4040

4141
8. Select **Save**.
4242

@@ -129,7 +129,7 @@ Content-type: application/json
129129
}
130130
```
131131

132-
The exact claims sent to the API depends on which information is provided by the identity provider. 'email' is always sent.
132+
The exact claims sent to the API depend on which information is provided by the identity provider. 'email' is always sent.
133133

134134
### Expected response types from the web API at this step
135135

@@ -187,7 +187,7 @@ Content-type: application/json
187187
"ui_locales":"en-US"
188188
}
189189
```
190-
The exact claims sent to the API depends on which information is collected from the user or is provided by the identity provider.
190+
The exact claims sent to the API depend on which information is collected from the user or is provided by the identity provider.
191191

192192
### Expected response types from the web API at this step
193193

@@ -212,7 +212,7 @@ A blocking response exits the user flow. It can be purposely issued by the API t
212212
See an example of a [blocking response](#example-of-a-blocking-response).
213213

214214
### Validation-error response
215-
When the API responds with a validation-error response, the user flow stays on the attribute collection page and a `userMessage` is displayed to the user. The user can then edit and resubmit the form. This type of response can be used for input validation.
215+
When the API responds with a validation-error response, the user flow stays on the attribute collection page, and a `userMessage` is displayed to the user. The user can then edit and resubmit the form. This type of response can be used for input validation.
216216

217217
See an example of a [validation-error response](#example-of-a-validation-error-response).
218218

@@ -237,7 +237,7 @@ Content-type: application/json
237237
| version | String | Yes | The version of your API. |
238238
| action | String | Yes | Value must be `Continue`. |
239239
| \<builtInUserAttribute> | \<attribute-type> | No | Values can be stored in the directory if they selected as a **Claim to receive** in the API connector configuration and **User attributes** for a user flow. Values can be returned in the token if selected as an **Application claim**. |
240-
| \<extension\_{extensions-app-id}\_CustomAttribute> | \<attribute-type> | No | The claim does not need to contain `_<extensions-app-id>_`, it is *optional*. Returned values can overwrite values collected from a user. |
240+
| \<extension\_{extensions-app-id}\_CustomAttribute> | \<attribute-type> | No | The claim doesn't need to contain `_<extensions-app-id>_`, it's *optional*. Returned values can overwrite values collected from a user. |
241241

242242
### Example of a blocking response
243243

@@ -248,7 +248,7 @@ Content-type: application/json
248248
{
249249
"version": "1.0.0",
250250
"action": "ShowBlockPage",
251-
"userMessage": "There was a problem with your request. You are not able to sign up at this time.",
251+
"userMessage": "There was an error with your request. Please try again or contact support.",
252252
}
253253
254254
```
@@ -305,7 +305,7 @@ Ensure that:
305305
* Your API implements an authentication method outlined in [secure your API Connector](self-service-sign-up-secure-api-connector.md).
306306
* Your API responds as quickly as possible to ensure a fluid user experience.
307307
* Azure AD will wait for a maximum of *20 seconds* to receive a response. If none is received, it will make *one more attempt (retry)* at calling your API.
308-
* If using a serverless function or scalable web service, use a hosting plan that keeps the API "awake" or "warm" in production. For Azure Functions, it's recommended to use at minimum the [Premium plan](../../azure-functions/functions-scale.md)
308+
* If using a serverless function or scalable web service, use a hosting plan that keeps the API "awake" or "warm" in production. For Azure Functions, it's recommended to use at minimum the [Premium plan](../../azure-functions/functions-scale.md#overview-of-plans)
309309
* Ensure high availability of your API.
310310
* Monitor and optimize performance of downstream APIs, databases, or other dependencies of your API.
311311
* Your endpoints must comply with the Azure AD TLS and cipher security requirements. For more information, see [TLS and cipher suite requirements](../../active-directory-b2c/https-cipher-tls-requirements.md).

articles/active-directory/manage-apps/secure-hybrid-access.md

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,28 +74,27 @@ The following partners offer solutions to support Conditional Access policies pe
7474

7575
Learn more: [What is Conditional Access?](../conditional-access/overview.md)
7676

77-
|Partner company site|Integration documentation|
77+
|Partner|Integration documentation|
7878
|---|---|
79-
|[Akamai Technologies](https://www.akamai.com/)|[Tutorial: Azure AD SSO integration with Akamai](../saas-apps/akamai-tutorial.md)|
80-
|[Citrix Systems, Inc.](https://www.citrix.com/)|[Tutorial: Azure AD SSO integration with Citrix ADC SAML Connector for Azure AD (Kerberos-based authentication)](../saas-apps/citrix-netscaler-tutorial.md)|
81-
|[Datawiza](https://www.datawiza.com/)|[Tutorial: Configure Secure Hybrid Access with Azure AD and Datawiza](datawiza-with-azure-ad.md)|
82-
|[F5, Inc.](https://www.f5.com/)|[Integrate F5 BIG-IP with Azure AD](f5-aad-integration.md)</br>[Tutorial: Configure F5 BIG-IP SSL-VPN for Azure AD SSO](f5-aad-password-less-vpn.md)|
83-
|[Progress Software Corporation, Progress Kemp](https://support.kemptechnologies.com/hc)|[Tutorial: Azure AD SSO integration with Kemp LoadMaster Azure AD integration](../saas-apps/kemp-tutorial.md)|
84-
|[Perimeter 81 Ltd.]()|[Tutorial: Azure AD SSO integration with Perimeter 81](../saas-apps/perimeter-81-tutorial.md)|
85-
|[Silverfort](https://www.silverfort.com/)|[Tutorial: Configure Secure Hybrid Access with Azure AD and Silverfort](silverfort-azure-ad-integration.md)|
86-
|[Strata Identity, Inc.](https://www.strata.io/)|[Integrate Azure AD SSO with Maverics Identity Orchestrator SAML Connector](../saas-apps/maverics-identity-orchestrator-saml-connector-tutorial.md)|
79+
|Akamai Technologies|[Tutorial: Azure AD SSO integration with Akamai](../saas-apps/akamai-tutorial.md)|
80+
|Citrix Systems, Inc.|[Tutorial: Azure AD SSO integration with Citrix ADC SAML Connector for Azure AD (Kerberos-based authentication)](../saas-apps/citrix-netscaler-tutorial.md)|
81+
|Datawiza|[Tutorial: Configure Secure Hybrid Access with Azure AD and Datawiza](datawiza-with-azure-ad.md)|
82+
|F5, Inc.|[Integrate F5 BIG-IP with Azure AD](f5-aad-integration.md)</br>[Tutorial: Configure F5 BIG-IP SSL-VPN for Azure AD SSO](f5-aad-password-less-vpn.md)|
83+
|Progress Software Corporation, Progress Kemp|[Tutorial: Azure AD SSO integration with Kemp LoadMaster Azure AD integration](../saas-apps/kemp-tutorial.md)|
84+
|Perimeter 81 Ltd.|[Tutorial: Azure AD SSO integration with Perimeter 81](../saas-apps/perimeter-81-tutorial.md)|
85+
|Silverfort|[Tutorial: Configure Secure Hybrid Access with Azure AD and Silverfort](silverfort-azure-ad-integration.md)|
86+
|Strata Identity, Inc.|[Integrate Azure AD SSO with Maverics Identity Orchestrator SAML Connector](../saas-apps/maverics-identity-orchestrator-saml-connector-tutorial.md)|
8787

8888
### Partners with pre-built solutions and integration documentation
8989

90-
|Partner company site|Integration documentation|
90+
|Partner|Integration documentation|
9191
|---|---|
92-
|[Amazon Web Service, Inc.](https://aws.amazon.com/)|[Tutorial: Azure AD SSO integration with AWS ClientVPN](../saas-apps/aws-clientvpn-tutorial.md)|
93-
|[Check Point Software Technologies Ltd.](https://www.checkpoint.com/)|[Tutorial: Azure AD single SSO integration with Check Point Remote Secure Access VPN](../saas-apps/check-point-remote-access-vpn-tutorial.md)|
94-
|[Cisco Systems, Inc.](https://www.cisco.com/)|[Tutorial: Azure AD SSO integration with Cisco AnyConnect](../saas-apps/cisco-anyconnect.md)|
95-
|[Cloudflare, Inc.](https://www.cloudflare.com/)|[Tutorial: Configure Cloudflare with Azure AD for secure hybrid access](cloudflare-azure-ad-integration.md)|
96-
|[Fortinet, Inc.](https://www.fortinet.com/)|[Tutorial: Azure AD SSO integration with FortiGate SSL VPN](../saas-apps/fortigate-ssl-vpn-tutorial.md)|
97-
|[Palo Alto Networks](https://www.paloaltonetworks.com/)|[Tutorial: Azure AD SSO integration with Palo Alto Networks Admin UI](../saas-apps/paloaltoadmin-tutorial.md)|
98-
|[Pulse Secure, Acquired by Ivanti](https://www.pulsesecure.net/)|[Tutorial: Azure AD SSO integration with Pulse Connect Secure (PCS)](../saas-apps/pulse-secure-pcs-tutorial.md)</br>[Tutorial: Azure AD SSO integration with Pulse Secure Virtual Traffic Manager](../saas-apps/pulse-secure-virtual-traffic-manager-tutorial.md)</br>**Note**: Pulse Secure is part of Ivanti. See, [Ivanti, Pulse Secure](https://www.ivanti.com/company/history/pulse-secure?psredirect)|
99-
100-
|[Zsclaer, Inc.](https://www.zscaler.com/)|[Tutorial: Integrate Zscaler Private Access with Azure AD](../saas-apps/zscalerprivateaccess-tutorial.md)|
92+
|Amazon Web Service, Inc.|[Tutorial: Azure AD SSO integration with AWS ClientVPN](../saas-apps/aws-clientvpn-tutorial.md)|
93+
|Check Point Software Technologies Ltd.|[Tutorial: Azure AD single SSO integration with Check Point Remote Secure Access VPN](../saas-apps/check-point-remote-access-vpn-tutorial.md)|
94+
|Cisco Systems, Inc.|[Tutorial: Azure AD SSO integration with Cisco AnyConnect](../saas-apps/cisco-anyconnect.md)|
95+
|Cloudflare, Inc.|[Tutorial: Configure Cloudflare with Azure AD for secure hybrid access](cloudflare-azure-ad-integration.md)|
96+
|Fortinet, Inc.|[Tutorial: Azure AD SSO integration with FortiGate SSL VPN](../saas-apps/fortigate-ssl-vpn-tutorial.md)|
97+
|Palo Alto Networks|[Tutorial: Azure AD SSO integration with Palo Alto Networks Admin UI](../saas-apps/paloaltoadmin-tutorial.md)|
98+
|Pulse Secure, Acquired by Ivanti|[Tutorial: Azure AD SSO integration with Pulse Connect Secure (PCS)](../saas-apps/pulse-secure-pcs-tutorial.md)</br>[Tutorial: Azure AD SSO integration with Pulse Secure Virtual Traffic Manager](../saas-apps/pulse-secure-virtual-traffic-manager-tutorial.md)</br>Pulse Secure is part of Ivanti. See, [Ivanti, Pulse Secure](https://www.ivanti.com/company/history/pulse-secure?psredirect)|
99+
|Zsclaer, Inc.|[Tutorial: Integrate Zscaler Private Access with Azure AD](../saas-apps/zscalerprivateaccess-tutorial.md)|
101100

articles/aks/certificate-rotation.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Certificate Rotation in Azure Kubernetes Service (AKS)
33
description: Learn certificate rotation in an Azure Kubernetes Service (AKS) cluster.
44
services: container-service
55
ms.topic: article
6-
ms.date: 09/12/2022
6+
ms.date: 01/19/2023
77
---
88

99
# Certificate rotation in Azure Kubernetes Service (AKS)
@@ -19,6 +19,10 @@ This article shows you how certificate rotation works in your AKS cluster.
1919

2020
This article requires that you are running the Azure CLI version 2.0.77 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
2121

22+
## Limitation
23+
24+
Certificate rotation is not supported for stopped AKS clusters.
25+
2226
## AKS certificates, Certificate Authorities, and Service Accounts
2327

2428
AKS generates and uses the following certificates, Certificate Authorities, and Service Accounts:

articles/aks/upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For more information what cluster operations may trigger specific upgrade events
5757
[release-tracker]: ./release-tracker.md
5858
[node-image-upgrade]: ./node-image-upgrade.md
5959
[gh-actions-upgrade]: ./node-upgrade-github-actions.md
60-
[operator-guide-patching]: /azure/architecture/operator-guides/aks/aks-upgrade-practices.md#considerations
60+
[operator-guide-patching]: /azure/architecture/operator-guides/aks/aks-upgrade-practices#considerations
6161
[supported-k8s-versions]: ./supported-kubernetes-versions.md#kubernetes-version-support-policy
6262
[ts-nsg]: /troubleshoot/azure/azure-kubernetes/upgrade-fails-because-of-nsg-rules
6363
[ts-pod-drain]: /troubleshoot/azure/azure-kubernetes/error-code-poddrainfailure

articles/azure-monitor/agents/azure-monitor-agent-manage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ Use the following CLI commands to uninstall Azure Monitor Agent on Azure virtual
230230

231231
- Windows
232232
```azurecli
233-
az vm extension delete --resource-group <resource-group-name> --vm-name <virtual-machine-name> -name AzureMonitorWindowsAgent
233+
az vm extension delete --resource-group <resource-group-name> --vm-name <virtual-machine-name> --name AzureMonitorWindowsAgent
234234
```
235235

236236
- Linux
237237
```azurecli
238-
az vm extension delete --resource-group <resource-group-name> --vm-name <virtual-machine-name> -name AzureMonitorLinuxAgent
238+
az vm extension delete --resource-group <resource-group-name> --vm-name <virtual-machine-name> --name AzureMonitorLinuxAgent
239239
```
240240

241241
### Uninstall on Azure Arc-enabled servers

0 commit comments

Comments
 (0)