Skip to content

Commit 8e31a82

Browse files
authored
Merge pull request #96442 from MicrosoftDocs/master
11/19 AM Publish
2 parents dbde4ae + fd5e648 commit 8e31a82

File tree

73 files changed

+589
-285
lines changed

Some content is hidden

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

73 files changed

+589
-285
lines changed

articles/active-directory/develop/v2-oauth-ropc.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ ms.custom: aaddev
2020
ms.collection: M365-identity-device-management
2121
---
2222

23-
# Microsoft identity platform and the OAuth 2.0 resource owner password credential
23+
# Microsoft identity platform and the OAuth 2.0 Resource Owner Password Credentials
2424

25-
Microsoft identity platform supports the [resource owner password credential (ROPC) grant](https://tools.ietf.org/html/rfc6749#section-4.3), which allows an application to sign in the user by directly handling their password. The ROPC flow requires a high degree of trust and user exposure and you should only use this flow when other, more secure, flows can't be used.
25+
Microsoft identity platform supports the [OAuth 2.0 Resource Owner Password Credentials (ROPC) grant](https://tools.ietf.org/html/rfc6749#section-4.3), which allows an application to sign in the user by directly handling their password.
26+
27+
> [!WARNING]
28+
> Microsoft recommends you do _not_ use the ROPC flow. In most scenarios, more secure alternatives are available and recommended. This flow requires a very high degree of trust in the application, and carries risks which are not present in other flows. You should only use this flow when other more secure flows can't be used.
2629
2730
> [!IMPORTANT]
2831
>

articles/active-directory/manage-apps/use-scim-to-provision-users-and-groups.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,6 +1308,24 @@ Once the initial cycle has started, you can select **Provisioning logs** in the
13081308

13091309
If you're building an application that will be used by more than one tenant, you can make it available in the Azure AD application gallery. This will make it easy for organizations to discover the application and configure provisioning. Publishing your app in the Azure AD gallery and making provisioning available to others is easy. Check out the steps [here](https://docs.microsoft.com/azure/active-directory/develop/howto-app-gallery-listing). Microsoft will work with you to integrate your application into our gallery, test your endpoint, and release onboarding [documentation](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list) for customers to use.
13101310

1311+
1312+
### Authorization for provisioning connectors in the application gallery
1313+
The SCIM spec does not define a SCIM-specific scheme for authentication and authorization. It relies on the use of existing industry standards. The Azure AD provisioning client supports two authorization methods for applications in the gallery.
1314+
1315+
**OAuth authorization code grant flow:** The provisioning service supports the [authorization code grant](https://tools.ietf.org/html/rfc6749#page-24). After submitting your request for publishing your app in the gallery, our team will work with you to collect the following information:
1316+
* Authorization URL: A URL by the client to obtain authorization from the resource owner via user-agent redirection. The user is redirected to this URL to authorize access.
1317+
* Token exchange URL: A URL by the client to exchange an authorization grant for an access token, typically with client authentication.
1318+
* Client ID: The authorization server issues the registered client a client identifier, which is a unique string representing the registration information provided by the client. The client identifier is not a secret; it is exposed to the resource owner and **must not** be used alone for client authentication.
1319+
* Client secret: The client secret is a secret generated by the authorization server. It should be a unique value known only to the authorization server.
1320+
1321+
Best practices (recommended but not required):
1322+
* Support multiple redirect URLs. Administrators can configure provisioning from both "portal.azure.com" and "aad.portal.azure.com". Supporting multiple redirect URLs will ensure that users can authorize access from either portal.
1323+
* Support multiple secrets to ensure smooth secret renewal, without downtime.
1324+
1325+
**Long lived OAuth bearer tokens:** If your application does not support the OAuth authorization code grant flow, you can also generate a long lived OAuth bearer token than that an administrator can use to setup the provisioning integration. The token should be perpetual, or else the provisioning job will be [quarantined](https://docs.microsoft.com/azure/active-directory/manage-apps/application-provisioning-quarantine-status) when the token expires. This token must be below 1KB in size.
1326+
1327+
For additional authentication and authorization methods, let us know on [UserVoice](https://aka.ms/appprovisioningfeaturerequest).
1328+
13111329
### Allow IP addresses used by the Azure AD provisioning service to make SCIM requests
13121330

13131331
Certain apps allow inbound traffic to their app. In order for the Azure AD provisioning service to function as expected, the IP addresses used must be allowed. For a list of IP addresses for each service tag/region, see the JSON file - [Azure IP Ranges and Service Tags – Public Cloud](https://www.microsoft.com/download/details.aspx?id=56519). You can download and program these IPs into your firewall as needed. The reserved IP ranges for Azure AD provisioning can be found under "AzureActiveDirectoryDomainServices."

articles/active-directory/saas-apps/aws-multi-accounts-tutorial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ For more information about the Access Panel, see [Introduction to the Access
360360
361361
## Additional resources
362362
363+
* [How to configure provisioning using MS Graph APIs](https://docs.microsoft.com/azure/active-directory/manage-apps/application-provisioning-configure-api)
363364
* [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](tutorial-list.md)
364365
* [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)
365366

articles/aks/includes/servicemesh/linkerd/install-client-binary-macos.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ curl -sLO "https://github.com/linkerd/linkerd2/releases/download/$LINKERD_VERSIO
2020
The `linkerd` client binary runs on your client machine and allows you to interact with the Linkerd service mesh. Use the following commands to install the Linkerd `linkerd` client binary in a bash-based shell on MacOS. These commands copy the `linkerd` client binary to the standard user program location in your `PATH`.
2121

2222
```bash
23-
sudo cp ./linkerd2-cli-$LINKERD_VERSION-linux /usr/local/bin/linkerd
23+
sudo cp ./linkerd2-cli-$LINKERD_VERSION-darwin /usr/local/bin/linkerd
2424
sudo chmod +x /usr/local/bin/linkerd
2525
```
2626

@@ -34,4 +34,4 @@ source ~/completions/linkerd.bash
3434
# Source the bash completion file in your .bashrc so that the command-line completions
3535
# are permanently available in your shell
3636
echo "source ~/completions/linkerd.bash" >> ~/.bashrc
37-
```
37+
```

articles/aks/ingress-static-ip.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ kubectl apply --validate=false -f https://raw.githubusercontent.com/jetstack/cer
123123
kubectl create namespace cert-manager
124124

125125
# Label the cert-manager namespace to disable resource validation
126-
kubectl label namespace cert-manager certmanager.k8s.io/disable-validation=true
126+
kubectl label namespace cert-manager cert-manager.io/disable-validation=true
127127

128128
# Add the Jetstack Helm repository
129129
helm repo add jetstack https://charts.jetstack.io
@@ -148,7 +148,7 @@ Before certificates can be issued, cert-manager requires an [Issuer][cert-manage
148148
Create a cluster issuer, such as `cluster-issuer.yaml`, using the following example manifest. Update the email address with a valid address from your organization:
149149

150150
```yaml
151-
apiVersion: certmanager.k8s.io/v1alpha1
151+
apiVersion: cert-manager.io/v1alpha2
152152
kind: ClusterIssuer
153153
metadata:
154154
name: letsencrypt-staging
@@ -167,7 +167,7 @@ To create the issuer, use the `kubectl apply -f cluster-issuer.yaml` command.
167167
```
168168
$ kubectl apply -f cluster-issuer.yaml
169169

170-
clusterissuer.certmanager.k8s.io/letsencrypt-staging created
170+
clusterissuer.cert-manager.io/letsencrypt-staging created
171171
```
172172
173173
## Run demo applications
@@ -211,7 +211,7 @@ metadata:
211211
namespace: ingress-basic
212212
annotations:
213213
kubernetes.io/ingress.class: nginx
214-
certmanager.k8s.io/cluster-issuer: letsencrypt-staging
214+
cert-manager.io/cluster-issuer: letsencrypt-staging
215215
nginx.ingress.kubernetes.io/rewrite-target: /$1
216216
spec:
217217
tls:
@@ -262,7 +262,7 @@ Type Reason Age From Message
262262
If you need to create an additional certificate resource, you can do so with the following example manifest. Update the *dnsNames* and *domains* to the DNS name you created in a previous step. If you use an internal-only ingress controller, specify the internal DNS name for your service.
263263
264264
```yaml
265-
apiVersion: certmanager.k8s.io/v1alpha1
265+
apiVersion: cert-manager.io/v1alpha2
266266
kind: Certificate
267267
metadata:
268268
name: tls-secret
@@ -287,7 +287,7 @@ To create the certificate resource, use the `kubectl apply -f certificates.yaml`
287287
```
288288
$ kubectl apply -f certificates.yaml
289289
290-
certificate.certmanager.k8s.io/tls-secret created
290+
certificate.cert-manager.io/tls-secret created
291291
```
292292

293293
## Test the ingress configuration

articles/availability-zones/az-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ The combinations of Azure services and regions that support Availability Zones a
4848
| Linux Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
4949
| Windows Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
5050
| Virtual Machine Scale Sets | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
51+
| Azure Kubernetes Service | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
5152
| **Storage** | | | | | | | | | | |
5253
| Managed Disks | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
5354
| Zone-redundant Storage | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
@@ -92,6 +93,7 @@ There is no additional cost for virtual machines deployed in an Availability Zon
9293
- [Add zone redundant region for Azure Cosmos DB](../cosmos-db/high-availability.md#availability-zone-support)
9394
- [Getting Started Azure Cache for Redis Availability Zones](https://aka.ms/redis/az/getstarted)
9495
- [Create an Azure Active Directory Domain Services instance](../active-directory-domain-services/tutorial-create-instance.md)
96+
- [Create an Azure Kubernetes Service (AKS) cluster that uses Availability Zones](../aks/availability-zones.md)
9597

9698
## Next steps
9799
- [Quickstart templates](https://aka.ms/azqs)

articles/azure-functions/functions-test-a-function.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ namespace Functions.Tests
216216
public async void Http_trigger_should_return_known_string()
217217
{
218218
var request = TestFactory.CreateHttpRequest("name", "Bill");
219-
var response = (OkObjectResult)await HttpFunction.Run(request, logger);
219+
var response = (OkObjectResult)await HttpTrigger.Run(request, logger);
220220
Assert.Equal("Hello, Bill", response.Value);
221221
}
222222

@@ -225,7 +225,7 @@ namespace Functions.Tests
225225
public async void Http_trigger_should_return_known_string_from_member_data(string queryStringKey, string queryStringValue)
226226
{
227227
var request = TestFactory.CreateHttpRequest(queryStringKey, queryStringValue);
228-
var response = (OkObjectResult)await HttpFunction.Run(request, logger);
228+
var response = (OkObjectResult)await HttpTrigger.Run(request, logger);
229229
Assert.Equal($"Hello, {queryStringValue}", response.Value);
230230
}
231231

articles/azure-monitor/insights/container-insights-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ Follow these steps to create a log alert in Azure Monitor by using one of the lo
304304
## Next steps
305305

306306
- View [log query examples](container-insights-log-search.md#search-logs-to-analyze-data) to see pre-defined queries and examples to evaluate or customize for alerting, visualizing, or analyzing your clusters.
307-
- To learn more about Azure Monitor and how to monitor other aspects of your AKS cluster, see [View Azure Kubernetes Service health](container-insights-analyze.md).
307+
- To learn more about Azure Monitor and how to monitor other aspects of your Kubernetes cluster, see [View Kubernetes cluster performance](container-insights-analyze.md) and [View Kubernetes cluster health](container-insights-health.md).

0 commit comments

Comments
 (0)