Skip to content

Commit 45e4466

Browse files
authored
Merge pull request #78981 from MicrosoftDocs/master
6/6 PM Publish
2 parents 7042ec2 + c742470 commit 45e4466

File tree

209 files changed

+973
-4879
lines changed

Some content is hidden

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

209 files changed

+973
-4879
lines changed

.openpublishing.redirection.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26814,6 +26814,86 @@
2681426814
"redirect_url": "/azure/marketplace/cloud-partner-portal/test-drive/what-is-test-drive",
2681526815
"redirect_document_id": false
2681626816
},
26817+
{
26818+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-channel-info-tab.md",
26819+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26820+
"redirect_document_id": false
26821+
},
26822+
{
26823+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-contacts-tab.md",
26824+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26825+
"redirect_document_id": false
26826+
},
26827+
{
26828+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-create-offer.md",
26829+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26830+
"redirect_document_id": false
26831+
},
26832+
{
26833+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-offer-settings-tab.md",
26834+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26835+
"redirect_document_id": false
26836+
},
26837+
{
26838+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-plans-tab.md",
26839+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26840+
"redirect_document_id": false
26841+
},
26842+
{
26843+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-prerequisites.md",
26844+
"redirect_url": "/azure/marketplace/partner-center-portal/offer-creation-checklist",
26845+
"redirect_document_id": false
26846+
},
26847+
{
26848+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-publish-offer.md",
26849+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26850+
"redirect_document_id": false
26851+
},
26852+
{
26853+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-subscription-apis.md",
26854+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26855+
"redirect_document_id": false
26856+
},
26857+
{
26858+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-storefront-tab.md",
26859+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26860+
"redirect_document_id": false
26861+
},
26862+
{
26863+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-technical-info-tab.md",
26864+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26865+
"redirect_document_id": false
26866+
},
26867+
{
26868+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-testdrive-tab.md",
26869+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26870+
"redirect_document_id": false
26871+
},
26872+
{
26873+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-update-existing-offer.md",
26874+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-saas-offer",
26875+
"redirect_document_id": false
26876+
},
26877+
{
26878+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-fulfillment-api-v1.md",
26879+
"redirect_url": "/azure/marketplace/partner-center-portal/pc-saas-fulfillment-api-v1",
26880+
"redirect_document_id": false
26881+
},
26882+
{
26883+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-fulfillment-api-v2.md",
26884+
"redirect_url": "/azure/marketplace/partner-center-portal/pc-saas-fulfillment-api-v2",
26885+
"redirect_document_id": false
26886+
},
26887+
{
26888+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-fulfillment-apis.md",
26889+
"redirect_url": "/azure/marketplace/partner-center-portal/pc-saas-fulfillment-apis",
26890+
"redirect_document_id": false
26891+
},
26892+
{
26893+
"source_path": "articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-registration.md",
26894+
"redirect_url": "/azure/marketplace/partner-center-portal/pc-saas-registration",
26895+
"redirect_document_id": false
26896+
},
2681726897
{
2681826898
"source_path": "articles/marketplace/grow-your-business-azure-marketplace.md",
2681926899
"redirect_url": "/azure/marketplace/grow-your-business-with-azure-marketplace",

articles/active-directory/develop/about-microsoft-identity-platform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The **application API in Microsoft Graph** is currently in preview. Use this API
5555

5656
### MSAL libraries
5757

58-
You can use the MSAL library to build applications that authenticate all Microsoft identities. The MSAL libraries in .NET are generally available. MSAL libraries for JavaScript, iOS, and Android are in preview and suitable for use in a production environment. We provide the same production level support for MSAL libraries in preview as we do for versions of MSAL and ADAL that are generally available.
58+
You can use the MSAL library to build applications that authenticate all Microsoft identities. The MSAL libraries in .NET and JavaScript are generally available. MSAL libraries for iOS and Android are in preview and suitable for use in a production environment. We provide the same production level support for MSAL libraries in preview as we do for versions of MSAL and ADAL that are generally available.
5959

6060
You can also use the MSAL libraries to integrate your application with Azure AD B2C.
6161

articles/active-directory/saas-apps/otsuka-shokai-tutorial.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: tutorial
17-
ms.date: 05/31/2019
17+
ms.date: 06/06/2019
1818
ms.author: jeedes
1919

2020
ms.collection: M365-identity-device-management
@@ -76,16 +76,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7676

7777
![Edit Basic SAML Configuration](common/edit-urls.png)
7878

79-
1. On the **Set up Single Sign-On with SAML** page, perform the following steps:
80-
81-
a. In the **Identifier** text box, type a URL using the following pattern:
82-
`https://<SUBDOMAIN>.otsuka-shokai.co.jp/S000000100`
83-
84-
b. In the **Reply URL** text box, type a URL using the following pattern:
85-
`https://<SUBDOMAIN>.otsuka-shokai.co.jp/ResponseOffice365`
86-
87-
> [!NOTE]
88-
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Otsuka Shokai Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
79+
1. On the **Set up Single Sign-On with SAML** page, the application is pre-configured and the necessary URLs are already pre-populated with Azure. The user needs to save the configuration by clicking the **Save** button.
8980

9081
1. Otsuka Shokai application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes, where as **nameidentifier** is mapped with **user.userprincipalname**. Otsuka Shokai application expects **nameidentifier** to be mapped with **user.objectid**, so you need to edit the attribute mapping by clicking on **Edit** icon and change the attribute mapping.
9182

@@ -138,7 +129,7 @@ In this section, you'll create a test user in the Azure portal called B. Simon.
138129
1. Select **New user** at the top of the screen.
139130
1. In the **User** properties, follow these steps:
140131
1. In the **Name** field, enter `B. Simon`.
141-
1. In the **User name** field, enter the [email protected]. For example, `BrittaSimon@contoso.com`.
132+
1. In the **User name** field, enter the [email protected]. For example, `B.Simon@contoso.com`.
142133
1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
143134
1. Click **Create**.
144135

@@ -162,7 +153,7 @@ In this section, you'll enable B. Simon to use Azure single sign-on by granting
162153

163154
### Create Otsuka Shokai test user
164155

165-
In this section, you create a user called Britta Simon in Otsuka Shokai. Work with [Otsuka Shokai support team](mailto:[email protected]) to add the users in the Otsuka Shokai platform. Users must be created and activated before you use single sign-on.
156+
In this section, you create a user called B.Simon in Otsuka Shokai. Work with [Otsuka Shokai support team](mailto:[email protected]) to add the users in the Otsuka Shokai platform. Users must be created and activated before you use single sign-on.
166157

167158
### Test SSO
168159

articles/active-directory/users-groups-roles/roles-delegate-by-task.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Create, read, update, and delete users | Global Administrator ([see documentatio
5555
Read all configuration | Global Administrator |
5656
Read B2C audit logs | Global Administrator ([see documentation](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-faqs)) |
5757

58+
> [!NOTE]
59+
> Azure AD B2C global administrators do not have the same permissions as Azure AD global administrators. If you have Azure AD B2C global administrator privileges, make sure that you are in an Azure AD B2C directory and not an Azure AD directory.
60+
5861
## Company branding
5962

6063
Task | Least privileged role | Additional roles

articles/aks/limit-egress-traffic.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ author: iainfoulds
66

77
ms.service: container-service
88
ms.topic: article
9-
ms.date: 05/14/2019
9+
ms.date: 06/06/2019
1010
ms.author: iainfou
1111

1212
#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.
1313
---
1414

1515
# Preview - Limit egress traffic for cluster nodes and control access to required ports and services in Azure Kubernetes Service (AKS)
1616

17-
By default, AKS clusters have unrestricted outbound (egress) internet access. This level of network access allows nodes and services you run to access external resources as needed. If you wish to restrict egress traffic, a limited number of ports and addresses must be accessible to maintain healthy cluster maintenance tasks. Your cluster is then configured to only use base system container images from Microsoft Container Registry (MCR) or Azure Container Registry (ACR), not external public repositories.
17+
By default, AKS clusters have unrestricted outbound (egress) internet access. This level of network access allows nodes and services you run to access external resources as needed. If you wish to restrict egress traffic, a limited number of ports and addresses must be accessible to maintain healthy cluster maintenance tasks. Your cluster is then configured to only use base system container images from Microsoft Container Registry (MCR) or Azure Container Registry (ACR), not external public repositories. You must configure your preferred firewall and security rules to allow these required ports and addresses.
1818

1919
This article details what network ports and fully qualified domain names (FQDNs) are required and optional if you restrict egress traffic in an AKS cluster. This feature is currently in preview.
2020

@@ -26,7 +26,7 @@ This article details what network ports and fully qualified domain names (FQDNs)
2626
2727
## Before you begin
2828

29-
You need the Azure CLI version 2.0.61 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
29+
You need the Azure CLI version 2.0.66 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
3030

3131
To create an AKS cluster that can limit egress traffic, first enable a feature flag on your subscription. This feature registration configures any AKS clusters you create to use base system container images from MCR or ACR. To register the *AKSLockingDownEgressPreview* feature flag, use the [az feature register][az-feature-register] command as shown in the following example:
3232

@@ -52,7 +52,7 @@ For management and operational purposes, nodes in an AKS cluster need to access
5252

5353
To increase the security of your AKS cluster, you may wish to restrict egress traffic. The cluster is configured to pull base system container images from MCR or ACR. If you lock down the egress traffic in this manner, you must define specific ports and FQDNs to allow the AKS nodes to correctly communicate with required external services. Without these authorized ports and FQDNs, your AKS nodes can't communicate with the API server or install core components.
5454

55-
You can use [Azure Firewall][azure-firewall] or a 3rd-party firewall appliance to secure your egress traffic and define these required ports and addresses.
55+
You can use [Azure Firewall][azure-firewall] or a 3rd-party firewall appliance to secure your egress traffic and define these required ports and addresses. AKS does not automatically create these rules for you. The following ports and addresses are for reference as you create the appropriate rules in your network firewall.
5656

5757
In AKS, there are two sets of ports and addresses:
5858

@@ -68,23 +68,26 @@ The following outbound ports / network rules are required for an AKS cluster:
6868

6969
* TCP port *443*
7070
* TCP port *9000* and TCP port *22* for the tunnel front pod to communicate with the tunnel end on the API server.
71+
* To get more specific, see the **.hcp.\<location\>.azmk8s.io* and **.tun.\<location\>.azmk8s.io* addresses in the following table.
7172

7273
The following FQDN / application rules are required:
7374

74-
| FQDN | Port | Use |
75-
|---------------------------|-----------|----------|
76-
| *.azmk8s.io | HTTPS:443,22,9000 | This address is the API server endpoint. |
77-
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). |
78-
| *.blob.core.windows.net | HTTPS:443 | This address is the backend store for images stored in ACR. |
79-
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). |
80-
| management.azure.com | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
81-
| login.microsoftonline.com | HTTPS:443 | This address is required for Azure Active Directory authentication. |
75+
| FQDN | Port | Use |
76+
|----------------------------|-----------|----------|
77+
| *.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. |
78+
| *.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. |
79+
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). |
80+
| *.blob.core.windows.net | HTTPS:443 | This address is the backend store for images stored in ACR. |
81+
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). |
82+
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure content delivery network (CDN). |
83+
| management.azure.com | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
84+
| login.microsoftonline.com | HTTPS:443 | This address is required for Azure Active Directory authentication. |
85+
| api.snapcraft.io | HTTPS:443, HTTP:80 | This address is required to install Snap packages on Linux nodes. |
86+
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
87+
| *.docker.io | HTTPS:443 | This address is required to pull required container images for the tunnel front. |
8288

