Skip to content

Commit dbfe61b

Browse files
huypubhuypub
authored
Merge pull request #41816 from MicrosoftDocs/master
5/21 PM Publish
2 parents d1f5652 + 1544c3c commit dbfe61b

File tree

328 files changed

+2416
-1359
lines changed

Some content is hidden

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

328 files changed

+2416
-1359
lines changed

‎.openpublishing.redirection.json

Lines changed: 77 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,16 @@
985985
"redirect_url": "/azure/azure-resource-manager/resource-manager-common-deployment-errors",
986986
"redirect_document_id": false
987987
},
988+
{
989+
"source_path": "articles/azure-resource-manager/resource-manager-subscription-examples.md",
990+
"redirect_url": "/azure/architecture/cloud-adoption-guide/subscription-governance-examples",
991+
"redirect_document_id": true
992+
},
993+
{
994+
"source_path": "articles/azure-resource-manager/resource-manager-subscription-governance.md",
995+
"redirect_url": "/azure/architecture/cloud-adoption-guide/subscription-governance",
996+
"redirect_document_id": true
997+
},
988998
{
989999
"source_path": "articles/azure-toolkit-for-eclipse-debugging-azure-applications.md",
9901000
"redirect_url": "/azure/azure-toolkit-for-eclipse",
@@ -5725,6 +5735,11 @@
57255735
"redirect_url": "/azure/cosmos-db/sql-api-get-started",
57265736
"redirect_document_id": true
57275737
},
5738+
{
5739+
"source_path": "articles/cosmos-db/tutorial-develop-sql-api-dotnet.md",
5740+
"redirect_url": "/azure/cosmos-db/sql-api-get-started",
5741+
"redirect_document_id": false
5742+
},
57285743
{
57295744
"source_path": "articles/cosmos-db/documentdb-index.md",
57305745
"redirect_url": "/azure/cosmos-db/sql-api-index",
@@ -9082,7 +9097,7 @@
90829097
},
90839098
{
90849099
"source_path": "articles/iot-suite/iot-suite-connecting-devices-mbed.md",
9085-
"redirect_url": "/azure/iot-suite",
9100+
"redirect_url": "/azure/iot-accelerators",
90869101
"redirect_document_id": false
90879102
},
90889103
{
@@ -9207,77 +9222,77 @@
92079222
},
92089223
{
92099224
"source_path": "articles/iot-suite/iot-suite-overview.md",
9210-
"redirect_url": "/azure/iot-suite/iot-suite-options",
9225+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-options",
92119226
"redirect_document_id": false
92129227
},
92139228
{
92149229
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-get-started.md",
9215-
"redirect_url": "/azure/iot-suite",
9230+
"redirect_url": "/azure/iot-accelerators",
92169231
"redirect_document_id": false
92179232
},
92189233
{
92199234
"source_path": "articles/iot-suite/iot-suite-logic-apps-tutorial.md",
9220-
"redirect_url": "/azure/iot-suite",
9235+
"redirect_url": "/azure/iot-accelerators",
92219236
"redirect_document_id": false
92229237
},
92239238
{
92249239
"source_path": "articles/iot-suite/iot-suite-guidance-on-customizing-preconfigured-solutions.md",
9225-
"redirect_url": "/azure/iot-suite",
9240+
"redirect_url": "/azure/iot-accelerators",
92269241
"redirect_document_id": false
92279242
},
92289243
{
92299244
"source_path": "articles/iot-suite/iot-suite-dynamic-telemetry.md",
9230-
"redirect_url": "/azure/iot-suite",
9245+
"redirect_url": "/azure/iot-accelerators",
92319246
"redirect_document_id": false
92329247
},
92339248
{
92349249
"source_path": "articles/iot-suite/iot-suite-custom-rule.md",
9235-
"redirect_url": "/azure/iot-suite",
9250+
"redirect_url": "/azure/iot-accelerators",
92369251
"redirect_document_id": false
92379252
},
92389253
{
92399254
"source_path": "articles/iot-suite/iot-suite-remote-monitoring-device-info.md",
9240-
"redirect_url": "/azure/iot-suite",
9255+
"redirect_url": "/azure/iot-accelerators",
92419256
"redirect_document_id": false
92429257
},
92439258
{
92449259
"source_path": "articles/iot-suite/iot-suite-getstarted-preconfigured-solutions.md",
9245-
"redirect_url": "/azure/iot-suite",
9260+
"redirect_url": "/azure/iot-accelerators",
92469261
"redirect_document_id": false
92479262
},
92489263
{
92499264
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-c-get-started-simulator.md",
9250-
"redirect_url": "/azure/iot-suite",
9265+
"redirect_url": "/azure/iot-accelerators",
92519266
"redirect_document_id": false
92529267
},
92539268
{
92549269
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-c-get-started-basic.md",
9255-
"redirect_url": "/azure/iot-suite",
9270+
"redirect_url": "/azure/iot-accelerators",
92569271
"redirect_document_id": false
92579272
},
92589273
{
92599274
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-c-get-started-advanced.md",
9260-
"redirect_url": "/azure/iot-suite",
9275+
"redirect_url": "/azure/iot-accelerators",
92619276
"redirect_document_id": false
92629277
},
92639278
{
92649279
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-node-get-started-simulator.md",
9265-
"redirect_url": "/azure/iot-suite",
9280+
"redirect_url": "/azure/iot-accelerators",
92669281
"redirect_document_id": false
92679282
},
92689283
{
92699284
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-node-get-started-basic.md",
9270-
"redirect_url": "/azure/iot-suite",
9285+
"redirect_url": "/azure/iot-accelerators",
92719286
"redirect_document_id": false
92729287
},
92739288
{
92749289
"source_path": "articles/iot-suite/iot-suite-raspberry-pi-kit-node-get-started-advanced.md",
9275-
"redirect_url": "/azure/iot-suite",
9290+
"redirect_url": "/azure/iot-accelerators",
92769291
"redirect_document_id": false
92779292
},
92789293
{
92799294
"source_path": "articles/iot-suite/iot-suite-gateway-kit-get-started-simulator.md",
9280-
"redirect_url": "/azure/iot-suite",
9295+
"redirect_url": "/azure/iot-accelerators",
92819296
"redirect_document_id": false
92829297
},
92839298
{
@@ -18062,7 +18077,7 @@
1806218077
},
1806318078
{
1806418079
"source_path": "articles/iot-suite/iot-suite-what-are-preconfigured-solutions.md",
18065-
"redirect_url": "azure/iot-suite/iot-suite-what-are-solution-accelerators",
18080+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-what-are-solution-accelerators",
1806618081
"redirect_document_id": false
1806718082
},
1806818083
{
@@ -21454,6 +21469,51 @@
2145421469
"source_path": "articles/iot-suite/iot-suite-microservices-example.md",
2145521470
"redirect_url": "/azure/iot-accelerators/iot-accelerators-microservices-example",
2145621471
"redirect_document_id": false
21472+
},
21473+
{
21474+
"source_path": "articles/iot-suite/iot-security-architecture.md",
21475+
"redirect_url": "/azure/iot-accelerators/iot-security-architecture",
21476+
"redirect_document_id": false
21477+
},
21478+
{
21479+
"source_path": "articles/iot-suite/iot-security-best-practices.md",
21480+
"redirect_url": "/azure/iot-accelerators/iot-security-best-practices",
21481+
"redirect_document_id": false
21482+
},
21483+
{
21484+
"source_path": "articles/iot-suite/iot-suite-options.md",
21485+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-options",
21486+
"redirect_document_id": false
21487+
},
21488+
{
21489+
"source_path": "articles/iot-suite/iot-suite-permissions.md",
21490+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-permissions",
21491+
"redirect_document_id": false
21492+
},
21493+
{
21494+
"source_path": "articles/iot-suite/iot-suite-predictive-overview.md",
21495+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-predictive-overview",
21496+
"redirect_document_id": false
21497+
},
21498+
{
21499+
"source_path": "articles/iot-suite/iot-suite-predictive-walkthrough.md",
21500+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-predictive-walkthrough",
21501+
"redirect_document_id": false
21502+
},
21503+
{
21504+
"source_path": "articles/iot-suite/iot-suite-security-deployment.md",
21505+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-security-deployment",
21506+
"redirect_document_id": false
21507+
},
21508+
{
21509+
"source_path": "articles/iot-suite/iot-suite-time-series-insights.md",
21510+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-time-series-insights",
21511+
"redirect_document_id": false
21512+
},
21513+
{
21514+
"source_path": "articles/iot-suite/securing-iot-ground-up.md",
21515+
"redirect_url": "/azure/iot-accelerators/securing-iot-ground-up",
21516+
"redirect_document_id": false
2145721517
},
2145821518
{
2145921519
"source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-angular-dotnet.md",

‎articles/active-directory/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
##### [SharePoint](manage-apps/application-proxy-integrate-with-sharepoint-server.md)
210210
##### [Microsoft Teams](application-proxy-teams.md)
211211
##### [Tableau](active-directory-application-proxy-tableau.md)
212+
##### [Qlik](active-directory-application-proxy-qlik.md)
212213

213214
#### [Troubleshoot](active-directory-application-proxy-troubleshoot.md)
214215

‎articles/active-directory/active-directory-application-proxy-content-map.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 01/31/2018
15+
ms.date: 05/21/2018
1616
ms.author: barbkess
1717
ms.reviewer: harshja
1818
---

‎articles/active-directory/active-directory-application-proxy-gdpr.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ title: GDPR in the Azure Active Directory application proxy | Microsoft Docs
33
description: Learn more about GDPR in the Azure Active Directory application proxy.
44
services: active-directory
55
documentationcenter: ''
6-
author: MarkusVi
6+
author: barbkess
77
manager: mtillman
88

9-
ms.assetid: c7186f98-dd80-4910-92a4-a7b8ff6272b9
109
ms.service: active-directory
10+
ms.component: app-mgmt
1111
ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 02/16/2018
16-
ms.author: markvi
15+
ms.date: 05/21/2018
16+
ms.author: barbkess
1717
ms.reviewer: harshja
1818
ms.custom: it-pro
1919

‎articles/active-directory/active-directory-application-proxy-qlik.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ title: Azure AD App Proxy and Qlik Sense| Microsoft Docs
33
description: Turn on Application Proxy in the Azure portal, and install the Connectors for the reverse proxy.
44
services: active-directory
55
documentationcenter: ''
6-
author: MarkusVi
6+
author: barbkess
77
manager: mtillman
88
ms.service: active-directory
9+
ms.component: app-mgmt
910
ms.workload: identity
1011
ms.topic: article
11-
ms.date: 04/03/2018
12-
ms.author: markvi
12+
ms.date: 05/21/2018
13+
ms.author: barbkess
1314
ms.reviewer: harshja
1415
ms.custom: it-pro
1516

‎articles/active-directory/active-directory-application-proxy-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 02/14/2018
15+
ms.date: 05/21/2018
1616
ms.author: barbkess
1717
ms.reviewer: harshja
1818
ms.custom: H1Hack27Feb2017; it-pro

‎articles/active-directory/active-directory-application-proxy-wildcard.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ title: Wildcard applications in the Azure Active Directory application proxy | M
33
description: Learn how to use Wildcard applications in the Azure Active Directory application proxy.
44
services: active-directory
55
documentationcenter: ''
6-
author: MarkusVi
6+
author: barbkess
77
manager: mtillman
88

9-
ms.assetid: d5450da1-9e06-4d08-8146-011c84922ab5
109
ms.service: active-directory
10+
ms.component: app-mgmt
1111
ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 02/06/2018
16-
ms.author: markvi
15+
ms.date: 05/21/2018
16+
ms.author: barbkess
1717
ms.reviewer: harshja
1818
ms.custom: it-pro
1919

‎articles/active-directory/active-directory-privileged-identity-management-getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: pim
1717
---
1818
# Start using Azure AD Privileged Identity Management
1919

20-
With Azure Active Directory (AD) Privileged Identity Management, you can manage, control, and monitor access within your organization. This scope includes access to resources Azure resources, Azure AD and other Microsoft online services like Office 365 or Microsoft Intune.
20+
With Azure Active Directory (AD) Privileged Identity Management, you can manage, control, and monitor access within your organization. This scope includes access to Azure resources, Azure AD and other Microsoft online services like Office 365 or Microsoft Intune.
2121

2222
This article tells you how to add the Azure AD PIM app to your Azure portal dashboard.
2323

‎articles/active-directory/active-directory-reporting-api-audit-samples.md

Lines changed: 5 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 10/31/2017
16+
ms.date: 05/21/2018
1717
ms.author: dhanyahk;markvi
1818
ms.reviewer: dhanyahk
1919

2020
---
2121
# Azure Active Directory reporting audit API samples
22-
This topic is part of a collection of topics about the Azure Active Directory reporting API.
22+
This article is part of a collection of articles about the Azure Active Directory reporting API.
2323
Azure AD reporting provides you with an API that enables you to access audit data using code or related tools.
24-
The scope of this topic is to provide you with sample code for the **audit API**.
24+
The scope of this article is to provide you with sample code for the **audit API**.
2525

2626
See:
2727

@@ -32,7 +32,7 @@ For questions, issues or feedback, please contact [AAD Reporting Help](mailto:aa
3232

3333

3434
## Prerequisites
35-
Before you can use the samples in this topic, you need to complete the [prerequisites to access the Azure AD reporting API](active-directory-reporting-api-prerequisites.md).
35+
Before you can use the samples in this article, you need to complete the [prerequisites to access the Azure AD reporting API](active-directory-reporting-api-prerequisites.md).
3636

3737
## Known issue
3838
App Auth will not work if your tenant is in the EU region. Please use User Auth for accessing the Audit API as a workaround until we fix the issue.
@@ -87,81 +87,12 @@ Once you finish editing the script, run it and verify that the expected data fro
8787

8888
The script returns output from the audit report in JSON format. It also creates an `audit.json` file with the same output. You can experiment by modifying the script to return data from other reports, and comment out the output formats that you do not need.
8989

90-
## Bash script
91-
#!/bin/bash
92-
93-
# Author: Ken Hoff ([email protected])
94-
# Date: 2015.08.20
95-
# NOTE: This script requires jq (https://stedolan.github.io/jq/)
96-
97-
CLIENT_ID="your-application-client-id-here" # Should be a ~35 character string insert your info here
98-
CLIENT_SECRET="your-application-client-secret-here" # Should be a ~44 character string insert your info here
99-
LOGIN_URL="https://login.microsoftonline.com"
100-
TENANT_DOMAIN="your-directory-name-here.onmicrosoft.com" # For example, contoso.onmicrosoft.com
101-
102-
TOKEN_INFO=$(curl -s --data-urlencode "grant_type=client_credentials" --data-urlencode "client_id=$CLIENT_ID" --data-urlencode "client_secret=$CLIENT_SECRET" "$LOGIN_URL/$TENANT_DOMAIN/oauth2/token?api-version=1.0")
103-
104-
TOKEN_TYPE=$(echo $TOKEN_INFO | ./jq-win64.exe -r '.token_type')
105-
ACCESS_TOKEN=$(echo $TOKEN_INFO | ./jq-win64.exe -r '.access_token')
106-
107-
# get yesterday's date
108-
109-
YESTERDAY=$(date --date='1 day ago' +'%Y-%m-%d')
110-
111-
URL="https://graph.windows.net/$TENANT_DOMAIN/activities/audit?api-version=beta&$filter=activityDate%20gt%20$YESTERDAY"
112-
113-
114-
REPORT=$(curl -s --header "Authorization: $TOKEN_TYPE $ACCESS_TOKEN" $URL)
115-
116-
echo $REPORT | ./jq-win64.exe -r '.value' | ./jq-win64.exe -r ".[]"
117-
118-
## Python script
119-
# Author: Michael McLaughlin ([email protected])
120-
# Date: January 20, 2016
121-
# This requires the Python Requests module: http://docs.python-requests.org
122-
123-
import requests
124-
import datetime
125-
import sys
126-
127-
client_id = 'your-application-client-id-here'
128-
client_secret = 'your-application-client-secret-here'
129-
login_url = 'https://login.microsoftonline.com/'
130-
tenant_domain = 'your-directory-name-here.onmicrosoft.com'
131-
132-
# Get an OAuth access token
133-
bodyvals = {'client_id': client_id,
134-
'client_secret': client_secret,
135-
'grant_type': 'client_credentials'}
136-
137-
request_url = login_url + tenant_domain + '/oauth2/token?api-version=1.0'
138-
token_response = requests.post(request_url, data=bodyvals)
139-
140-
access_token = token_response.json().get('access_token')
141-
token_type = token_response.json().get('token_type')
142-
143-
if access_token is None or token_type is None:
144-
print "ERROR: Couldn't get access token"
145-
sys.exit(1)
146-
147-
# Use the access token to make the API request
148-
yesterday = datetime.date.strftime(datetime.date.today() - datetime.timedelta(days=1), '%Y-%m-%d')
149-
150-
header_params = {'Authorization': token_type + ' ' + access_token}
151-
request_string = 'https://graph.windows.net/' + tenant_domain + '/activities/audit?api-version=beta&$filter=activityDate%20gt%20' + yesterday
152-
response = requests.get(request_string, headers = header_params)
153-
154-
if response.status_code is 200:
155-
print response.content
156-
else:
157-
print 'ERROR: API request failed'
158-
15990

16091

16192

16293

16394
## Next steps
164-
* Would you like to customize the samples in this topic? Check out the [Azure Active Directory audit API reference](active-directory-reporting-api-audit-reference.md).
95+
* Would you like to customize the samples in this article? Check out the [Azure Active Directory audit API reference](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/directoryaudit).
16596
* If you want to see a complete overview of using the Azure Active Directory reporting API, see [Getting started with the Azure Active Directory reporting API](active-directory-reporting-api-getting-started.md).
16697
* If you would like to find out more about Azure Active Directory reporting, see the [Azure Active Directory Reporting Guide](active-directory-reporting-guide.md).
16798

0 commit comments

Comments
 (0)