Skip to content

Commit 9cf4e6b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aug-whats-new
2 parents 888823e + ea40a2b commit 9cf4e6b

18 files changed

+73
-65
lines changed

articles/ansible/ansible-create-configure-aks.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ description: Learn how to use Ansible to create and manage an Azure Kubernetes S
44
ms.service: ansible
55
keywords: ansible, azure, devops, bash, cloudshell, playbook, aks, container, Kubernetes
66
author: tomarcher
7-
manager: jpconnock
8-
editor: na
9-
ms.topic: article
10-
ms.tgt_pltfrm: vm-linux
11-
ms.date: 07/11/2018
7+
manager: jeconnoc
128
ms.author: tarcher
9+
ms.topic: tutorial
10+
ms.date: 08/21/2018
1311
---
1412

1513
# Create and configure Azure Kubernetes Service clusters in Azure using Ansible
@@ -18,9 +16,20 @@ Ansible allows you to automate the deployment and configuration of resources in
1816
## Prerequisites
1917
- **Azure subscription** - If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
2018
- **Azure service principal** - When [creating the service principal](/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest#create-the-service-principal), note the following values: **appId**, **displayName**, **password**, and **tenant**.
21-
- **Configure Azure Cloud Shell** - If you are new to Azure Cloud Shell, the article, [Quickstart for Bash in Azure Cloud Shell](/azure/cloud-shell/quickstart), illustrates how to start and configure Cloud Shell.
22-
or
23-
- **Install and Configure Ansible** - Install Ansible on one of the following Linux platforms: [CentOS 7.4](../virtual-machines/linux/ansible-install-configure.md#centos-74), [Ubuntu 16.04 LTS](../virtual-machines/linux/ansible-install-configure.md#ubuntu-1604-lts), or [SLES 12 SP2](../virtual-machines/linux/ansible-install-configure.md#sles-12-sp2). Then [Create Azure credentials and configure Ansible](../virtual-machines/linux/ansible-install-configure.md#create-azure-credentials)
19+
20+
- **Configure Azure Cloud Shell** or **Install and configure Ansible on a Linux virtual machine**
21+
22+
**Configure Azure Cloud Shell**
23+
24+
1. **Configure Azure Cloud Shell** - If you are new to Azure Cloud Shell, the article, [Quickstart for Bash in Azure Cloud Shell](/azure/cloud-shell/quickstart), illustrates how to start and configure Cloud Shell.
25+
26+
**--OR--**
27+
28+
**Install and configure Ansible on a Linux virtual machine**
29+
30+
1. **Install Ansible** - Install Ansible on a [supported Linux platform](/azure/virtual-machines/linux/ansible-install-configure#install-ansible-on-an-azure-linux-virtual-machine).
31+
32+
1. **Configure Ansible** - [Create Azure credentials and configure Ansible](/azure/virtual-machines/linux/ansible-install-configure#create-azure-credentials)
2433

2534
> [!Note]
2635
> Ansible 2.6 is required to run the following the sample playbooks in this tutorial.

articles/azure-resource-manager/resource-group-move-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: multiple
1111
ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
14-
ms.date: 08/21/2018
14+
ms.date: 08/22/2018
1515
ms.author: tomfitz
1616

1717
---
@@ -228,7 +228,7 @@ Virtual Machines with certificate stored in Key Vault can be moved to a new reso
228228

229229
## Virtual Networks limitations
230230

231-
When moving a virtual network, you must also move its dependent resources. For example, you must move gateways with the virtual network.
231+
When moving a virtual network, you must also move its dependent resources. For VPN Gateways, you must move IP addresses, virtual network gateways, and all associated connection resources. Local network gateways can be in a different resource group.
232232

233233
To move a peered virtual network, you must first disable the virtual network peering. Once disabled, you can move the virtual network. After the move, reenable the virtual network peering.
234234

articles/azure-stack/azure-stack-app-service-release-notes-update-three.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For customers wishing to migrate to contained database for existing Azure App Se
8080
>
8181
>
8282
83-
1. Add [database to an Availability group](https://docs.microsoft.com/sql/database-engine/availability-groups/windows/availability-group-add-a-database)
83+
1. Add [AppService databases (appservice_hosting and appservice_metering) to an Availability group](https://docs.microsoft.com/sql/database-engine/availability-groups/windows/availability-group-add-a-database)
8484

8585
1. Enable contained database
8686
```sql

articles/cognitive-services/Speech/GetStarted/GetStartedClientLibraries.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Get started with the Microsoft Speech Recognition API by using client libraries | Microsoft Docs
2+
title: Get started with the Microsoft Speech Recognition API by using Bing Speech client libraries | Microsoft Docs
33
description: Use the Microsoft Speech Service client libraries in Microsoft Cognitive Services to develop applications that convert spoken audio to text.
44
services: cognitive-services
55
author: zhouwangzw
@@ -10,22 +10,25 @@ ms.topic: article
1010
ms.date: 09/15/2017
1111
ms.author: zhouwang
1212
---
13-
# Get started with Speech Service client libraries
13+
# Get started with Bing Speech Service client libraries
1414

15-
Besides making direct HTTP requests via a REST API, Speech Service provides developers with Speech client libraries in different languages. The Speech client libraries:
15+
Besides making direct HTTP requests via a REST API, Bing Speech Service provides developers with Speech client libraries in different languages. The Speech client libraries:
1616

1717
- Support more advanced capabilities in speech recognition, such as intermediate results in real time, long audio stream (up to 10 minutes), and continuous recognition.
1818
- Provide a simple and idiomatic API in the language of your preference.
1919
- Hide low-level communication details.
2020

21-
Currently, the following Speech client libraries are available:
21+
Currently, the following Bing Speech client libraries are available:
2222

2323
- [C# desktop library](GetStartedCSharpDesktop.md)
2424
- [C# service library](GetStartedCSharpServiceLibrary.md)
2525
- [JavaScript library](GetStartedJSWebsockets.md)
2626
- [Java library for Android](GetStartedJavaAndroid.md)
2727
- [Objective-C library for iOS](Get-Started-ObjectiveC-iOS.md)
2828

29+
> [!NOTE]
30+
In May 2018, we also released the new [Speech Service](/speech-service/overview.md) in public preview. We encourage you to [try it out for free](/speech-service/get-started.md).
31+
2932
## Additional resources
3033

3134
- The [samples](../samples.md) page provides complete samples to use Speech client libraries.

articles/data-factory/create-self-hosted-integration-runtime.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,19 @@ In the Data Factory to which the permissions were granted,
169169

170170
1. Default number of linked IR that can be created under single self-hosted IR is **20**. If you require more then contact Support.
171171

172-
2. The data factory in which linked IR is to be created must have an MSI (managed service identity). By default, the data factories created in Ibiza portal or PowerShell cmdlets will have MSI
172+
2. The data factory in which linked IR is to be created must have an MSI ([managed service identity](https://docs.microsoft.com/azure/active-directory/managed-service-identity/overview)). By default, the data factories created in Ibiza portal or PowerShell cmdlets will have MSI
173173
created implicitly. However, in some cases when data factory is created using an Azure Resorce Manager template or SDK, the “**Identity****property must be set** explicitly to ensure Azure Resorce Manager creates a data factory containing an MSI.
174174

175-
3. The self-hosted IR version must be equal or greater than 3.8.
175+
3. The self-hosted IR version must be equal or greater than 3.8.xxxx.xx. Please [download the latest version](https://www.microsoft.com/download/details.aspx?id=39717) of self-hosted IR
176+
177+
4. The data factory in which linked IR is to be created must have an MSI ([managed service identity](https://docs.microsoft.com/azure/active-directory/managed-service-identity/overview)). By default,
178+
the data factories created in Ibiza portal or PowerShell cmdlets will have MSI ([managed service identity](https://docs.microsoft.com/azure/active-directory/managed-service-identity/overview)).
179+
created implicitly, however, data factories created with Azure Resource Manager (ARM) template or SDK requires “Identity” property to be set to ensure an MSI is created.
180+
181+
5. The ADF .Net SDK which support this feature is version >= 1.1.0
182+
183+
6. The Azure PowerShell which support this feature is version >= 6.6.0
184+
(AzureRM.DataFactoryV2 >= 0.5.7)
176185

177186
> [!NOTE]
178187
> This feature is only available in Azure Data Factory version 2

articles/logic-apps/logic-apps-architectures-enterprise-integration-with-queues-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The architecture has the following components:
3838
- **Connectors**. Logic Apps uses [connectors](https://docs.microsoft.com/azure/connectors/apis-list) to connect to commonly used services. Logic Apps already has hundreds of different connectors, but you can also create a custom connector.
3939
- **Azure Service Bus**. [Service Bus](https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) provides secure and reliable messaging. Messaging can be used to decouple applications and integrate with other message-based systems.
4040
- **Azure Event Grid**. [Event Grid](https://docs.microsoft.com/azure/event-grid/overview) is a serverless platform that's used to publish and deliver application events.
41-
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The domain name is a subdomain of azure-api.net, such as contoso.azure-api.net. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
41+
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The default domain name is a subdomain of azure-api.net, such as contoso.azure-api.net, but [custom domains](https://docs.microsoft.com/azure/api-management/configure-custom-domain) can also be configured. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
4242
- **Azure DNS**. [Azure DNS](https://docs.microsoft.com/azure/dns/) is a hosting service for DNS domains. Azure DNS provides name resolution by using the Microsoft Azure infrastructure. By hosting your domains in Azure, you can manage your DNS records by using the same credentials, APIs, tools, and billing that you use for your other Azure services. To use a custom domain name (like contoso.com), create DNS records that map the custom domain name to the IP address. For more information, see [Configure a custom domain name in API Management](https://docs.microsoft.com/en-us/azure/api-management/configure-custom-domain).
4343
- **Azure Active Directory (Azure AD)**. Use [Azure AD](https://docs.microsoft.com/azure/active-directory/) or another identity provider for authentication. Azure AD provides authentication for accessing API endpoints by passing a [JSON Web Token for API Management](https://docs.microsoft.com/azure/api-management/policies/authorize-request-based-on-jwt-claims) to validate. Azure AD can secure access to the API Management Developer portal (Standard and Premium tiers only).
4444

@@ -125,4 +125,4 @@ Event Grid secures event delivery through a validation code. If you use Logic Ap
125125

126126
## Next steps
127127

128-
- Learn about [simple enterprise integration](logic-apps-architectures-simple-enterprise-integration.md).
128+
- Learn about [simple enterprise integration](logic-apps-architectures-simple-enterprise-integration.md).

articles/logic-apps/logic-apps-architectures-simple-enterprise-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The architecture has the following components:
3434
- **Azure API Management Developer portal**. Each instance of Azure API Management comes with access to the [Developer portal](https://docs.microsoft.com/azure/api-management/api-management-customize-styles). The API Management Developer portal gives you access to documentation and code samples. You can test APIs in the Developer portal.
3535
- **Azure Logic Apps**. [Logic Apps](https://docs.microsoft.com/azure/logic-apps/logic-apps-overview) is a serverless platform that's used to build enterprise workflow and integration.
3636
- **Connectors**. Logic Apps uses [connectors](https://docs.microsoft.com/azure/connectors/apis-list) to connect to commonly used services. Logic Apps already has hundreds of different connectors, but you can also create a custom connector.
37-
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The domain name is a subdomain of azure-api.net, such as contoso.azure-api.net. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
37+
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The default domain name is a subdomain of azure-api.net, such as contoso.azure-api.net, but [custom domains](https://docs.microsoft.com/azure/api-management/configure-custom-domain) can also be configured. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
3838
- **Azure DNS**. [Azure DNS](https://docs.microsoft.com/azure/dns/) is a hosting service for DNS domains. Azure DNS provides name resolution by using the Microsoft Azure infrastructure. By hosting your domains in Azure, you can manage your DNS records by using the same credentials, APIs, tools, and billing that you use for your other Azure services. To use a custom domain name like contoso.com, create DNS records that map the custom domain name to the IP address. For more information, see [Configure a custom domain name in API Management](https://docs.microsoft.com/en-us/azure/api-management/configure-custom-domain).
3939
- **Azure Active Directory (Azure AD)**. Use [Azure AD](https://docs.microsoft.com/azure/active-directory/) or another identity provider for authentication. Azure AD provides authentication for accessing API endpoints by passing a [JSON Web Token for API Management](https://docs.microsoft.com/azure/api-management/policies/authorize-request-based-on-jwt-claims) to validate. Azure AD can secure access to the API Management Developer portal (Standard and Premium tiers only).
4040

-57.1 KB
Loading

articles/service-fabric/service-fabric-create-your-first-linux-application-with-csharp.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,19 @@ Service Fabric provides scaffolding tools which help you create Service Fabric a
3737

3838
1. Install nodejs and NPM on your machine
3939

40-
Ubuntu
4140
```bash
42-
curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash
43-
sudo apt-get install -y nodejs
41+
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
42+
nvm install node
4443
```
45-
46-
Red Hat Enterprise Linux 7.4 (Service Fabric preview support)
47-
```bash
48-
sudo yum install nodejs
49-
sudo yum install npm
50-
```
51-
5244
2. Install [Yeoman](http://yeoman.io/) template generator on your machine from NPM
5345

5446
```bash
55-
sudo npm install -g yo
47+
npm install -g yo
5648
```
5749
3. Install the Service Fabric Yeoman C# application generator from NPM
5850

5951
```bash
60-
sudo npm install -g generator-azuresfcsharp
52+
npm install -g generator-azuresfcsharp
6153
```
6254

6355
## Create the application

articles/service-fabric/service-fabric-create-your-first-linux-application-with-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Also install the [Service Fabric CLI](service-fabric-cli.md).
3636
Service Fabric provides scaffolding tools which will help you create a Service Fabric Java application from terminal using Yeoman template generator. If Yeoman isn't already installed, see [Service Fabric getting started with Linux](service-fabric-get-started-linux.md#set-up-yeoman-generators-for-containers-and-guest-executables) for instructions on setting up Yeoman. Run the following command to install the Service Fabric Yeoman template generator for Java.
3737

3838
```bash
39-
sudo npm install -g generator-azuresfjava
39+
npm install -g generator-azuresfjava
4040
```
4141

4242
## Basic concepts

0 commit comments

Comments
 (0)