8389
## Optional recommended addresses and ports for AKS clusters
8490

85-
The following outbound ports / network rules aren't required for AKS clusters to function correctly, but are recommended:
86-
87-
* UDP port *123* for NTP time sync
8891
* UDP port *53* for DNS
8992

9093
The following FQDN / application rules are recommended for AKS clusters to function correctly:

articles/aks/windows-container-cli.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: tylermsft
66

77
ms.service: container-service
88
ms.topic: article
9-
ms.date: 05/06/2019
9+
ms.date: 06/06/2019
1010
ms.author: twhitney
1111

1212
#Customer intent: As a developer or cluster operator, I want to quickly create an AKS cluster and deploy a Windows Server container so that I can see how to run applications running on a Windows Server container using the managed Kubernetes service in Azure.
@@ -84,7 +84,6 @@ While this feature is in preview, the following additional limitations apply:
8484
* The AKS cluster can have a maximum of eight node pools.
8585
* The AKS cluster can have a maximum of 400 nodes across those eight node pools.
8686
* The Windows Server node pool name has a limit of 6 characters.
87-
* Windows Server node pools are not available in Canada regions at this time.
8887

8988
## Create a resource group
9089

articles/application-gateway/custom-waf-rules-overview.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ ms.author: victorh
1111

1212
# Custom rules for Web Application Firewall
1313

