Skip to content

Commit 0da12d7

Browse files
authored
Merge pull request #103142 from cynthn/1metadata
Metadata 1 - updates and retiring some articles and includes
2 parents a49ca80 + 107fd32 commit 0da12d7

22 files changed

+73
-356
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24510,6 +24510,11 @@
2451024510
"redirect_url": "/azure/virtual-machines/workloads/sap/high-availability-multi-sid",
2451124511
"redirect_document_id": false
2451224512
},
24513+
{
24514+
"source_path": "articles/virtual-machines/virtual-machines-azure-slave-plugin-for-hudson-classic.md",
24515+
"redirect_url": "/azure/virtual-machines/",
24516+
"redirect_document_id": false
24517+
},
2451324518
{
2451424519
"source_path": "articles/virtual-machines/virtual-machines-windows-sap-planning-guide.md",
2451524520
"redirect_url": "/azure/virtual-machines/workloads/sap/planning-guide",
@@ -41704,6 +41709,11 @@
4170441709
"source_path": "articles/virtual-machines/windows/classic/capture-image-classic.md",
4170541710
"redirect_url": "/previous-versions/azure/virtual-machines/windows/classic/capture-image-classic",
4170641711
"redirect_document_id": false
41712+
},
41713+
{
41714+
"source_path": "articles/virtual-machines/virtual-machines-availability-set-supportability.md",
41715+
"redirect_url": "/azure/virtual-machines/troubleshooting/virtual-machines-availability-set-supportability",
41716+
"redirect_document_id": false
4170741717
},
4170841718
{
4170941719
"source_path": "articles/virtual-machines/windows/classic/configure-availability-classic.md",

articles/storage/common/storage-azure-cli-nodejs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In this guide, we'll explore how to use [Azure classic CLI](../../cli-install-no
2323
This guide assumes that you understand the basic concepts of Azure Storage. The guide provides a number of scripts to demonstrate the usage of the classic CLI with Azure Storage. Be sure to update the script variables based on your configuration before running each script.
2424

2525
> [!NOTE]
26-
> The guide provides the Azure classic CLI command and script examples for classic storage accounts. See [Using the Azure CLI for Mac, Linux, and Windows with Azure Resource Management](../../virtual-machines/azure-cli-arm-commands.md#azure-storage-commands-to-manage-your-storage-objects) for Azure classic CLI commands for Resource Manager storage accounts.
26+
> The guide provides the Azure classic CLI command and script examples for classic storage accounts. See [Using the Azure CLI for Mac, Linux, and Windows with Azure Resource Management](../../virtual-machines/azure-cli-arm-commands.md#storage-objects) for Azure classic CLI commands for Resource Manager storage accounts.
2727
>
2828
>
2929
@@ -229,7 +229,7 @@ azure storage file copy start --source-container srcctn --source-blob hello2.txt
229229

230230
You can find Azure classic CLI command reference for working with Storage resources here:
231231

232-
* [Azure classic CLI commands in Resource Manager mode](../../virtual-machines/azure-cli-arm-commands.md#azure-storage-commands-to-manage-your-storage-objects)
232+
* [Azure classic CLI commands in Resource Manager mode](../../virtual-machines/azure-cli-arm-commands.md#storage-objects)
233233
* [Azure classic CLI commands in Azure Service Management mode](../../cli-install-nodejs.md)
234234

235235
You may also like to try the latest version of the [Azure CLI](../storage-azure-cli.md), for use with the Resource Manager deployment model.

articles/virtual-machines/azure-cli-arm-commands.md

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
11
---
2-
title: Azure CLI commands in Resource Manager mode | Microsoft Docs
3-
description: Azure command line interface (CLI) commands to manage resources in the Resource Manager deployment model
4-
services: virtual-machines-linux,virtual-machines-windows,virtual-network,mobile-services,cloud-services
5-
documentationcenter: ''
2+
title: Azure classic CLI commands
3+
description: Azure command line interface (CLI) commands to manage resources.
64
author: cynthn
75
manager: gwallace
8-
editor: ''
9-
tags: azure-resource-manager
10-
11-
ms.assetid: be37da5b-72fe-41a1-9fa0-8937b69464ec
12-
ms.service: multiple
13-
ms.workload: multiple
14-
ms.tgt_pltfrm: command-line-interface
15-
ms.devlang: na
6+
ms.service: virtual-machines
7+
ms.workload: infrastructure-services
168
ms.topic: article
179
ms.date: 04/18/2017
1810
ms.author: cynthn
19-
11+
#pmcontact:
2012
---
21-
# Azure CLI commands in Resource Manager mode
22-
This article provides syntax and options for Azure command-line interface (CLI) commands you'd commonly use to create and manage Azure resources in the Azure Resource Manager deployment model. You access these commands by running the CLI in Resource Manager (arm) mode. This is not a complete reference, and your CLI version may show slightly different commands or parameters. For a general overview of Azure resources and resource groups, see [Azure Resource Manager Overview](../azure-resource-manager/management/overview.md).
13+
# Azure classic CLI commands
2314

24-
> [!NOTE]
25-
> This article shows Resource Manager mode commands in the Azure CLI, sometimes called Azure classic CLI.
26-
>To work in the Resource Manager model, you can also try the [Azure CLI](/cli/azure/install-az-cli2), our next generation multi-platform CLI.
27-
> Find out more about the [old and new Azure CLIs](/cli/azure/old-and-new-clis).
28-
>
15+
> [!IMPORTANT]
16+
> This topic describes how to install the Azure classic CLI. The classic CLI is deprecated and should only be used with the classic deployment model.
17+
> For all other deployments, use the [Azure CLI](https://docs.microsoft.com/cli/azure/).
2918
30-
To get started, first [install the Azure CLI](../cli-install-nodejs.md) and [connect to your Azure subscription](/cli/azure/authenticate-azure-cli).
19+
This article provides syntax and options for Azure classic command-line interface (CLI) commands you'd commonly use to create and manage Azure resources. This is not a complete reference, and your CLI version may show slightly different commands or parameters.
20+
21+
To get started, first [install the Azure classic CLI](../cli-install-nodejs.md) and [connect to your Azure subscription](/cli/azure/authenticate-azure-cli).
3122

3223
For current command syntax and options at the command line in Resource Manager mode, type `azure help` or, to display help for a specific command, `azure help [command]`. Also find CLI examples in the documentation for creating and managing specific Azure services.
3324

@@ -42,10 +33,10 @@ Use the following command to enable Azure CLI Resource Manager mode commands.
4233

4334
> [!NOTE]
4435
> The CLI's Azure Resource Manager mode and Azure Service Management mode are mutually exclusive. That is, resources created in one mode cannot be managed from the other mode.
45-
>
46-
>
36+
>
4737
48-
## azure account: Manage your account information
38+
39+
## Account information
4940
Your Azure subscription information is used by the tool to connect to your account.
5041

5142
**List the imported subscriptions**
@@ -72,7 +63,7 @@ Your Azure subscription information is used by the tool to connect to your accou
7263
account env set [options] [environment]
7364
account env delete [options] [environment]
7465

75-
## azure ad: Commands to display Active Directory objects
66+
## Active Directory objects
7667
**Commands to display active directory applications**
7768

7869
ad app create [options]
@@ -99,7 +90,7 @@ Your Azure subscription information is used by the tool to connect to your accou
9990
ad user list [options]
10091
ad user show [options]
10192

102-
## azure availset: commands to manage your availability sets
93+
## Availability sets
10394
**Creates an availability set within a resource group**
10495

10596
availset create [options] <resource-group> <name> <location> [tags]
@@ -116,7 +107,7 @@ Your Azure subscription information is used by the tool to connect to your accou
116107

117108
availset delete [options] <resource-group> <name>
118109

119-
## azure config: commands to manage your local settings
110+
## Local settings
120111
**List Azure CLI configuration settings**
121112

122113
config list [options]
@@ -134,7 +125,7 @@ Your Azure subscription information is used by the tool to connect to your accou
134125
config mode [options] <modename>
135126

136127

137-
## azure feature: commands to manage account features
128+
## Account features
138129
**List all features available for your subscription**
139130

140131
feature list [options]
@@ -147,7 +138,7 @@ Your Azure subscription information is used by the tool to connect to your accou
147138

148139
feature register [options] <providerName> <featureName>
149140

150-
## azure group: Commands to manage your resource groups
141+
## Resource groups
151142
**Creates a resource group**
152143

153144
group create [options] <name> <location>
@@ -186,13 +177,14 @@ Your Azure subscription information is used by the tool to connect to your accou
186177
group template download [options] [name] [file]
187178
group template validate [options] <resource-group>
188179

189-
## azure hdinsight: Commands to manage your HDInsight clusters
180+
## HDInsight clusters
190181
**Commands to create or add to a cluster configuration file**
191182

192183
hdinsight config create [options] <configFilePath> <overwrite>
193184
hdinsight config add-config-values [options] <configFilePath>
194185
hdinsight config add-script-action [options] <configFilePath>
195186

187+
196188
Example: Create a configuration file that contains a script action to run when creating a cluster.
197189

198190
hdinsight config create "C:\myFiles\configFile.config"
@@ -304,17 +296,17 @@ Parameter options:
304296

305297
hdinsight cluster disable-rdp-access [options] <clusterName>
306298

307-
## azure insights: Commands related to monitoring Insights (events, alert rules, autoscale settings, metrics)
299+
## Insights (events, alert rules, autoscale settings, metrics)
308300
**Retrieve operation logs for a subscription, a correlationId, a resource group, resource, or resource provider**
309301

310302
insights logs list [options]
311303

312-
## azure location: Commands to get the available locations for all resource types
304+
## Locations
313305
**List the available locations**
314306

315307
location list [options]
316308

317-
## azure network: Commands to manage network resources
309+
## Network resources
318310
**Commands to manage virtual networks**
319311

320312
network vnet create [options] <resource-group> <name> <location>
@@ -1506,7 +1498,7 @@ Parameter options:
15061498

15071499
network gateway list [options] <resource-group>
15081500

1509-
## azure provider: Commands to manage resource provider registrations
1501+
## Resource provider registrations
15101502
**List currently registered providers in Resource Manager**
15111503

15121504
provider list [options]
@@ -1523,7 +1515,7 @@ Parameter options:
15231515

15241516
provider unregister [options] <namespace>
15251517

1526-
## azure resource: Commands to manage your resources
1518+
## Resources
15271519
**Creates a resource in a resource group**
15281520

15291521
resource create [options] <resource-group> <name> <resource-type> <location> <api-version>
@@ -1544,7 +1536,7 @@ Parameter options:
15441536

15451537
resource delete [options] <resource-group> <name> <resource-type> <api-version>
15461538

1547-
## azure role: Commands to manage your Azure roles
1539+
## Azure roles
15481540
**Get all available role definitions**
15491541

15501542
role list [options]
@@ -1559,7 +1551,7 @@ Parameter options:
15591551
role assignment list [options] [objectId] [upn] [mail] [spn] [role] [scope] [resource-group] [resource-type] [resource-name]
15601552
role assignment delete [options] [objectId] [upn] [mail] [spn] [role] [scope] [resource-group] [resource-type] [resource-name]
15611553

1562-
## azure storage: Commands to manage your Storage objects
1554+
## Storage objects
15631555
**Commands to manage your Storage accounts**
15641556

15651557
storage account list [options]
@@ -1682,7 +1674,7 @@ Parameter options:
16821674
storage table policy set [options] [table] [name]
16831675
storage table policy delete [options] [table] [name]
16841676

1685-
## azure tag: Commands to manage your resource manager tag
1677+
## Tags
16861678
**Add a tag**
16871679

16881680
tag create [options] <name> <value>
@@ -1699,7 +1691,7 @@ Parameter options:
16991691

17001692
tag show [options] [name]
17011693

1702-
## azure vm: Commands to manage your Azure Virtual Machines
1694+
## Virtual Machines
17031695
**Create a VM**
17041696

17051697
vm create [options] <resource-group> <name> <location> <os-type>

articles/virtual-machines/error-codes-spot.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
---
22
title: Error codes for Azure Spot VMs and scale sets instances
33
description: Learn about error codes that you could possibly see when using Spot VMs and scale set instances.
4-
services: virtual-machines-windows
54
author: cynthn
65
manager: gwallace
7-
8-
ms.service: virtual-machines-windows
6+
ms.service: virtual-machines
97
ms.workload: infrastructure-services
108
ms.topic: article
119
ms.date: 11/20/2019
1210
ms.author: cynthn
11+
#pmcontact: jagaveer
1312
---
1413

1514
# Preview: Error messages for Spot VMs and scale sets

articles/virtual-machines/linux/copy-vm.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,4 @@ az vm create --resource-group myResourceGroup \
151151

152152
## Next steps
153153

154-
To learn how to use Azure CLI to manage your new VM, see [Azure CLI commands for
155-
the Azure Resource Manager](../azure-cli-arm-commands.md).
154+
To learn how to use a [shared image gallery](shared-images.md) to manage VM images.

articles/virtual-machines/linux/manage-availability.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ ms.custom: H1Hack27Feb2017
2424

2525
Learn ways to set up and manage multiple virtual machines to ensure high availability for your Linux application in Azure. You can also [manage the availability of Windows virtual machines](../windows/manage-availability.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
2626

27-
For instructions on creating an availability set using CLI in the Resource Manager deployment model, see [azure availset: commands to manage your availability sets](../azure-cli-arm-commands.md#azure-availset-commands-to-manage-your-availability-sets).
28-
2927
[!INCLUDE [virtual-machines-common-manage-availability](../../../includes/virtual-machines-common-manage-availability.md)]
3028

3129
## Next steps

articles/virtual-machines/linux/sa-upload-vhd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ az vm create --resource-group myResourceGroup --location westus \
7676
--use-unmanaged-disk
7777
```
7878

79-
The destination storage account has to be the same as where you uploaded your virtual disk to. You also need to specify, or answer prompts for, all the additional parameters required by the **az vm create** command such as virtual network, public IP address, username, and SSH keys. You can read more about the [available CLI Resource Manager parameters](../azure-cli-arm-commands.md#azure-vm-commands-to-manage-your-azure-virtual-machines).
79+
The destination storage account has to be the same as where you uploaded your virtual disk to. You also need to specify, or answer prompts for, all the additional parameters required by the **az vm create** command such as virtual network, public IP address, username, and SSH keys. You can read more about the [available classic CLI Resource Manager parameters](../azure-cli-arm-commands.md#virtual-machines).
8080

8181
## Requirements
8282
To complete the following steps, you need:

articles/virtual-machines/linux/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
href: create-ssh-keys-detailed.md
262262
- name: Protect VMs
263263
items:
264+
- name: Disaster recovery
265+
href: ../virtual-machines-disaster-recovery-guidance.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json
264266
- name: Back up VMs
265267
href: ../../backup/backup-introduction-to-azure-backup.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json
266268
items:

articles/virtual-machines/maintenance-and-updates.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
---
2-
title: Maintenance and updates for VMs in Azure | Microsoft Docs
2+
title: Maintenance and updates
33
description: Overview of maintenance and updates for virtual machines running in Azure.
4-
services: virtual-machines
5-
documentationcenter: ''
64
author: shants123
7-
editor: ''
8-
tags: azure-resource-manager,azure-service-management
9-
105
ms.service: virtual-machines
116
ms.workload: infrastructure-services
127
ms.topic: article
138
ms.date: 11/18/2019
149
ms.author: shants
15-
10+
#pmcontact:shants
1611
---
1712
# Maintenance for virtual machines in Azure
1813

articles/virtual-machines/maintenance-control-cli.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
---
2-
title: Maintenance control for Azure virtual machines
3-
description: Learn how to control when maintenace is applied to your Azure VMs using Maintenance Control.
4-
services: virtual-machines-linux
2+
title: Maintenance control
3+
description: Learn how to control when maintenance is applied to your Azure VMs using Maintenance Control.
54
author: cynthn
6-
75
ms.service: virtual-machines
86
ms.topic: article
9-
ms.tgt_pltfrm: vm-linux
107
ms.workload: infrastructure-services
118
ms.date: 11/21/2019
129
ms.author: cynthn
10+
#pmcontact: shants
1311
---
1412

1513
# Preview: Control updates with Maintenance Control and the Azure CLI

0 commit comments

Comments
 (0)