Skip to content

Commit 87a6392

Browse files
author
Owen Duncan
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into owend0120
2 parents 17df0df + 2a7d4d9 commit 87a6392

File tree

8 files changed

+48
-36
lines changed

8 files changed

+48
-36
lines changed

articles/active-directory-domain-services/active-directory-ds-admin-guide-configure-secure-ldap.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 09/21/2016
16+
ms.date: 01/20/2016
1717
ms.author: maheshu
1818

1919
---
@@ -28,43 +28,45 @@ To perform the tasks listed in this article, you need:
2828
3. **Azure AD Domain Services** must be enabled for the Azure AD directory. If you haven't done so, follow all the tasks outlined in the [Getting Started guide](active-directory-ds-getting-started.md).
2929
4. A **certificate to be used to enable secure LDAP**.
3030

31-
* **Recommended** - Obtain a certificate from your enterprise CA or public certification authority. This configuration option is more secure.
31+
* **Recommended** - Obtain a certificate from a trusted public certification authority. This configuration option is more secure.
3232
* Alternately, you may also choose to [create a self-signed certificate](#task-1---obtain-a-certificate-for-secure-ldap) as shown later in this article.
3333

3434
<br>
3535

3636
### Requirements for the secure LDAP certificate
3737
Acquire a valid certificate per the following guidelines, before you enable secure LDAP. You encounter failures if you try to enable secure LDAP for your managed domain with an invalid/incorrect certificate.
3838

39-
1. **Trusted issuer** - The certificate must be issued by an authority trusted by computers that need to connect to the domain using secure LDAP. This authority may be your organization's enterprise certification authority or a public certification authority trusted by these computers.
39+
1. **Trusted issuer** - The certificate must be issued by an authority trusted by computers that need to connect to the domain using secure LDAP. This authority may be a public certification authority trusted by these computers.
4040
2. **Lifetime** - The certificate must be valid for at least the next 3-6 months. Secure LDAP access to your managed domain is disrupted when the certificate expires.
4141
3. **Subject name** - The subject name on the certificate must be a wildcard for your managed domain. For instance, if your domain is named 'contoso100.com', the certificate's subject name must be '*.contoso100.com'. Set the DNS name (subject alternate name) to this wildcard name.
4242
4. **Key usage** - The certificate must be configured for the following uses - Digital signatures and key encipherment.
4343
5. **Certificate purpose** - The certificate must be valid for SSL server authentication.
4444

45+
> [!NOTE]
46+
> **Enterprise Certification Authorities:** Azure AD Domain Services does not currently support using secure LDAP certificates issued by your organization's enterprise certification authority. This restriction is because the service does not trust your enterprise CA as a root certification authority. We expect to add support for enterprise CAs in the future. If you absolutely must use certificates issued by your enterprise CA, [contact us](active-directory-ds-contact-us.md) for assistance.
47+
>
48+
>
49+
4550
<br>
4651

4752
## Task 1 - Obtain a certificate for secure LDAP
4853
The first task involves obtaining a certificate used for secure LDAP access to the managed domain. You have two options:
4954

50-
* Obtain a certificate from a certification authority. The authority may be your organization's enterprise CA or a public certification authority.
55+
* Obtain a certificate from a certification authority. The authority may be a public certification authority.
5156
* Create a self-signed certificate.
5257

5358
### Option A (Recommended) - Obtain a secure LDAP certificate from a certification authority
54-
If your organization deploys an enterprise public key infrastructure (PKI), you need to obtain a certificate from the enterprise certification authority (CA) for your organization. If your organization obtains its certificates from a public certification authority, you need to obtain the secure LDAP certificate from that public certification authority.
59+
If your organization obtains its certificates from a public certification authority, you need to obtain the secure LDAP certificate from that public certification authority.
5560

5661
When requesting a certificate, ensure that you follow the requirements outlined in [Requirement for the secure LDAP certificate](#requirements-for-the-secure-ldap-certificate).
5762

5863
> [!NOTE]
59-
> Client computers that need to connect to the managed domain using secure LDAP must trust the issuer of the LDAPS certificate.
64+
> Client computers that need to connect to the managed domain using secure LDAP must trust the issuer of the secure LDAP certificate.
6065
>
6166
>
6267
6368
### Option B - Create a self-signed certificate for secure LDAP
64-
You may choose to create a self-signed certificate for secure LDAP, if:
65-
66-
* certificates in your organization are not issued by an enterprise certification authority or
67-
* you do not expect to use a certificate from a public certification authority.
69+
If you do not expect to use a certificate from a public certification authority, you may choose to create a self-signed certificate for secure LDAP.
6870

6971
**Create a self-signed certificate using PowerShell**
7072

@@ -81,7 +83,7 @@ In the preceding sample, replace 'contoso100.com' with the DNS domain name of yo
8183
The newly created self-signed certificate is placed in the local machine's certificate store.
8284

8385
## Task 2 - Export the secure LDAP certificate to a .PFX file
84-
Before you start this task, ensure that you have obtained the secure LDAP certificate from your enterprise certification authority or a public certification authority or have created a self-signed certificate.
86+
Before you start this task, ensure that you have obtained the secure LDAP certificate from a public certification authority or have created a self-signed certificate.
8587

8688
Perform the following steps, to export the LDAPS certificate to a .PFX file.
8789

@@ -170,7 +172,7 @@ To enable secure LDAP, perform the following configuration steps:
170172
![Secure LDAP - pending state](./media/active-directory-domain-services-admin-guide/secure-ldap-pending-state.png)
171173

172174
> [!NOTE]
173-
> It takes about 10 to 15 minutes to enable secure LDAP for your managed domain. If the provided secure LDAP certificate does not match the required criteria, secure LDAP is not enabled for your directory and you see a failure. For example, the domain name is incorrect, the certificate is expired or expires soon etc.
175+
> It takes about 10 to 15 minutes to enable secure LDAP for your managed domain. If the provided secure LDAP certificate does not match the required criteria, secure LDAP is not enabled for your directory and you see a failure. For example, the domain name is incorrect, the certificate has already expired or expires soon.
174176
>
175177
>
176178
9. When secure LDAP is successfully enabled for your managed domain, the **Pending...** message should disappear. You should see the thumbprint of the certificate displayed.

articles/active-directory/develop/active-directory-devquickstarts-angular.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ ms.author: dastrock
1818

1919
---
2020
# Securing AngularJS Single Page Apps with Azure AD
21-
[!INCLUDE [active-directory-devquickstarts-switcher](../../../includes/active-directory-devquickstarts-switcher.md)]
2221

2322
[!INCLUDE [active-directory-devguide](../../../includes/active-directory-devguide.md)]
2423

@@ -54,6 +53,7 @@ To enable your app to authenticate users and get tokens, you'll first need to re
5453
* Click the application and choose **Manifest** to open the inline manifest editor.
5554
* Locate the `oauth2AllowImplicitFlow` property. Set its value to `true`.
5655
* Click **Save** to save the manifest.
56+
8. Grant permissions across your tenant for your application. Go to Settings -> Properties -> Required Permissions, and click the **Grant Permissions** button in the top bar. Click **Yes** to confirm.
5757

5858
## 2. Install ADAL & Configure the SPA
5959
Now that you have an application in Azure AD, you can install adal.js and write your identity-related code.

articles/app-service-web/TOC.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
# Get started
88

99
## Web Apps
10-
### [.NET](web-sites-dotnet-get-started.md)
11-
### [Node.js](app-service-web-nodejs-get-started.md)
12-
### [Python](web-sites-python-ptvs-django-mysql.md)
13-
### [Java](web-sites-java-get-started.md)
10+
### [HTML](app-service-web-get-started-html.md)
11+
### [.NET](app-service-web-get-started-dotnet.md)
12+
### [Node.js](app-service-web-get-started-nodejs.md)
13+
### [Python](app-service-web-get-started-python.md)
14+
### [Java](app-service-web-get-started-java.md)
1415
### [Marketplace app](web-sites-php-web-site-gallery.md)
15-
### [PHP](app-service-web-php-get-started.md)
16+
### [PHP](app-service-web-get-started-php.md)
1617

1718
## API Apps
1819
### [.NET](../app-service-api/app-service-api-dotnet-get-started.md)
@@ -60,26 +61,26 @@
6061
### [WebJobs SDK](websites-dotnet-webjobs-sdk-get-started.md)
6162

6263
### ASP.NET apps
63-
#### [Deploy your first .NET web app to Azure in five minutes](app-service-web-get-started-dotnet.md)
64+
#### [Create an ASP.NET app in Azure with Visual Studio](web-sites-dotnet-get-started.md)
6465
#### [Create a REST service using ASP.NET Web API](web-sites-dotnet-rest-service-aspnet-api-sql-database.md)
6566
#### [Create an ASP.NET 5 web app in Visual Studio Code](web-sites-create-web-app-using-vscode.md)
6667

6768
### Node.js apps
69+
#### [Develop Node.js for App Service](app-service-web-nodejs-get-started.md)
6870
#### [Create a Node.js web app](web-sites-nodejs-develop-deploy-mac.md)
6971
#### [Create a Node.js chat application with Socket.IO](web-sites-nodejs-chat-app-socketio.md)
7072
#### [How to use io.js with Web Apps](web-sites-nodejs-iojs.md)
7173
#### [Deploy a Sails.js web app to Azure App Service](app-service-web-nodejs-sails.md)
7274
#### [Build and deploy using WebMatrix](web-sites-nodejs-use-webmatrix.md)
7375

7476
### PHP apps
75-
#### [Deploy your first PHP web app to Azure in five minutes](app-service-web-get-started-php.md)
77+
#### [Develop PHP apps for App Service](app-service-web-php-get-started.md)
7678
#### [Create a PHP-SQL web app and deploy using Git](web-sites-php-sql-database-deploy-use-git.md)
7779
#### [Create a WordPress web app in Azure App Service](web-sites-php-web-site-gallery.md)
7880
#### [Create and connect to a MySQL database in Azure](../store-php-create-mysql-database.md?toc=%2fazure%2fapp-service-web%2ftoc.json)
7981
#### [Enterprise-class WordPress on Azure App Service](web-sites-php-enterprise-wordpress.md)
8082

8183
### Java apps
82-
#### [Deploy your first Java web app to Azure in five minutes](web-sites-java-get-started.md)
8384
#### Create a Hello World app
8485
##### [Eclipse](app-service-web-eclipse-create-hello-world-web-app.md)
8586
##### [IntelliJ](app-service-web-intellij-create-hello-world-web-app.md)

articles/azure-government/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@
3636
## [Pricing](https://azure.microsoft.com/pricing/)
3737
## [Trial](https://azuregov.microsoft.com/trial/azuregovtrial)
3838
## [Blog](https://blogs.msdn.microsoft.com/azuregov/)
39+
## [Azure Government Website](https://azure.microsoft.com/overview/clouds/government/)

articles/data-factory/data-factory-compute-linked-services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ To use a Windows-based HDInsight cluster, set **osType** to **windows** or do no
8686
| clusterSize |Number of worker/data nodes in the cluster. The HDInsight cluster is created with 2 head nodes along with the number of worker nodes you specify for this property. The nodes are of size Standard_D3 that has 4 cores, so a 4 worker node cluster takes 24 cores (4*4 for worker nodes + 2*4 for head nodes). See [Create Linux-based Hadoop clusters in HDInsight](../hdinsight/hdinsight-hadoop-provision-linux-clusters.md) for details about the Standard_D3 tier. |Yes |
8787
| timetolive |The allowed idle time for the on-demand HDInsight cluster. Specifies how long the on-demand HDInsight cluster stays alive after completion of an activity run if there are no other active jobs in the cluster.<br/><br/>For example, if an activity run takes 6 minutes and timetolive is set to 5 minutes, the cluster stays alive for 5 minutes after the 6 minutes of processing the activity run. If another activity run is executed with the 6 minutes window, it is processed by the same cluster.<br/><br/>Creating an on-demand HDInsight cluster is an expensive operation (could take a while), so use this setting as needed to improve performance of a data factory by reusing an on-demand HDInsight cluster.<br/><br/>If you set timetolive value to 0, the cluster is deleted as soon as the activity run in processed. On the other hand, if you set a high value, the cluster may stay idle unnecessarily resulting in high costs. Therefore, it is important that you set the appropriate value based on your needs.<br/><br/>Multiple pipelines can share the same instance of the on-demand HDInsight cluster if the timetolive property value is appropriately set |Yes |
8888
| version |Version of the HDInsight cluster. The default value is 3.1 for Windows cluster and 3.2 for Linux cluster. |No |
89-
| linkedServiceName |Azure Storage linked service to be used by the on-demand cluster for storing and processing data. |Yes |
89+
| linkedServiceName |Azure Storage linked service to be used by the on-demand cluster for storing and processing data. <p>Currently, you cannot create an on-demand HDInsight cluster that uses an Azure Data Lake Store as the storage. If you want to store the result data from HDInsight processing in an Azure Data Lake Store, use a Copy Activity to copy the data from the Azure Blob Storage to the Azure Data Lake Store.</p> | Yes |
9090
| additionalLinkedServiceNames |Specifies additional storage accounts for the HDInsight linked service so that the Data Factory service can register them on your behalf. |No |
9191
| osType |Type of operating system. Allowed values are: Windows (default) and Linux |No |
9292
| hcatalogLinkedServiceName |The name of Azure SQL linked service that point to the HCatalog database. The on-demand HDInsight cluster is created by using the Azure SQL database as the metastore. |No |
@@ -208,7 +208,7 @@ You can create an Azure HDInsight linked service to register your own HDInsight
208208
| clusterUri |The URI of the HDInsight cluster. |Yes |
209209
| username |Specify the name of the user to be used to connect to an existing HDInsight cluster. |Yes |
210210
| password |Specify password for the user account. |Yes |
211-
| linkedServiceName |Name of the linked service for the blob storage used by this HDInsight cluster. |Yes |
211+
| linkedServiceName |Name of the linked service for the Azure Blob Storage / Azure Data Lake Store used by this HDInsight cluster. |Yes |
212212

213213
## Azure Batch Linked Service
214214
You can create an Azure Batch linked service to register a Batch pool of virtual machines (VMs) to a data factory. You can run .NET custom activities using either Azure Batch or Azure HDInsight.

articles/log-analytics/TOC.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
## [Log Analytics FAQ](log-analytics-faq.md)
1111

1212
# How To
13-
## Integrate
13+
## Collect data
1414
### Connected sources
1515
#### [Windows agents](log-analytics-windows-agents.md)
1616
#### [Linux agents](log-analytics-linux-agents.md)
@@ -19,19 +19,23 @@
1919
#### [Operations Manager](log-analytics-om-agents.md)
2020
#### [Configuration Manager](log-analytics-sccm.md)
2121
#### [OMS Gateway](log-analytics-oms-gateway.md)
22-
### Data Sources
22+
### Data sources
2323
#### [Data sources overview](log-analytics-data-sources.md)
2424
#### [Windows events](log-analytics-data-sources-windows-events.md)
2525
#### [Syslog](log-analytics-data-sources-syslog.md)
2626
#### [Performance counters](log-analytics-data-sources-performance-counters.md)
2727
#### [IIS logs](log-analytics-data-sources-iis-logs.md)
2828
#### [Custom logs](log-analytics-data-sources-custom-logs.md)
2929
#### [Custom fields](log-analytics-custom-fields.md)
30-
## Develop
30+
## Query data
3131
### [Log searches overview](log-analytics-log-searches.md)
3232
### [Search reference](log-analytics-search-reference.md)
3333
### [Computer groups](log-analytics-computer-groups.md)
3434
### [Alerts](log-analytics-alerts.md)
35+
## Analyze data
36+
### [Dashboards](log-analytics-dashboards.md)
37+
### [View Designer](log-analytics-view-designer.md)
38+
### [Power BI](log-analytics-powerbi.md)
3539
### Solutions
3640
#### [Solutions overview](log-analytics-add-solutions.md)
3741
#### [AD Assessment](log-analytics-ad-assessment.md)
@@ -52,11 +56,7 @@
5256
#### [VMware](log-analytics-vmware.md)
5357
#### [Wire Data](log-analytics-wire-data.md)
5458
#### [SCOM Assessment](log-analytics-scom-assessment.md)
55-
## Analyze
56-
### [Dashboards](log-analytics-dashboards.md)
57-
### [View Designer](log-analytics-view-designer.md)
58-
### [Power BI](log-analytics-powerbi.md)
59-
## Automate
59+
## Develop
6060
### [Data collector API](log-analytics-data-collector-api.md)
6161
### [PowerShell cmdlets](log-analytics-powershell-workspace-configuration.md)
6262
### [Log Search API](log-analytics-log-search-api.md)

articles/storage/storage-disaster-recovery-guidance.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: dotnet
1515
ms.topic: article
16-
ms.date: 12/08/2016
16+
ms.date: 1/19/2017
1717
ms.author: robinsh
1818

1919
---
20+
2021
# What to do if an Azure Storage outage occurs
2122
At Microsoft, we work hard to make sure our services are always available. Sometimes, forces beyond our control impact us in ways that cause unplanned service outages in one or more regions. To help you handle these rare occurrences, we provide the following high-level guidance for Azure Storage services.
2223

@@ -51,7 +52,9 @@ A couple of points regarding the storage geo-failover experience:
5152
* Storage geo-failover will only be triggered by the Azure Storage team – there is no customer action required.
5253
* Your existing storage service endpoints for blobs, tables, queues, and files will remain the same after the failover; the DNS entry will need to be updated to switch from the primary region to the secondary region.
5354
* Before and during the geo-failover, you won’t have write access to your storage account due to the impact of the disaster but you can still read from the secondary if your storage account has been configured as RA-GRS.
54-
* When the geo-failover has been completed and the DNS changes propagated, your read and write access to your storage account will be resumed. You can query [“Last Geo Failover Time” of your storage account](https://msdn.microsoft.com/library/azure/ee460802.aspx) to get more details.
55+
* When the geo-failover has been completed and the DNS changes propagated, read and write access to your storage account will be resumed; this points to what used to be your secondary endpoint.
56+
* Note that you will have write access if you have GRS or RA-GRS configured for the storage account.
57+
* You can query [“Last Geo Failover Time” of your storage account](https://msdn.microsoft.com/library/azure/ee460802.aspx) to get more details.
5558
* After the failover, your storage account will be fully functioning, but in a “degraded” status, as it is actually hosted in a standalone region with no geo-replication possible. To mitigate this risk, we will restore the original primary region and then do a geo-failback to restore the original state. If the original primary region is unrecoverable, we will allocate another secondary region.
5659
For more details on the infrastructure of Azure Storage geo replication, please refer to the article on the Storage team blog about [Redundancy Options and RA-GRS](https://blogs.msdn.microsoft.com/windowsazurestorage/2013/12/11/windows-azure-storage-redundancy-options-and-read-access-geo-redundant-storage/).
5760

@@ -63,3 +66,5 @@ There are some recommended approaches to back up your storage data on a regular
6366
* Tables – use [AzCopy](storage-use-azcopy.md) to export the table data into another storage account in another region.
6467
* Files – use [AzCopy](storage-use-azcopy.md) or [Azure PowerShell](storage-powershell-guide-full.md) to copy your files to another storage account in another region.
6568

69+
For information about creating applications that take full advantage of the RA-GRS feature, please check out [Designing Highly Available Applications using RA-GRS Storage](storage-designing-ha-apps-with-ragrs.md)
70+

0 commit comments

Comments
 (0)