Skip to content

Commit 9a30cb9

Browse files
author
Dana Sindona
authored
Merge pull request #94608 from MicrosoftDocs/master
Build to live 11/4 early
2 parents 3f80176 + 3e5ce35 commit 9a30cb9

14 files changed

+34
-53
lines changed

articles/active-directory/develop/scenario-protected-web-api-app-configuration.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,12 @@ services.Configure<JwtBearerOptions>(AzureADDefaults.JwtBearerAuthenticationSche
121121
// Instead of using the default validation (validating against a single tenant,
122122
// as we do in line-of-business apps),
123123
// we inject our own multitenant validation logic (which even accepts both v1 and v2 tokens).
124-
options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.ValidateAadIssuer;
124+
options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.GetIssuerValidator(options.Authority).Validate;;
125125
});
126126
```
127127

128+
This code snippet is extracted from the ASP.NET Core Web Api incremental tutorial in [Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs#L50-L63](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/blob/154282843da2fc2958fad151e2a11e521e358d42/Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs#L50-L63). The `AddProtectedWebApi` method, which does a lot more, is called from the Startup.cs
129+
128130
## Token validation
129131

130132
The JwtBearer middleware, like the OpenID Connect middleware in web apps, is directed by `TokenValidationParameters` to validate the token. The token is decrypted (as needed), the claims are extracted, and the signature is verified. The middleware then validates the token by checking for this data:

articles/azure-maps/azure-maps-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Azure Maps generates a *unique identifier (client ID)* for each Azure Maps accou
4444
| Azure Government | https://login.microsoftonline.us |
4545

4646

47-
For more information about how to configure Azure AD and request tokens for Azure Maps, see [Manage authentication in Azure Maps](https://review.docs.microsoft.com/azure/azure-maps/how-to-manage-authentication).
47+
For more information about how to configure Azure AD and request tokens for Azure Maps, see [Manage authentication in Azure Maps](https://docs.microsoft.com/azure/azure-maps/how-to-manage-authentication).
4848

4949
For general information about requesting tokens from Azure AD, see [What is authentication?](https://docs.microsoft.com/azure/active-directory/develop/authentication-scenarios).
5050

@@ -87,6 +87,6 @@ For information about viewing your RBAC settings, see [How to configure RBAC for
8787

8888
## Next steps
8989

90-
* To learn more about authenticating an application with Azure AD and Azure Maps, see [Manage authentication in Azure Maps](https://review.docs.microsoft.com/azure/azure-maps/how-to-manage-authentication).
90+
* To learn more about authenticating an application with Azure AD and Azure Maps, see [Manage authentication in Azure Maps](https://docs.microsoft.com/azure/azure-maps/how-to-manage-authentication).
9191

92-
* To learn more about authenticating the Azure Maps Map Control and Azure AD, see [Use the Azure Maps Map Control](https://aka.ms/amaadmc).
92+
* To learn more about authenticating the Azure Maps Map Control and Azure AD, see [Use the Azure Maps Map Control](https://aka.ms/amaadmc).

articles/index.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5637,19 +5637,21 @@ featureFlags:
56375637
<div class="cardSize">
56385638
<div class="cardPadding">
56395639
<div class="card">
5640+
<div class="cardImageOuter">
56405641
<div class="cardImage">
56415642
<img src="media/index/peering-service.svg" alt="" />
56425643
</div>
5643-
</div>
5644-
<div class="cardText">
5644+
</div>
5645+
<div class="cardText">
56455646
<h3>Peering Service</h3>
56465647
<p>Get optimal internet connectivity to access the Microsoft network</p>
5648+
</div>
56475649
</div>
56485650
</div>
56495651
</div>
56505652
</a>
56515653
</li>
5652-
</ul>
5654+
</ul>
56535655
</li>
56545656
<li>
56555657
<a href="#security">Security</a>

articles/internet-analyzer/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- name: Create an Internet Analyzer test using Portal
1010
href: internet-analyzer-create-test-portal.md
1111
- name: Create an Internet Analyzer test using CLI
12-
herf: internet-analyzer-cli.md
12+
href: internet-analyzer-cli.md
1313
- name: How-to guides
1414
items:
1515
- name: Embed client

articles/openshift/howto-setup-environment.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: openshift
55
keywords: red hat openshift setup set up
66
author: jimzim
77
ms.author: jzim
8-
ms.date: 05/10/2019
8+
ms.date: 11/04/2019
99
ms.topic: conceptual
1010
ms.service: container-service
1111
manager: jeconnoc
@@ -16,7 +16,6 @@ manager: jeconnoc
1616

1717
To build and run Microsoft Azure Red Hat OpenShift applications, you'll need to:
1818

19-
* Purchase Azure virtual machine reserved instances.
2019
* Install version 2.0.65 (or higher) of the Azure CLI (or use the Azure Cloud Shell).
2120
* Register for the `AROGA` feature and associated resource providers.
2221
* Create an Azure Active Directory (Azure AD) tenant.
@@ -25,16 +24,6 @@ To build and run Microsoft Azure Red Hat OpenShift applications, you'll need to:
2524

2625
The following instructions will walk you through all of these prerequisites.
2726

28-
## Purchase Azure Red Hat OpenShift application nodes reserved instances
29-
30-
Before you can use Azure Red Hat OpenShift, you'll need to purchase a minimum of 4 Azure Red Hat OpenShift reserved application nodes, after which you'll be able to provision clusters.
31-
32-
If you are an Azure customer, [purchase Azure Red Hat OpenShift reserved instances](https://aka.ms/openshift/buy) through the Azure portal. After purchasing, your subscription will be activated within 24 hours.
33-
34-
If you are not an Azure customer, [contact sales](https://aka.ms/openshift/contact-sales) and fill out the sales form at the bottom of the page to start the process.
35-
36-
Refer to the [Azure Red Hat OpenShift pricing page](https://aka.ms/openshift/pricing) for more information.
37-
3827
## Install the Azure CLI
3928

4029
Azure Red Hat OpenShift requires version 2.0.65 or higher of the Azure CLI. If you've already installed the Azure CLI, you can check which version you have by running:

articles/openshift/openshift-faq.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,13 @@ ms.author: jzim
77
manager: jeconnoc
88
ms.service: container-service
99
ms.topic: article
10-
ms.date: 05/08/2019
10+
ms.date: 11/04/2019
1111
---
1212

1313
# Azure Red Hat OpenShift FAQ
1414

1515
This article addresses frequently asked questions (FAQs) about Microsoft Azure Red Hat OpenShift.
1616

17-
## How do I get started?
18-
19-
Before you can use Azure Red Hat OpenShift, you'll need to purchase a minimum of 4 Azure Red Hat OpenShift reserved application nodes.
20-
21-
If you are an Azure customer,[purchase Azure Red Hat OpenShift reserved instances](https://aka.ms/openshift/buy) through the Azure portal. After purchasing, your subscription will be activated within 24 hours, after which you'll be able to provision clusters.
22-
23-
If you are not an Azure customer, [contact sales](https://aka.ms/openshift/contact-sales) and fill out the sales form at the bottom of the page to start the process.
24-
25-
Refer to the [Azure Red Hat OpenShift pricing page](https://aka.ms/openshift/pricing) for more information.
26-
2717
## Which Azure regions are supported?
2818

2919
See [Supported resources](supported-resources.md#azure-regions) for a list of global regions where Azure Red Hat OpenShift is supported.

articles/openshift/tutorial-create-cluster.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: jzim
77
manager: jeconnoc
88
ms.topic: tutorial
99
ms.service: container-service
10-
ms.date: 05/14/2019
10+
ms.date: 11/04/2019
1111
#Customer intent: As a developer, I want learn how to create an Azure Red Hat OpenShift cluster, scale it, and then clean up resources so that I am not charged for what I'm not using.
1212
---
1313

@@ -30,8 +30,6 @@ In this tutorial series you learn how to:
3030

3131
> [!IMPORTANT]
3232
> This tutorial requires version 2.0.65 of the Azure CLI.
33-
>
34-
> Before you can use Azure Red Hat OpenShift, you'll need to purchase a minimum of 4 Azure Red Hat OpenShift reserved application nodes as described in [Set up your Azure Red Hat OpenShift development environment](howto-setup-environment.md#purchase-azure-red-hat-openshift-application-nodes-reserved-instances).
3533
3634
Before you begin this tutorial:
3735

articles/security-center/security-center-alerts-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: rkarlin
88
ms.assetid: 1b71e8ad-3bd8-4475-b735-79ca9963b823
99
ms.service: security-center
1010
ms.topic: conceptual
11-
ms.date: 10/16/2019
11+
ms.date: 11/04/2019
1212
ms.author: memildin
1313
---
1414
# Security alerts in Azure Security Center

articles/security-center/security-center-iaas-advanced-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To connect the SQL Server’s host to a workspace, follow the instructions in [C
5959

6060
## Set up email notification for ATP alerts
6161

62-
You can set a list of recipients to receive an email notification when ASC alerts are generated. The email contains a direct link to the alert in Azure Security Center with all the relevant details.
62+
You can set a list of recipients to receive an email notification when Security Center alerts are generated. The email contains a direct link to the alert in Azure Security Center with all the relevant details.
6363

6464
1. Go to **Security Center** > **Pricing & settings** and click on the relevant subscription
6565

articles/security-center/security-center-just-in-time.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ There are three ways to configure a JIT policy on a VM:
5757
- [Configure JIT access in an Azure VM blade](#jit-vm)
5858
- [Configure a JIT policy on a VM programmatically](#jit-program)
5959

60-
## Configure JIT in ASC
60+
## Configure JIT in Security Center
6161

62-
From ASC, you can configure a JIT policy and request access to a VM using a JIT policy
62+
From Security Center, you can configure a JIT policy and request access to a VM using a JIT policy
6363

6464

65-
### Configure JIT access on a VM in ASC <a name="jit-asc"></a>
65+
### Configure JIT access on a VM in Security Center <a name="jit-asc"></a>
6666

6767
1. Open the **Security Center** dashboard.
6868

@@ -110,9 +110,9 @@ From ASC, you can configure a JIT policy and request access to a VM using a JIT
110110
>When JIT VM Access is enabled for a VM, Azure Security Center creates "deny all inbound traffic" rules for the selected ports in the network security groups associated and Azure Firewall with it. If other rules had been created for the selected ports, then the existing rules take priority over the new “deny all inbound traffic” rules. If there are no existing rules on the selected ports, then the new “deny all inbound traffic” rules take top priority in the Network Security Groups and Azure Firewall.
111111
112112

113-
## Request JIT access via ASC
113+
## Request JIT access via Security Center
114114

115-
To request access to a VM via ASC:
115+
To request access to a VM via Security Center:
116116

117117
1. Under **Just-in-time VM access**, select the **Configured** tab.
118118

@@ -136,7 +136,7 @@ To request access to a VM via ASC:
136136
> [!NOTE]
137137
> If a user who is requesting access is behind a proxy, the option **My IP** may not work. You may need to define the full IP address range of the organization.
138138
139-
## Edit a JIT access policy via ASC
139+
## Edit a JIT access policy via Security Center
140140

141141
You can change a VM's existing just-in-time policy by adding and configuring a new port to protect for that VM, or by changing any other setting related to an already protected port.
142142

@@ -147,7 +147,7 @@ To edit an existing just-in-time policy of a VM:
147147
1. Under **JIT VM access configuration**, you can either edit the existing settings of an already protected port or add a new custom port.
148148
![jit vm access](./media/security-center-just-in-time/edit-policy.png)
149149

150-
## Audit JIT access activity in ASC
150+
## Audit JIT access activity in Security Center
151151

152152
You can gain insights into VM activities using log search. To view logs:
153153

@@ -164,11 +164,11 @@ Modify the filters and click **Apply** to create a search and log.
164164

165165

166166

167-
## Configure JIT access in an Azure VM blade <a name="jit-vm"></a>
167+
## Configure JIT access from an Azure VM's page <a name="jit-vm"></a>
168168

169-
For your convenience, you can connect to a VM using JIT directly from within the VM blade in Azure.
169+
For your convenience, you can connect to a VM using JIT directly from within the VM's page in Security Center.
170170

171-
### Configure JIT access on a VM via the Azure VM blade
171+
### Configure JIT access on a VM via the Azure VM page
172172

173173
To make it easy to roll out just-in-time access across your VMs, you can set a VM to allow only just-in-time access directly from within the VM.
174174

0 commit comments

Comments
 (0)