14-
> [!IMPORTANT]
15-
> Azure Application Gateway WAF custom rules is currently a public preview. **Custom rules are available only for the WAF_v2 SKU**.
16-
> This public preview is provided without a service-level agreement and shouldn't be used for production workloads. Certain features might not be supported, might have constrained capabilities, or might not be available in all Azure locations. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
17-
1814
The Azure Application Gateway web application firewall (WAF) comes with a pre-configured, platform-managed ruleset that offers protection from many different types of attacks. These attacks include cross site scripting, SQL injection, and others. If you're a WAF admin, you may want to write you own rules to augment the core rule set (CRS) rules. Your rules can either block or allow requested traffic based on matching criteria.
1915

2016
Custom rules allow you to create your own rules that are evaluated for each request that passes through the WAF. These rules hold a higher priority than the rest of the rules in the managed rule sets. The custom rules contain a rule name, rule priority, and an array of matching conditions. If these conditions are met, an action is taken (to allow or block).

articles/application-gateway/whats-new.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Azure Application Gateway is updated on an ongoing basis. To stay up-to-date wit
2222

2323
|Feature |Description |Date added |
2424
|---------|---------|---------|
25+
|WAF custom rules |Applicaiton Gateway WAF_v2 now supports creating custom rules. See [Application Gateway custom rules](custom-waf-rules-overview.md). |June 2019 |
2526
|Autoscaling, zone redundancy, static VIP support GA |General availability for v2 SKU which supports autoscaling, zone redundancy, enhance performance, static VIPs, Key Vault, Header rewrite. See [Application Gateway autoscaling documentation](application-gateway-autoscaling-zone-redundant.md). |April 2019 |
2627
|Key Vault integration |Application Gateway now supports integration with Key Vault (in public preview) for server certificates that are attached to HTTPS enabled listeners. See [SSL termination with Key Vault certificates](key-vault-certs.md). |April 2019 |
2728
|Header CRUD/Rewrites |You can now rewrite HTTP headers. See [Tutorial: Create an application gateway and rewrite HTTP headers](tutorial-http-header-rewrite-powershell.md) for more information.|December 2018|
@@ -33,4 +34,4 @@ Azure Application Gateway is updated on an ongoing basis. To stay up-to-date wit
3334

3435
## Next steps
3536

36-
For more information about Azure Application Gateway, see [What is Azure Application Gateway?](overview.md)
37+
For more information about Azure Application Gateway, see [What is Azure Application Gateway?](overview.md)

0 commit comments

Comments
 (0)