Skip to content

Commit 71094e0

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-pim-cust-fixes5
2 parents 8ae0552 + 3594110 commit 71094e0

9 files changed

+28
-28
lines changed

articles/automation/automation-change-tracking.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: automation
66
ms.component: change-inventory-management
77
author: georgewallace
88
ms.author: gwallace
9-
ms.date: 08/27/2018
9+
ms.date: 08/31/2018
1010
ms.topic: conceptual
1111
manager: carmonm
1212
ms.custom: H1Hack27Feb2017
@@ -21,8 +21,7 @@ Changes to installed software, Windows services, Windows registry and files, and
2121

2222
The following versions of the Windows operating system are officially supported for the Windows agent:
2323

24-
* Windows Server 2008 Service Pack 1 (SP1) or later
25-
* Windows 7 SP1 and later.
24+
* Windows Server 2008 R2 or later
2625

2726
## Supported Linux operating systems
2827

@@ -41,8 +40,8 @@ The following Linux distributions are officially supported. However, the Linux a
4140
To begin tracking changes, you need to enable the Change Tracking and Inventory solution for your Automation Account.
4241

4342
1. In the Azure portal, navigate to your Automation Account
44-
1. Select **Change Tracking** under **CONFIGURATION**.
45-
1. Select an existing Log analytics workspace or **Create New Workspace** and click **Enable**.
43+
2. Select **Change Tracking** under **CONFIGURATION**.
44+
3. Select an existing Log analytics workspace or **Create New Workspace** and click **Enable**.
4645

4746
This enables the solution for your automation account. The solution can take up to 15 minutes to enable. The blue banner notifies you when the solution is enabled. Navigate back to the **Change Tracking** page to manage the solution.
4847

articles/azure-functions/run-functions-from-deployment-package.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ The following shows a function app configured to run from a .zip file hosted in
6060

6161
## Adding the WEBSITE_RUN_FROM_ZIP setting
6262

