Skip to content

Commit c7ec85e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aug-whats-new
2 parents e78e084 + e954dcc commit c7ec85e

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

articles/lab-services/devtest-lab-create-environment-from-arm.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Learn more about the many [benefits of using Resource Manager templates](https:/
3333
> [!NOTE]
3434
> When you use a Resource Manager template as a basis to create more lab VMs, there are some differences to keep in mind whether you are creating Multi-VMs or single-VMs. [Use a virtual machine's Azure Resource Manager template](devtest-lab-use-resource-manager-template.md) explains these differences in greater detail.
3535
>
36-
>
3736
38-
## Configure Azure Resource Manager template repositories
37+
## DevTest Labs public environments
38+
Azure DevTest Labs has a [public repository of Azure Resource Manager templates](https://github.com/Azure/azure-devtestlab/tree/master/Environments) that you can use to create environments without having to connect to an external GitHub source by yourself. This repository includes frequently used templates such as Azure Web Apps, Service Fabric Cluster, and development SharePoint Farm environment. This feature is similar to the public repository of artifacts that is included for every lab that you create. The environment repository allows you to quickly get started with pre-authored environment templates with minimum input parameters to provide you with a smooth getting started experience for PaaS resources within labs. For more information, see [Configure and use public environments in DevTest Labs](devtest-lab-configure-use-public-environments.md).
3939

40+
## Configure your own template repositories
4041
As one of the best practices with infrastructure-as-code and configuration-as-code, environment templates should be managed in source control. Azure DevTest Labs follows this practice and loads all Azure Resource Manager templates directly from your GitHub or VSTS Git repositories. As a result, Resource Manager templates can be used across the entire release cycle, from the test environment to the production environment.
4142

4243
Check out the templates created by the DevTest Labs team in the [public GitHub repository](https://github.com/Azure/azure-devtestlab/tree/master/Environments). In this public repository, you can view templates shared by others that you can use directly or customize them to suit your needs. After you create your template, store it in this repository to share it with others. You can also set up your own Git repository with templates that can be used to set up environments in the cloud.
@@ -52,12 +53,9 @@ There are a couple of rules to follow to organize your Azure Resource Manager te
5253
- Metadata can be defined to specify the template display name and description. This metadata must be in a file named `metadata.json`. The following example metadata file illustrates how to specify the display name and description:
5354

5455
```json
55-
{
56-
57-
"itemDisplayName": "<your template name>",
58-
59-
"description": "<description of the template>"
60-
56+
{
57+
"itemDisplayName": "<your template name>",
58+
"description": "<description of the template>"
6159
}
6260
```
6361

articles/service-fabric/service-fabric-cluster-resource-manager-application-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ For each application that has an Application Capacity defined for one or more me
156156
Powershell:
157157

158158
``` posh
159-
Get-ServiceFabricApplicationLoad –ApplicationName fabric:/MyApplication1
159+
Get-ServiceFabricApplicationLoadInformation –ApplicationName fabric:/MyApplication1
160160
```
161161

162162
C#

articles/virtual-machines/linux/serial-console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ As we are still in the preview stages for serial console access, we are working
153153
Issue | Mitigation
154154
:---------------------------------|:--------------------------------------------|
155155
There is no option with virtual machine scale set instance serial console | At the time of preview, access to the serial console for virtual machine scale set instances is not supported.
156-
Hitting enter after the connection banner does not show a log in prompt | [Hitting enter does nothing](https://github.com/Microsoft/azserialconsole/blob/master/Known_Issues/Hitting_enter_does_nothing.md)
156+
Hitting enter after the connection banner does not show a log in prompt | Please see this page: [Hitting enter does nothing](https://github.com/Microsoft/azserialconsole/blob/master/Known_Issues/Hitting_enter_does_nothing.md). This may happen if you are running a custom VM, hardened appliance, or GRUB config that causes Linux to fail to properly connect to the serial port.
157157
A 'Forbidden' response was encountered when accessing this VM's boot diagnostic storage account. | Ensure that boot diagnostics does not have an account firewall. An accessible boot diagnostic storage account is necessary for serial console to function.
158158
159159

articles/virtual-machines/windows/serial-console-cmd-ps-commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.date: 08/14/2018
1717
ms.author: alsin
1818
---
1919

20-
# Windows Commands - CMD
20+
# Windows Commands - CMD and PowerShell
2121

2222
This section includes example commands for performing common tasks in scenarios where you may need to use SAC to access your Windows VM, such as when you need to troubleshoot RDP connection failures.
2323

articles/virtual-machines/windows/serial-console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ As we are still in the preview stages for serial console access, we are working
170170
Issue | Mitigation
171171
:---------------------------------|:--------------------------------------------|
172172
There is no option with virtual machine scale set instance serial console | At the time of preview, access to the serial console for virtual machine scale set instances is not supported.
173-
Hitting enter after the connection banner does not show a log in prompt | [Hitting enter does nothing](https://github.com/Microsoft/azserialconsole/blob/master/Known_Issues/Hitting_enter_does_nothing.md)
173+
Hitting enter after the connection banner does not show a log in prompt | Please see this page: [Hitting enter does nothing](https://github.com/Microsoft/azserialconsole/blob/master/Known_Issues/Hitting_enter_does_nothing.md). This may happen if you are running a custom VM, hardened appliance, or GRUB config that causers Windows to fail to properly connect to the serial port.
174174
Only health information is shown when connecting to a Windows VM| This will show up if the Special Administrative Console has not been enabled for your Windows image. See [Access Serial Console for Windows](#access-serial-console-for-windows) for instructions on how to manually enable SAC on your Windows VM. More details can be found at [Windows Health Signals](https://github.com/Microsoft/azserialconsole/blob/master/Known_Issues/Windows_Health_Info.md).
175175
Unable to type at SAC prompt if kernel debugging is enabled | RDP to VM and run `bcdedit /debug {current} off` from an elevated command prompt. If you can't RDP you can instead attach the OS disk to another Azure VM and modify it while attached as a data disk using `bcdedit /store <drive letter of data disk>:\boot\bcd /debug <identifier> off`, then swap the disk back.
176176
Pasting into PowerShell in SAC results in a third character if original content had a repeating character | A workaround is to remove the PSReadLine module. `Remove-Module PSReadLine` will remove the PSReadLine module from the current session.

0 commit comments

Comments
 (0)