Skip to content

Commit a460fdc

Browse files
authored
Merge pull request #103626 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents db2d402 + 0a7fce6 commit a460fdc

20 files changed

+588
-120
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -433,14 +433,6 @@
433433
"master": [
434434
"Publish",
435435
"PDF"
436-
],
437-
"release-event-grid": [
438-
"Publish",
439-
"PDF"
440-
],
441-
"hd-insight-pdf": [
442-
"Publish",
443-
"PDF"
444436
]
445437
},
446438
"need_generate_pdf_url_template": true,

articles/active-directory/develop/msal-net-xamarin-android-considerations.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,19 @@ That line ensures that the control goes back to MSAL once the interactive portio
6868

6969
## Update the Android manifest
7070
The `AndroidManifest.xml` should contain the following values:
71-
```xml
72-
<activity android:name="microsoft.identity.client.BrowserTabActivity">
73-
<intent-filter>
74-
<action android:name="android.intent.action.VIEW" />
75-
<category android:name="android.intent.category.DEFAULT" />
76-
<category android:name="android.intent.category.BROWSABLE" />
77-
<data android:scheme="msauth"
78-
android:host="Enter_the_Package_Name"
79-
android:path="/Enter_the_Signature_Hash"/>
80-
</intent-filter>
81-
</activity>
71+
72+
<!--Intent filter to capture System Browser or Authenticator calling back to our app after sign-in-->
73+
<activity
74+
android:name="com.microsoft.identity.client.BrowserTabActivity">
75+
<intent-filter>
76+
<action android:name="android.intent.action.VIEW" />
77+
<category android:name="android.intent.category.DEFAULT" />
78+
<category android:name="android.intent.category.BROWSABLE" />
79+
<data android:scheme="msauth"
80+
android:host="Enter_the_Package_Name"
81+
android:path="/Enter_the_Signature_Hash" />
82+
</intent-filter>
83+
</activity>
8284
```
8385
Substitute the package name you registered in the Azure portal for the `android:host=` value. Substitute the key hash you registered in the Azure portal for the `android:path=` value. The Signature Hash should **not** be URL encoded. Ensure that there is a leading `/` at the beginning of your Signature Hash.
8486
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
---
2+
title: App visibility and control with Microsoft Cloud App Security
3+
description: Learn ways to identify app risk levels, stop breaches and leaks in real time, and use app connectors to take advantage of provider APIs for visibility and governance.
4+
services: active-directory
5+
author: msmimart
6+
manager: CelesteDG
7+
ms.service: active-directory
8+
ms.subservice: app-mgmt
9+
ms.topic: overview
10+
ms.workload: identity
11+
ms.date: 02/03/2020
12+
ms.author: mimart
13+
ms.collection: M365-identity-device-management
14+
---
15+
16+
# Cloud app visibility and control
17+
18+
To get the full benefit of cloud apps and services, an IT team must find the right balance of supporting access while maintaining control to protect critical data. Microsoft Cloud App Security provides rich visibility, control over data travel, and sophisticated analytics to identify and combat cyber threats across all your Microsoft and third-party cloud services.
19+
20+
## Discover and manage shadow IT in your network
21+
22+
When IT admins are asked how many cloud apps they think their employees use, on average they say 30 or 40, when in reality, the average is over 1,000 separate apps being used by employees in your organization. Shadow IT helps you know and identify which apps are being used and what your risk level is. Eighty percent of employees use unsanctioned apps that no one has reviewed and may not be compliant with your security and compliance policies. And because your employees are able to access your resources and apps from outside your corporate network, it's no longer enough to have rules and policies on your firewalls.
23+
24+
Use Microsoft Cloud App Discovery (an Azure Active Directory Premium P1 feature) to discover which apps are being used, explore the risk of these apps, configure policies to identify new risky apps, and unsanction these apps in order to block them natively using your proxy or firewall appliance.
25+
26+
- Discover and identify Shadow IT
27+
- Evaluate and analyze
28+
- Manage your apps
29+
- Advanced Shadow IT discovery reporting
30+
- Control sanctioned apps
31+
32+
### Learn more
33+
34+
- [Discover and manage shadow IT in your network ](https://docs.microsoft.com/cloud-app-security/tutorial-shadow-it)
35+
- [Discovered apps with Cloud App Security ](https://docs.microsoft.com/cloud-app-security/discovered-apps)
36+
37+
## User session visibility and control
38+
39+
In today’s workplace, it’s often not enough to know what’s happening in your cloud environment after the fact. You want to stop breaches and leaks in real time before employees intentionally or inadvertently put your data and your organization at risk. Together with Azure Active Directory (Azure AD), Microsoft Cloud App Security delivers these capabilities in a holistic and integrated experience with Conditional Access App Control.
40+
41+
Session control uses a reverse proxy architecture and is uniquely integrated with Azure AD Conditional Access. Azure AD Conditional Access allows you to enforce access controls on your organization’s apps based on certain conditions. The conditions define who (user or group of users) and what (which cloud apps) and where (which locations and networks) a Conditional Access policy is applied to. After you’ve determined the conditions, you can route users to Cloud App Security where you can protect data in real time.
42+
43+
With this control you can:
44+
- Control file downloads
45+
- Monitor B2B scenarios
46+
- Control access to files
47+
- Protect documents on download
48+
49+
### Learn more
50+
51+
- [Protect apps with Session Control in Cloud App Security ](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
52+
53+
## Advanced app visibility and controls
54+
55+
App connectors use the APIs of app providers to enable greater visibility and control by Microsoft Cloud App Security over the apps you connect to.
56+
Cloud App Security leverages the APIs provided by the cloud provider. Each service has its own framework and API limitations such as throttling, API limits, dynamic time-shifting API windows, and others. The Cloud App Security product team worked with these services to optimize the use of APIs and provide the best performance. Taking into account different limitations services impose on their APIs, the Cloud App Security engines use their maximum allowed capacity. Some operations, such as scanning all files in the tenant, require numerous API calls so they're spread over a longer period. Expect some policies to run for several hours or days.
57+
58+
### Learn more
59+
60+
- [Connect apps in Cloud App Security ](https://docs.microsoft.com/cloud-app-security/enable-instant-visibility-protection-and-governance-actions-for-your-apps)
61+
62+
## Next steps
63+
64+
- [Discover and manage shadow IT in your network ](https://docs.microsoft.com/cloud-app-security/tutorial-shadow-it)
65+
- [Discovered apps with Cloud App Security ](https://docs.microsoft.com/cloud-app-security/discovered-apps)
66+
- [Protect apps with Session Control in Cloud App Security ](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
67+
- [Connect apps in Cloud App Security ](https://docs.microsoft.com/cloud-app-security/enable-instant-visibility-protection-and-governance-actions-for-your-apps)

articles/active-directory/manage-apps/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
href: howto-saml-token-encryption.md
7373
- name: End-user portals
7474
href: end-user-experiences.md
75+
- name: Cloud app visibility and control
76+
href: cloud-app-security.md
7577
- name: Application Proxy for on-premises apps
7678
items:
7779
- name: Application Proxy

articles/aks/operator-best-practices-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ This best practices article focused on authentication and authorization for your
118118
119119
For more information about cluster operations in AKS, see the following best practices:
120120
121-
* [Multi-tenancy and cluster isolation][aks-best-practices-scheduler]
121+
* [Multi-tenancy and cluster isolation][aks-best-practices-cluster-isolation]
122122
* [Basic Kubernetes scheduler features][aks-best-practices-scheduler]
123123
* [Advanced Kubernetes scheduler features][aks-best-practices-advanced-scheduler]
124124

articles/azure-databricks/TOC.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,9 +1087,20 @@
10871087
- name: Enable Azure Data Lake Storage credential passthrough
10881088
href: /azure/databricks/administration-guide/access-control/credential-passthrough
10891089
maintainContext: true
1090-
- name: Manage workspace storage
1091-
href: /azure/databricks/administration-guide/workspace-storage/storage
1092-
maintainContext: true
1090+
- name: Manage workspace objects and behavior
1091+
items:
1092+
- name: Manage workspaces overview
1093+
href: /azure/databricks/administration-guide/workspace/index
1094+
maintainContext: true
1095+
- name: Manage workspace storage
1096+
href: /azure/databricks/administration-guide/workspace/storage
1097+
maintainContext: true
1098+
- name: Manage workspace security headers
1099+
href: /azure/databricks/administration-guide/workspace/security
1100+
maintainContext: true
1101+
- name: Manage access to notebook features
1102+
href: /azure/databricks/administration-guide/workspace/notebooks
1103+
maintainContext: true
10931104
- name: Enable cluster configurations
10941105
items:
10951106
- name: Cluster configuration overview
@@ -1609,6 +1620,9 @@
16091620
- name: Platform release notes
16101621
href: /azure/databricks/release-notes/product/index
16111622
maintainContext: true
1623+
- name: February 2020
1624+
href: /azure/databricks/release-notes/product/2020/february
1625+
maintainContext: true
16121626
- name: January 2020
16131627
href: /azure/databricks/release-notes/product/2020/january
16141628
maintainContext: true
@@ -1756,10 +1770,7 @@
17561770
maintainContext: true
17571771
- name: Databricks Runtime 5.2 ML
17581772
href: /azure/databricks/release-notes/runtime/5.2ml
1759-
maintainContext: true
1760-
- name: Databricks Runtime 3.5
1761-
href: /azure/databricks/release-notes/runtime/3.5
1762-
maintainContext: true
1773+
maintainContext: true
17631774
- name: Unsupported
17641775
items:
17651776
- name: Unsupported runtime releases
@@ -1792,6 +1803,9 @@
17921803
- name: Databricks Runtime 4.0
17931804
href: /azure/databricks/release-notes/runtime/4.0
17941805
maintainContext: true
1806+
- name: Databricks Runtime 3.5 LTS
1807+
href: /azure/databricks/release-notes/runtime/3.5
1808+
maintainContext: true
17951809
- name: Databricks Runtime 3.4
17961810
href: /azure/databricks/release-notes/runtime/3.4
17971811
maintainContext: true
@@ -1804,6 +1818,9 @@
18041818
- name: Release types
18051819
href: /azure/databricks/release-notes/release-types
18061820
maintainContext: true
1821+
- name: Azure Databricks status page
1822+
href: /azure/databricks/status
1823+
maintainContext: true
18071824
- name: R developer's guide
18081825
href: /azure/machine-learning/r-developers-guide
18091826
- name: Azure Roadmap

articles/azure-monitor/platform/agents-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Scenarios supported by the Azure Diagnostics extension include the following:
5959
## Log Analytics agent
6060
The [Log Analytics agent](log-analytics-agent.md) collects monitoring data from the guest operating system and workloads of virtual machines in Azure, other cloud providers, and on-premises. It collects data into a Log Analytics workspace.
6161

62-
The Log Analytics agent is the same agent used by System Center Operations Manager, and you multihome agent computers to communicate with your management group and Azure Monitor simultaneously. This agent is also required by certain solutions in Azure Monitor.
62+
The Log Analytics agent is the same agent used by System Center Operations Manager, and multihome agent computers to communicate with your management group and Azure Monitor simultaneously. This agent is also required by certain solutions in Azure Monitor.
6363

6464
The Log Analytics agent for Windows is often referred to as Microsoft Management Agent (MMA). The Log Analytics agent for Linux is often referred to as OMS agent.
6565

articles/data-factory/data-flow-tutorials.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: djpmsft
55
ms.author: daperlov
66
ms.service: data-factory
77
ms.topic: tutorial
8-
ms.date: 01/14/2020
8+
ms.date: 02/06/2020
99
---
1010

1111
# Mapping data flow video tutorials
@@ -127,3 +127,7 @@ As updates are constantly made to the product, some features have added or diffe
127127
[Logical Models vs. Physical Models](http://youtu.be/K5tgzLjEE9Q)
128128

129129
[Detect source data changes](http://youtu.be/CaxIlI7oXfI?hd=1)
130+
131+
## Data flow expressions
132+
133+
[Date/Time expressions](https://www.youtube.com/watch?v=uboyCZ25r_E&feature=youtu.be&hd=1)

articles/industry/agriculture/install-azure-farmbeats.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ The entire setup of Azure FarmBeats, including the preparation and installation
6868

6969
## Prerequisites
7070

71-
Before you start the actual installation of Azure FarmBeats, you'll need to complete the following steps:
71+
You'll need to complete the following steps before you start the actual installation of Azure FarmBeats:
7272

7373
### Verify Permissions
7474

75-
You'll need the following permissions in the Azure tenant you're looking to install Azure FarmBeats -
75+
You'll need the following permissions in the Azure tenant to install Azure FarmBeats:
7676

7777
- Tenant - AAD app creator
7878
- Subscription - Owner
7979
- Resource Group in which FarmBeats is being installed - Owner
8080

8181
The first two permissions are needed for [creating the AAD application](#create-an-aad-application) step. If needed, you can get someone with the appropriate permissions to create the AAD application. The person installing FarmBeats needs to be an owner of the Resource Group in which FarmBeats is being installed.
8282

83-
You can verify your access permissions in the Azure portal by following the instructions on [role based access control](https://docs.microsoft.com/azure/role-based-access-control/check-access)
83+
You can verify your access permissions in the Azure portal by following the instructions on [role based access control](https://docs.microsoft.com/azure/role-based-access-control/check-access).
8484

8585
### Decide Subscription and Region
8686

@@ -115,23 +115,23 @@ Run the following steps in a Cloud Shell instance using the PowerShell environme
115115
./create_aad_script.ps1
116116
```
117117
118-
4. The AAD script takes around 2 minutes to run and outputs values to screen as well as to a json file in the same directory. If you had someone else run the script, ask them to share this output with you.
118+
4. The AAD script takes around 2 minutes to run and outputs values on screen as well as to a json file in the same directory. If you had someone else run the script, ask them to share this output with you.
119119
120120
### Create Sentinel account
121121
122-
Your Azure FarmBeats setup enables you to get satellite imagery from European Space Agency's [Sentinel-2](https://scihub.copernicus.eu/) satellite mission for your farm. To configure this setup, you require a Sentinel Account.
122+
Your Azure FarmBeats setup enables you to get satellite imagery from European Space Agency's [Sentinel-2](https://scihub.copernicus.eu/) satellite mission for your farm. To configure this setup, you require a Sentinel account.
123123
124124
Follow the steps to create a free account with Sentinel:
125125
126126
1. Go to the official [sign-up](https://aka.ms/SentinelRegistration) page.
127127
2. Provide the required details (first name, last name, username, password, and email ID) and complete the form.
128-
3. A verification link will be sent to the registered email ID. Select the link provided in the email and complete the verification.
128+
3. A verification link is sent to the registered email ID. Select the link provided in the email and complete the verification.
129129
130-
Your registration process is complete once you complete the verification. Make a note of your **Sentinel Username** and **Sentinel Password**.
130+
Your registration process is complete. Make a note of your **Sentinel Username** and **Sentinel Password**, once the verification is also completed.
131131
132132
## Install
133133
134-
You are now ready to install FarmBeats. Follow the steps below to start the installation -
134+
You are now ready to install FarmBeats. Follow the steps below to start the installation:
135135
136136
1. Sign in to the Azure portal. Select your account in the top-right corner and switch to the Azure AD tenant where you want to install Azure FarmBeats.
137137
@@ -141,23 +141,26 @@ You are now ready to install FarmBeats. Follow the steps below to start the inst
141141
142142
4. A new window appears. Complete the sign-up process by choosing the correct subscription, resource group, and location to which you want to install Azure FarmBeats.
143143
144-
5. Provide the email address that should receive any service alerts related to Azure FarmBeats in the **FarmBeats Service Alerts** section. Click Next at the bottom of the page to move to the **Dependencies** Tab.
145-
![Basics Tab](./media/install-azure-farmbeats/create-azure-farmbeats-basics.png)
144+
5. Provide the email address that should receive any service alerts related to Azure FarmBeats in the **FarmBeats Service Alerts** section. Select **Next** at the bottom of the page to move to the **Dependencies** Tab.
145+
146+
![Basics Tab](./media/install-azure-farmbeats/create-azure-farmbeats-basics.png)
146147
147148
6. Copy the individual entries from the output of [AAD script](#create-an-aad-application) to the inputs in the AAD application section.
148149
149-
7. Enter the [Sentinel account](#create-sentinel-account) user name and password in the Sentinel Account section. Click Next to move to the **Review + Create** Tab
150-
![Dependencies Tab](./media/install-azure-farmbeats/create-azure-farmbeats-dependencies.png)
150+
7. Enter the [Sentinel account](#create-sentinel-account) user name and password in the Sentinel Account section. Select **Next** to move to the **Review + Create** tab.
151+
152+
![Dependencies Tab](./media/install-azure-farmbeats/create-azure-farmbeats-dependencies.png)
151153
152-
8. Once the entered details are validated, SELECT **OK**. The Terms of use page appears. Review the terms and select **Create** to start the installation. You will automatically be redirected to a page where you can follow the progress of the installation.
154+
8. Once the entered details are validated, select **OK**. The Terms of use page appears. Review the terms and select **Create** to start the installation. You will be redirected to the page where you can follow the installation progress.
153155
154156
Once the installation is complete, you can verify the installation and start using FarmBeats portal by navigating to the website name you provided during installation: https://\<FarmBeats-website-name>.azurewebsites.net. You should see FarmBeats user interface with an option to create Farms.
155157
156158
**Datahub** can be found at https://\<FarmBeats-website-name>-api.azurewebsites.net/swagger. Here you will see the different FarmBeats API objects and perform REST operations on the APIs.
157159
158160
## Upgrade
159161
160-
To upgrade FarmBeats to the latest version, run the following steps in a Cloud Shell instance using the PowerShell environment. The user will need to be the owner of the Subscription in which FarmBeats is installed.
162+
To upgrade FarmBeats to the latest version, run the following steps in a Cloud Shell instance using the PowerShell environment. The user will need to be the owner of the subscription in which FarmBeats is installed.
163+
161164
First-time users will be prompted to select a subscription and create a storage account. Complete the setup as instructed.
162165
163166
1. Download the [upgrade script](https://aka.ms/FarmBeatsUpgradeScript)
@@ -178,7 +181,7 @@ First-time users will be prompted to select a subscription and create a storage
178181
./upgrade-farmbeats.ps1 -InputFilePath [Path to input.json file]
179182
```
180183
181-
The path to input.json file is optional. If not specified, the script will ask you for all required inputs. The upgrade should finish in around 30 minutes.
184+
The path to input.json file is optional. If not specified, the script will ask for all the required inputs. The upgrade should finish in around 30 minutes.
182185
183186
## Uninstall
184187

0 commit comments

Comments
 (0)