63-
[!INCLUDE [Function app settings](../../includes/functions-app-settings.md]
63+
[!INCLUDE [Function app settings](../../includes/functions-app-settings.md)]
6464

6565
## Next steps
6666

6767
> [!div class="nextstepaction"]
6868
> [Continuous deployment for Azure Functions](functions-continuous-deployment.md)
6969
70-
[Zip deployment for Azure Functions]: deployment-zip-push.md
70+
[Zip deployment for Azure Functions]: deployment-zip-push.md

articles/service-fabric/service-fabric-sfctl-chaos.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ To get the next segment of the Chaos events, you can specify the ContinuationTok
4444
|Argument|Description|
4545
| --- | --- |
4646
| --continuation-token | The continuation token parameter is used to obtain next set of results. A continuation token with a non-empty value is included in the response of the API when the results from the system do not fit in a single response. When this value is passed to the next API call, the API returns next set of results. If there are no further results, then the continuation token does not contain a value. The value of this parameter should not be URL encoded. |
47-
| --end-time-utc | The Windows file time representing the end time of the time range for which a Chaos report is to be generated. Consult [DateTime.ToFileTimeUtc Method](https\://msdn.microsoft.com/library/system.datetime.tofiletimeutc(v=vs.110).aspx) for details. |
47+
| --end-time-utc | The Windows file time representing the end time of the time range for which a Chaos report is to be generated. Consult [DateTime.ToFileTimeUtc Method](https://docs.microsoft.com/dotnet/api/system.datetime.tofiletimeutc?redirectedfrom=MSDN&view=netframework-4.7.2#System_DateTime_ToFileTimeUtc) for details. |
4848
| --max-results | The maximum number of results to be returned as part of the paged queries. This parameter defines the upper bound on the number of results returned. The results returned can be less than the specified maximum results if they do not fit in the message as per the max message size restrictions defined in the configuration. If this parameter is zero or not specified, the paged query includes as many results as possible that fit in the return message. |
49-
| --start-time-utc | The Windows file time representing the start time of the time range for which a Chaos report is to be generated. Consult [DateTime.ToFileTimeUtc Method](https\://msdn.microsoft.com/library/system.datetime.tofiletimeutc(v=vs.110).aspx) for details. |
49+
| --start-time-utc | The Windows file time representing the start time of the time range for which a Chaos report is to be generated. Consult [DateTime.ToFileTimeUtc Method](https://docs.microsoft.com/dotnet/api/system.datetime.tofiletimeutc?redirectedfrom=MSDN&view=netframework-4.7.2#System_DateTime_ToFileTimeUtc) for details. |
5050
| --timeout -t | Server timeout in seconds. Default\: 60. |
5151

5252
### Global Arguments

articles/service-fabric/service-fabric-windows-cluster-x509-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ $ConnectArgs = @{ ConnectionEndpoint = '10.7.0.5:19000'; X509Credential = $Tru
350350
Connect-ServiceFabricCluster $ConnectArgs
351351
```
352352

353-
You can then run other PowerShell commands to work with this cluster. For example, you can run [Get-ServiceFabricNode](/powershell/module/servicefabric/get-servicefabricnode.md?view=azureservicefabricps) to show a list of nodes on this secure cluster.
353+
You can then run other PowerShell commands to work with this cluster. For example, you can run [Get-ServiceFabricNode](https://docs.microsoft.com/powershell/module/servicefabric/get-servicefabricnode?view=azureservicefabricps) to show a list of nodes on this secure cluster.
354354

355355

356356
To remove the cluster, connect to the node on the cluster where you downloaded the Service Fabric package, open a command line, and go to the package folder. Now run the following command:

articles/site-recovery/hyper-v-azure-troubleshoot.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ ms.author: rayne
1313
---
1414
# Troubleshoot Hyper-V to Azure replication and failover
1515

16-
This article describes common issues that you might encounter when replicating on-premises Hyper-V VMs to Azure, using [Azure Site Recovery](site-recovery-overview.md).
16+
This article describes common issues that you might come across when replicating on-premises Hyper-V VMs to Azure, using [Azure Site Recovery](site-recovery-overview.md).
1717

1818
## Enable protection issues
1919

20-
If you encounter issues when you enable protection for Hyper-V VMs, check the following:
20+
If you experience issues when you enable protection for Hyper-V VMs, check the following recommendations:
2121

22-
1. Check that your Hyper-V hosts and VMs comply with all [requirements and prerequisites](hyper-v-azure-support-matrix.md).
22+
1. Check that your Hyper-V hosts and VMs meet all [requirements and prerequisites](hyper-v-azure-support-matrix.md).
2323
2. If Hyper-V servers are located in System Center Virtual Machine Manager (VMM) clouds, verify that you've prepared the [VMM server](hyper-v-prepare-on-premises-tutorial.md#prepare-vmm-optional).
2424
3. Check that the Hyper-V Virtual Machine Management service is running on Hyper-V hosts.
25-
4. Check for issues that appear in the Hyper-V-VMMS\Admin log on the VM. This log is located in **Applications and Services Logs** > **Microsoft** > **Windows**.
25+
4. Check for issues that appear in the Hyper-V-VMMS\Admin sign in to the VM. This log is located in **Applications and Services Logs** > **Microsoft** > **Windows**.
2626
5. On the guest VM, verify that WMI is enabled and accessible.
2727
- [Learn about](https://blogs.technet.microsoft.com/askperf/2007/06/22/basic-wmi-testing/) basic WMI testing.
2828
- [Troubleshoot](https://aka.ms/WMiTshooting) WMI.
2929
- [Troubleshoot ](https://technet.microsoft.com/library/ff406382.aspx#H22) problems with WMI scripts and services.
30-
5. On the guest VM, ensure that the latest version of Integration Services is running.
30+
6. On the guest VM, ensure that the latest version of Integration Services is running.
3131
- [Check](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/manage-hyper-v-integration-services) that you have the latest version.
3232
- [Keep](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/manage-hyper-v-integration-services#keep-integration-services-up-to-date) Integration Services up-to-date.
3333

@@ -49,8 +49,8 @@ Troubleshoot issues with initial and ongoing replication as follows:
4949
- If you're replicating with VMM in the environment, check that these services are running:
5050
- On the Hyper-V host, check that the Virtual Machine Management service, the Microsoft Azure Recovery Services Agent, and the WMI Provider Host service are running.
5151
- On the VMM server, ensure that the System Center Virtual Machine Manager Service is running.
52-
4. Check connectivity between the Hyper-V server and Azure. To do this, open Task Manager on the Hyper V host. On the **Performance** tab, click **Open Resource Monitor**. On the **Network** tab > **Processess with Network Activity**, check whether cbengine.exe is actively sending large volumes (Mbs) of data.
53-
5. Check if the Hyper-V hosts can connect to the Azure storage blob URL. To do this, select and check **cbengine.exe**. View **TCP Connections** to verify connectivity from the host to the Azure storage blob.
52+
4. Check connectivity between the Hyper-V server and Azure. To check connectivity, open Task Manager on the Hyper V host. On the **Performance** tab, click **Open Resource Monitor**. On the **Network** tab > **Process with Network Activity**, check whether cbengine.exe is actively sending large volumes (Mbs) of data.
53+
5. Check if the Hyper-V hosts can connect to the Azure storage blob URL. To check if the hosts can connect, select and check **cbengine.exe**. View **TCP Connections** to verify connectivity from the host to the Azure storage blob.
5454
6. Check performance issues, as described below.
5555

5656
### Performance issues
@@ -87,7 +87,7 @@ An app-consistent snapshot is a point-in-time snapshot of the application data i
8787

8888
1. Check that the latest version of Integration services is installed and running. Check if an update is available by running the following command from an elevated PowerShell prompt on the Hyper-V host: **get-vm | select Name, State, IntegrationServicesState**.
8989
2. Check that VSS services are running and healthy:
90-
- To do this, log onto the guest VM. Then open an admin command prompt, and run the following commands to check whether all the VSS writers are healthy.
90+
- To check the services, sign in to the guest VM. Then open an admin command prompt, and run the following commands to check whether all the VSS writers are healthy.
9191
- **Vssadmin list writers**
9292
- **Vssadmin list shadows**
9393
- **Vssadmin list providers**
@@ -103,10 +103,10 @@ An app-consistent snapshot is a point-in-time snapshot of the application data i
103103
![Dynamic disk](media/hyper-v-azure-troubleshoot/dynamic-disk.png)
104104

105105
4. Check that you don't have an iSCSI disk attached to the VM. This isn't supported.
106-
5. Check that the Backup service is enabled. Verify this in **Hyper-V settings** > **Integration Services**.
106+
5. Check that the Backup service is enabled. Verify that it is enabled in **Hyper-V settings** > **Integration Services**.
107107
6. Make sure there are no conflicts with apps taking VSS snapshots. If multiple apps are trying to take VSS snapshots at the same time conflicts can occur. For example, if a Backup app is taking VSS snapshots when Site Recovery is scheduled by your replication policy to take a snapshot.
108108
7. Check if the VM is experiencing a high churn rate:
109-
- You can measure the daily data change rate for the guest VMs, using performance counters on Hyper-V host. To do this, enable the following counter. Aggregrate a sample of this value across the VM disks for 5-15 minutes, to get the VM churn.
109+
- You can measure the daily data change rate for the guest VMs, using performance counters on Hyper-V host. To measure the data change rate, enable the following counter. Aggregrate a sample of this value across the VM disks for 5-15 minutes, to get the VM churn.
110110
- Category: “Hyper-V Virtual Storage Device”
111111
- Counter: “Write Bytes / Sec”</br>
112112
- This data churn rate will increase or remain at a high level, depending on how busy the VM or its apps are.
@@ -133,15 +133,15 @@ An app-consistent snapshot is a point-in-time snapshot of the application data i
133133
**Error code** | **Message** | **Details**
134134
--- | --- | ---
135135
**0x800700EA** | "Hyper-V failed to generate VSS snapshot set for virtual machine: More data is available. (0x800700EA). VSS snapshot set generation can fail if backup operation is in progress.<br/><br/> Replication operation for virtual machine failed: More data is available." | Check if your VM has dynamic disk enabled. This isn't supported.
136-
**0x80070032** | "Hyper-V Volume Shadow Copy Requestor failed to connect to virtual machine <./VMname> because the version does not match the version expected by Hyper-V | Check if the latest Windows updates are installed.<br/><br/> [Upgrade](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/manage-hyper-v-integration-services.md#keep-integration-services-up-to-date) to the latest version of Integration Services.
136+
**0x80070032** | "Hyper-V Volume Shadow Copy Requestor failed to connect to virtual machine <./VMname> because the version does not match the version expected by Hyper-V | Check if the latest Windows updates are installed.<br/><br/> [Upgrade](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/manage-hyper-v-integration-services#keep-integration-services-up-to-date) to the latest version of Integration Services.
137137

138138

139139

140140
## Collect replication logs
141141

142142
All Hyper-V replication event are logged in the Hyper-V-VMMS\Admin log, located in **Applications and Services Logs** > **Microsoft** > **Windows**. In addition, you can enable an Analytic log for the Hyper-V Virtual Machine Management Service, as follows:
143143

144-
1. Make the Analytic and Debug logs viewable in the Event Viewer. To do this, in the Event Viewer, click **View** > **Show Analytic and Debug Logs.**. The Analytic log appears under **Hyper-V-VMMS**.
144+
1. Make the Analytic and Debug logs viewable in the Event Viewer. To make the logs available, in the Event Viewer, click **View** > **Show Analytic and Debug Logs.**. The Analytic log appears under **Hyper-V-VMMS**.
145145
2. In the **Actions** pane, click **Enable Log**.
146146

147147
![Enable log](media/hyper-v-azure-troubleshoot/enable-log.png)

articles/site-recovery/vmware-azure-deploy-configuration-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The sizing requirements for the configuration server depend on the potential dat
3737
| 12 vCPUs (2 sockets * 6 cores \@ 2.5 GHz) |18 GB |600 GB |500 GB to 1 TB |Replicate 100-150 machines. |
3838
| 16 vCPUs (2 sockets * 8 cores \@ 2.5 GHz) |32 GB |1 TB |1 TB to 2 TB |Replicate 150-200 machines. |
3939

40-
If you're replicating more than one VMware VM, read [capacity planning considerations](/site-recovery-plan-capacity-vmware.md). Run the [Deployment planner tool](site-recovery-deployment-planner.md) for VMWare replication.
40+
If you're replicating more than one VMware VM, read [capacity planning considerations](https://docs.microsoft.com/azure/site-recovery/site-recovery-plan-capacity-vmware). Run the [Deployment planner tool](site-recovery-deployment-planner.md) for VMWare replication.
4141

4242
## Download the template
4343

articles/sql-database/saas-multitenantdb-get-started-deploy.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ title: "Deploy a sharded multi-tenant database SaaS app that uses Azure SQL Data
33
description: "Deploy and explore the sharded Wingtip Tickets SaaS multi-tenant database application, that demonstrates SaaS patterns by using Azure SQL Database."
44
keywords: "sql database tutorial"
55
services: "sql-database"
6-
author: "MightyPen"
6+
author: "billgib"
77
manager: "craigg"
88
ms.service: "sql-database"
99
ms.custom: "scale out apps"
1010
ms.workload: "data-management"
1111
ms.topic: conceptual
12-
ms.date: 04/01/2018
13-
ms.author: "genemi"
12+
ms.date: 04/02/2018
13+
ms.reviewer: genemi
14+
ms.author: "billgib"
1415
---
1516
# Deploy and explore a sharded multi-tenant application that uses Azure SQL Database
1617

articles/sql-database/scripts/sql-database-sync-data-between-azure-onprem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ This script uses the following commands. Each command in the table links to comm
374374
| [Get-AzureRmSqlSyncAgentLinkedDatabase](/powershell/module/azurerm.sql/Get-AzureRmSqlSyncAgentLinkedDatabase) | Get all the information for the Sync Agent |
375375
| [New-AzureRmSqlSyncMember](/powershell/module/azurerm.sql/New-AzureRmSqlSyncMember) | Add a new member to the Sync Group |
376376
| [Update-AzureRmSqlSyncSchema](/powershell/module/azurerm.sql/Update-AzureRmSqlSyncSchema) | Refreshes the database schema information |
377-
| [Get-AzureRmSqlSyncSchema](/powershell/module/azurerm.sql/Get-AzureRmSqlSyncSchem) | Get the database schema information |
377+
| [Get-AzureRmSqlSyncSchema](https://docs.microsoft.com/powershell/module/azurerm.sql/Get-AzureRmSqlSyncSchema?view=azurermps-6.8.1) | Get the database schema information |
378378
| [Update-AzureRmSqlSyncGroup](/powershell/module/azurerm.sql/Update-AzureRmSqlSyncGroup) | Updates the Sync Group |
379379
| [Start-AzureRmSqlSyncGroupSync](/powershell/module/azurerm.sql/Start-AzureRmSqlSyncGroupSync) | Triggers a Sync |
380380
| [Get-AzureRmSqlSyncGroupLog](/powershell/module/azurerm.sql/Get-AzureRmSqlSyncGroupLog) | Checks the Sync Log |

articles/virtual-machines/linux/ansible-install-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Ansible allows you to automate the deployment and configuration of resources in
1818

1919
- **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).
2020

21-
- **Access to Linux or a Linux virtual machine** - If you don't have a Linux machine, create a [Linux virtual machine](/virtual-machines/linux/quick-create-cli.md).
21+
- **Access to Linux or a Linux virtual machine** - If you don't have a Linux machine, create a [Linux virtual machine](https://docs.microsoft.com/azure/virtual-network/quick-create-cli).
2222

2323
- **Azure service principal**: Follow the directions in the section of the **Create the service principal** section in the article, [Create an Azure service principal with Azure CLI 2.0](/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest#create-the-service-principal). Take note of the values for the **appId**, **displayName**, **password**, and **tenant**.
2424

0 commit comments

Comments
 (0)