Skip to content

Commit b78187c

Browse files
authored
Merge pull request #86452 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 7de6107 + 3bdeb4b commit b78187c

File tree

10 files changed

+25
-15
lines changed

10 files changed

+25
-15
lines changed

articles/active-directory/develop/tutorial-v2-asp-webapp.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,15 @@ When you're ready to run your test, use an Azure AD account (work or school acco
400400
<br/><br/>
401401
![Sign in to your Microsoft account](media/active-directory-develop-guidedsetup-aspnetwebapp-test/aspnetbrowsersignin2.png)
402402
403+
<!--start-collapse-->
404+
> ### Permissions and consent in the Microsoft identity platform endpoint
405+
> Applications that integrate with Microsoft identity platform follow an authorization model that gives users and administrators control over how data can be accessed. After a user authenticates with Azure AD to access this application, they will be prompted to consent to the permissions requested by the application ("View your basic profile" and "Maintain access to data you have given it access to"). After accepting these permissions, the user will continue on to the application results. However, the user may instead be prompted with a **Need admin consent** page if either of the following occur:
406+
> > - The application developer adds any additional permissions that require **Admin consent**.
407+
> > - Or the tenant is configured (in **Enterprise Applications -> User Settings**) where users cannot consent to apps accessing company data on their behalf.
408+
>
409+
> For more information, refer to [Permissions and consent in the Microsoft identity platform endpoint](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent).
410+
<!--end-collapse-->
411+
403412
#### View application results
404413
405414
After you sign in, the user is redirected to the home page of your website. The home page is the HTTPS URL that's specified in your application registration info in the Microsoft Application Registration Portal. The home page includes a *"Hello \<user>"* welcome message, a link to sign out, and a link to view the user’s claims. The link for the user's claims connects to the Claims controller that you created earlier.
@@ -480,4 +489,4 @@ Learn about how web apps can call web APIs.
480489
Help us improve the Microsoft identity platform. Tell us what you think by completing a two-question survey:
481490

482491
> [!div class="nextstepaction"]
483-
> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)
492+
> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ az extension add -y --name aks-preview
4242

4343
## Create a new AKS cluster with ACR integration
4444

45-
You can set up AKS and ACR integration during the initial creation of your AKS cluster. To allow an AKS cluster to interact with ACR, an Azure Active Directory **service principal** is used. The following CLI command creates an ACR in the resource group you specify and configures the appropriate **ACRPull** role for the service principal. If the *acr-name* doesn't exist, a default ACR name of `aks<resource-group>acr` is automatically created. Supply valid values for your parameters below. The parameters in brackets are optional.
45+
You can set up AKS and ACR integration during the initial creation of your AKS cluster. To allow an AKS cluster to interact with ACR, an Azure Active Directory **service principal** is used. The following CLI command creates an ACR in the resource group you specify and configures the appropriate **ACRPull** role for the service principal. If the *acr-name* doesn't exist in the resource group you specify, a default ACR name of `aks<resource-group>acr` is automatically created. Supply valid values for your parameters below. The parameters in brackets are optional.
4646
```azurecli
4747
az login
4848
az aks create -n myAKSCluster -g myResourceGroup --enable-acr [--acr <acr-name-or-resource-id>]
4949
```
50+
**An ACR resource id has the following format:
51+
52+
/subscriptions/<subscription-d>/resourceGroups/<resource-group-name>/providers/Microsoft.ContainerRegistry/registries/<name>
53+
5054
This step may take several minutes to complete.
5155

