Skip to content

Commit 5bc74c0

Browse files
authored
Merge pull request MicrosoftDocs#77068 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 faa1e7b + 0f05008 commit 5bc74c0

File tree

6 files changed

+48
-20
lines changed

6 files changed

+48
-20
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,9 @@ Group resources are identified by the schema identifier, `urn:ietf:params:scim:s
13441344
| objectId |ID |
13451345
| proxyAddresses |emails[type eq "other"].Value |
13461346

1347+
## Allow IP addresses used by the Azure AD provisioning service to make SCIM requests
1348+
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 for Azure AD provisioning can be found under "AzureActiveDirectoryDomainServices."
1349+
13471350

13481351
## Related articles
13491352
* [Automate User Provisioning/Deprovisioning to SaaS Apps](user-provisioning.md)

articles/active-directory/reports-monitoring/concept-sign-ins.md

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,29 @@ Possible values are:
127127

128128
When you select a custom timeframe, you can configure a start time and an end time.
129129

130-
If you add additional fields to your sign-ins view, these fields are automatically added to the list of filters. For example, by adding **Client App** field to your list, you also get another filter option that enables you to set the following filters:
131-
132-
- Browser
133-
- Exchange ActiveSync (supported)
134-
- Exchange ActiveSync (unsupported)
135-
- Other clients
136-
- IMAP
137-
- MAPI
138-
- Older Office clients
139-
- POP
140-
- SMTP
141-
142-
130+
If you add additional fields to your sign-ins view, these fields are automatically added to the list of filters. For example, by adding **Client App** field to your list, you also get another filter option that enables you to set the following filters:
143131
![Sign-in activity](./media/concept-sign-ins/12.png "Sign-in activity")
144132

133+
- **Browser**
134+
This filter shows all events where sign-in attempts were performed using browser flows.
135+
- **Exchange ActiveSync (supported)**
136+
This filter shows all sign-in attempts where the Exchange ActiveSync (EAS) protocol has been attempted from supported platforms like iOS, Android and Windows Phone.
137+
- **Exchange ActiveSync (unSupported)**
138+
This filter shows all sign-in attempts where the EAS protocol has been attempted from unsupported platforms like, Linux distros.
139+
- **Mobile Apps and Desktop clients**
140+
This filter shows all sign-in attempts that were not using browser flows. This can be mobile apps from any platform using any protocol or from Desktop client apps like Office on Windows or MacOS.
141+
142+
- **Other clients**
143+
- **IMAP**
144+
A legacy mail client using IMAP to retrieve email.
145+
- **MAPI**
146+
Office 2013, where ADAL is enabled and it is using MAPI.
147+
- **Older Office clients**
148+
Office 2013 in its default configuration where ADAL is not enabled and it is using MAPI, or Office 2016 where ADAL has been disabled.
149+
- **POP**
150+
A legacy mail client using POP3 to retrieve email.
151+
- **SMTP**
152+
A legacy mail client using SMTP to send email.
145153

146154
## Download sign-in activities
147155

articles/openshift/howto-setup-environment.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ To build and run Microsoft Azure Red Hat OpenShift applications, you'll need to:
2525

2626
The following instructions will walk you through all of these prerequisites.
2727

28-
## Purchase Azure virtual machine reserved instances
28+
## Purchase Azure Red Hat OpenShift application nodes reserved instances
2929

30-
Before you can use Azure Red Hat OpenShift, you'll need to purchase Azure virtual machine reserved instances.
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.
3131

32-
If you are an Azure customer, here's how to [purchase Azure virtual machine reserved instances](https://aka.ms/openshift/buy). A reservation reduces your spend by pre-paying for fully managed Azure services. Refer to [*What are Azure Reservations*](https://docs.microsoft.com/azure/billing/billing-save-compute-costs-reservations) to learn more about reservations and how they save you money.
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.
3333

3434
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.
3535

36+
Refer to the [Azure Red Hat OpenShift pricing page](https://aka.ms/openshift/pricing) for more information.
37+
3638
## Install the Azure CLI
3739

3840
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:
@@ -109,4 +111,4 @@ Try the tutorial:
109111
> [!div class="nextstepaction"]
110112
> [Create an Azure Red Hat OpenShift cluster](tutorial-create-cluster.md)
111113
112-
[azure-cli-install]: https://docs.microsoft.com/cli/azure/install-azure-cli
114+
[azure-cli-install]: https://docs.microsoft.com/cli/azure/install-azure-cli

articles/openshift/openshift-faq.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ ms.date: 05/08/2019
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+
1727
## Which Azure regions are supported?
1828

1929
See [Supported resources](supported-resources.md#azure-regions) for a list of global regions where Azure Red Hat OpenShift is supported.
@@ -66,4 +76,4 @@ No. All resources, including the cluster master, run in your customer subscripti
6676

6777
## Is Open Service Broker for Azure (OSBA) supported?
6878

69-
Yes. You can use OSBA with Azure Red Hat OpenShift. See [Open Service Broker for Azure](https://github.com/Azure/open-service-broker-azure#openshift-project-template) for more information.
79+
Yes. You can use OSBA with Azure Red Hat OpenShift. See [Open Service Broker for Azure](https://github.com/Azure/open-service-broker-azure#openshift-project-template) for more information.

articles/openshift/tutorial-create-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ In this tutorial series you learn how to:
3131
> [!IMPORTANT]
3232
> This tutorial requires version 2.0.65 of the Azure CLI.
3333
>
34-
> Before you can use Azure Red Hat Openshift, you need to purchase Azure virtual machine reserved instances as described in [Set up your Azure Red Hat Openshift development environment](howto-setup-environment.md#purchase-azure-virtual-machine-reserved-instances).
34+
> Before you can use Azure Red Hat Openshift, you need to purchase Azure virtual machine reserved instances 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).
3535
3636
Before you begin this tutorial:
3737

@@ -206,4 +206,4 @@ In this part of the tutorial, you learned how to:
206206
207207
Advance to the next tutorial:
208208
> [!div class="nextstepaction"]
209-
> [Scale an Azure Red Hat OpenShift cluster](tutorial-scale-cluster.md)
209+
> [Scale an Azure Red Hat OpenShift cluster](tutorial-scale-cluster.md)

articles/virtual-network/create-vm-accelerated-networking-cli.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@ vf_tx_dropped: 0
221221
```
222222
Accelerated Networking is now enabled for your VM.
223223

224+
## Handle dynamic binding and revocation of virtual function
225+
Applications must run over the synthetic NIC that is exposed in VM. If the application runs directly over the VF NIC, it doesn't receive **all** packets that are destined to the VM, since some packets show up over the synthetic interface.
226+
If you run an application over the synthetic NIC, it guarantees that the application receives **all** packets that are destined to it. It also makes sure that the application keeps running, even if the VF is revoked when the host is being serviced.
227+
Applications binding to the synthetic NIC is a **mandatory** requirement for all applications taking advantage of **Accelerated Networking**.
228+
224229
## Enable Accelerated Networking on existing VMs
225230
If you have created a VM without Accelerated Networking, it is possible to enable this feature on an existing VM. The VM must support Accelerated Networking by meeting the following prerequisites that are also outlined above:
226231

0 commit comments

Comments
 (0)