5256
## Create ACR integration for existing AKS clusters
@@ -132,4 +136,4 @@ nginx0-deployment-669dfc4d4b-xdpd6 1/1 Running 0 20s
132136
```
133137

134138
<!-- LINKS - external -->
135-
[AKS AKS CLI]: https://docs.microsoft.com/cli/azure/aks?view=azure-cli-latest#az-aks-create
139+
[AKS AKS CLI]: https://docs.microsoft.com/cli/azure/aks?view=azure-cli-latest#az-aks-create

articles/aks/limit-egress-traffic.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,13 @@ The following FQDN / application rules are required:
8383
|----------------------------|-----------|----------|
8484
| *.hcp.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
8585
| *.tun.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
86-
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). |
86+
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). This registry contains third-party images/charts (for example, metrics server, core dns, etc.) required for the functioning of the cluster during upgrade and scale of the cluster|
8787
| *.blob.core.windows.net | HTTPS:443 | This address is the backend store for images stored in ACR. |
88-
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). |
88+
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
8989
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure content delivery network (CDN). |
9090
| management.azure.com | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
9191
| login.microsoftonline.com | HTTPS:443 | This address is required for Azure Active Directory authentication. |
92-
| api.snapcraft.io | HTTPS:443, HTTP:80 | This address is required to install Snap packages on Linux nodes. |
9392
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
94-
| *.docker.io | HTTPS:443 | This address is required to pull required container images for the tunnel front. |
9593

9694
## Optional recommended addresses and ports for AKS clusters
9795

@@ -101,7 +99,7 @@ The following FQDN / application rules are recommended for AKS clusters to funct
10199

102100
| FQDN | Port | Use |
103101
|-----------------------------------------|-----------|----------|
104-
| *.ubuntu.com | HTTP:80 | This address lets the Linux cluster nodes download the required security patches and updates. |
102+
| security.ubuntu.com, azure.archive.ubuntu.com, changelogs.ubuntu.com | HTTP:80 | This address lets the Linux cluster nodes download the required security patches and updates. |
105103
| packages.microsoft.com | HTTPS:443 | This address is the Microsoft packages repository used for cached *apt-get* operations. |
106104
| dc.services.visualstudio.com | HTTPS:443 | Recommended for correct metrics and monitoring using Azure Monitor. |
107105
| *.opinsights.azure.com | HTTPS:443 | Recommended for correct metrics and monitoring using Azure Monitor. |

articles/cognitive-services/personalizer/how-personalizer-works.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ You can use recommendation engines with Personalizer:
159159
## Adding content safeguards to your application
160160

161161
If your application allows for large variances in content shown to users, and some of that content may be unsafe or inappropriate for some users, you should plan ahead to make sure that the right safeguards are in place to prevent your users from seeing unacceptable content. The best pattern to implement safeguards is:
162-
The best pattern to implement safeguards is:
163162
* Obtain the list of actions to rank.
164163
* Filter out the ones that are not viable for the audience.
165164
* Only rank these viable actions.

articles/storage/common/storage-redundancy-gzrs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ When an availability zone becomes unavailable, Azure undertakes networking updat
6666
If a failure affects the entire primary region, then Microsoft will first attempt to restore the primary region. If restoration is not possible, then Microsoft will fail over to the secondary region, so that the secondary region becomes the new primary region. If the storage account has RA-GZRS enabled, then applications designed for this scenario can read from the secondary region while waiting for failover. If the storage account does not have RA-GZRS enabled, then applications will not be able to read from the secondary until the failover is complete.
6767

6868
> [!NOTE]
69-
> GZRS and RA-GZRS are currently in preview in the US East 2 region only. Customer-managed account failover (preview) is not yet available in US East 2, so customers cannot currently manage account failover events with GZRS and RA-GZRS accounts. During the preview, Microsoft will manage any failover events affecting GZRS and RA-GZRS accounts.
69+
> GZRS and RA-GZRS are currently in preview in the US East region only. Customer-managed account failover (preview) is not yet available in US East 2, so customers cannot currently manage account failover events with GZRS and RA-GZRS accounts. During the preview, Microsoft will manage any failover events affecting GZRS and RA-GZRS accounts.
7070
7171
Because data is replicated to the secondary region asynchronously, a failure that affects the primary region may result in data loss if the primary region cannot be recovered. The interval between the most recent writes to the primary region and the last write to the secondary region is known as the recovery point objective (RPO). The RPO indicates the point in time to which data can be recovered. Azure Storage typically has an RPO of less than 15 minutes, although there's currently no SLA on how long it takes to replicate data to the secondary region.
7272

articles/virtual-desktop/partners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ThinPrint is a Windows Virtual Desktop value-added services provider that delive
7777
ThinPrint’s ezeep solution extends the value of Windows Virtual Desktop by enabling the connection to existing enterprise print infrastructure. ezeep gives users control over printing in the enterprise no matter where they are. Using ezeep, users can bridge the gap between Windows Virtual Desktop and printing hardware.
7878

7979
- [See the joint solution brief.](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE3oYas)
80-
- [Go to partner website.](http://www.ezeep.com/wvd-printing)
80+
- [Go to partner website.](https://www.ezeep.com/wvd-printing)
8181

8282
## Workspot
8383

includes/azure-storage-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ The following table describes default limits for Azure general-purpose v1, v2, a
4040
4141
If the needs of your application exceed the scalability targets of a single storage account, you can build your application to use multiple storage accounts. You can then partition your data objects across those storage accounts. For information on volume pricing, see [Azure Storage pricing](https://azure.microsoft.com/pricing/details/storage/).
4242

43-
All storage accounts run on a flat network topology and support the scalability and performance targets outlined in this article, regardless of when they were created. For more information on the Azure Storage flat network architecture and on scalability, see [Microsoft Azure Storage: A Highly Available Cloud Storage Service with Strong Consistency](http://blogs.msdn.com/b/windowsazurestorage/archive/2011/11/20/windows-azure-storage-a-highly-available-cloud-storage-service-with-strong-consistency.aspx).
43+
All storage accounts run on a flat network topology and support the scalability and performance targets outlined in this article, regardless of when they were created. For more information on the Azure Storage flat network architecture and on scalability, see [Microsoft Azure Storage: A Highly Available Cloud Storage Service with Strong Consistency](https://blogs.msdn.com/b/windowsazurestorage/archive/2011/11/20/windows-azure-storage-a-highly-available-cloud-storage-service-with-strong-consistency.aspx).
4444

includes/connectors-create-api-onedriveforbusiness.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.date: 11/03/2016
66
ms.author: estfan
77
---
88
### Prerequisites
9-
* A [OneDrive](http://OneDrive.com) account
9+
* A [OneDrive](https://OneDrive.com) account
1010

1111
Before you can use your OneDrive for Business account in a Logic app, you must authorize the Logic app to connect to your OneDrive for Business account. Fortunately, you can do this easily from within your Logic app on the Azure Portal.
1212

includes/container-service-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Depending on your scenario, you can also build and manage custom container solut
3131
### What is the difference between Azure Container Service and ACS Engine? 
3232
Azure Container Service is an SLA-backed Azure service with features in the Azure portal, Azure command-line tools, and Azure APIs. The service enables you to quickly implement and manage clusters running standard container orchestration tools with a relatively small number of configuration choices.
3333

34-
[ACS Engine](http://github.com/Azure/acs-engine) is an open-source project that enables power users to customize the cluster configuration at every level. This ability to alter the configuration of both infrastructure and software means that we offer no SLA for ACS Engine. Support is handled through the open-source project on GitHub rather than through official Microsoft channels. 
34+
[ACS Engine](https://github.com/Azure/acs-engine) is an open-source project that enables power users to customize the cluster configuration at every level. This ability to alter the configuration of both infrastructure and software means that we offer no SLA for ACS Engine. Support is handled through the open-source project on GitHub rather than through official Microsoft channels. 
3535

3636
For additional details please refer to our [support policy for containers](https://support.microsoft.com/en-us/help/4035670/support-policy-for-containers).
3737

includes/container-service-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Enterprises care deeply about security, and to protect themselves from security
2828

2929
Even when using a private registry, it is a good idea to use image scanning solutions for additional security validation. Each software layer in a container image is potentially prone to vulnerabilities independent of other layers in the container image. As increasingly companies start deploying their production workloads based on container technologies, image scanning becomes important to ensure prevention of security threats against their organizations.
3030

31-
Security monitoring and scanning solutions such as [Twistlock](https://www.twistlock.com/2016/11/07/twistlock-supports-azure-container-registry) and [Aqua Security](http://blog.aquasec.com/image-vulnerability-scanning-in-azure-container-registry), among others, can be used to scan container images in a private registry and identify potential vulnerabilities. It is important to understand the depth of scanning that the different solutions provide. For example, some solutions might only cross-verify image layers against known vulnerabilities. These solutions might not be able to verify image-layer software built through certain package manager software. Other solutions have deeper scanning integration and can find vulnerabilities in any packaged software.
31+
Security monitoring and scanning solutions such as [Twistlock](https://www.twistlock.com/2016/11/07/twistlock-supports-azure-container-registry) and [Aqua Security](https://blog.aquasec.com/image-vulnerability-scanning-in-azure-container-registry), among others, can be used to scan container images in a private registry and identify potential vulnerabilities. It is important to understand the depth of scanning that the different solutions provide. For example, some solutions might only cross-verify image layers against known vulnerabilities. These solutions might not be able to verify image-layer software built through certain package manager software. Other solutions have deeper scanning integration and can find vulnerabilities in any packaged software.
3232

3333
### Production deployment rules and audit
3434
Once an application is deployed in production, it is essential to set a few rules to ensure that images used in production environments are secure and contain no vulnerabilities.

0 commit comments

Comments
 (0)