Skip to content

Commit 19c1ceb

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-cases
2 parents 5f67a70 + f3c5990 commit 19c1ceb

File tree

6 files changed

+25
-40
lines changed

6 files changed

+25
-40
lines changed

articles/azure-video-indexer/accounts-overview.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ The first time you visit the [www.videoindexer.ai/](https://www.videoindexer.ai/
1616

1717
With a trial, account Azure Video Indexer provides up to 600 minutes of free indexing to users and up to 2400 minutes of free indexing to users that subscribe to the Azure Video Indexer API on the [developer portal](https://aka.ms/avam-dev-portal).
1818

19-
> [!NOTE]
20-
> The trial account is not available on the Azure Government cloud.
19+
The trial account is not available on the Azure Government cloud. For other Azure Government limitations, see [Limitations of Azure Video Indexer on Azure Government](connect-to-azure.md#limitations-of-azure-video-indexer-on-azure-government).
2120

2221
You can later create a paid account where you're not limited by the quota. Two types of paid accounts are available to you: Azure Resource Manager (ARM) (currently in preview) and classic (generally available). The main difference between the two is account management platform. While classic accounts are built on the API Management, ARM-based accounts management is built on Azure, which enables apply access control to all services with role-based access control (Azure RBAC) natively.
2322

articles/azure-video-indexer/compare-video-indexer-with-media-services-presets.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: juliako
99

1010
# Compare Azure Media Services v3 presets and Azure Video Indexer
1111

12-
This article compares the capabilities of **Azure Video Indexer APIs** and **Media Services v3 APIs**.
12+
This article compares the capabilities of **Azure Video Indexer(AVI) APIs** and **Media Services v3 APIs**.
1313

1414
Currently, there is an overlap between features offered by the [Azure Video Indexer APIs](https://api-portal.videoindexer.ai/) and the [Media Services v3 APIs](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json). The following table offers the current guideline for understanding the differences and similarities.
1515

@@ -19,9 +19,9 @@ Currently, there is an overlap between features offered by the [Azure Video Inde
1919
|---|---|---|
2020
|Media Insights|[Enhanced](video-indexer-output-json-v2.md) |[Fundamentals](/azure/media-services/latest/analyze-video-audio-files-concept)|
2121
|Experiences|See the full list of supported features: <br/> [Overview](video-indexer-overview.md)|Returns video insights only|
22-
|Billing|[Media Services pricing](https://azure.microsoft.com/pricing/details/media-services/#analytics) |[Media Services pricing](https://azure.microsoft.com/pricing/details/media-services/#analytics) |
22+
|Pricing|[AVI pricing](https://azure.microsoft.com/pricing/details/video-indexer/) |[Media Services pricing](https://azure.microsoft.com/pricing/details/media-services/#analytics) |
2323
|Compliance|For the most current compliance updates, visit [Azure Compliance Offerings.pdf](https://gallery.technet.microsoft.com/Overview-of-Azure-c1be3942/file/178110/23/Microsoft%20Azure%20Compliance%20Offerings.pdf) and search for "Azure Video Indexer" to see if it complies with a certificate of interest.|For the most current compliance updates, visit [Azure Compliance Offerings.pdf](https://gallery.technet.microsoft.com/Overview-of-Azure-c1be3942/file/178110/23/Microsoft%20Azure%20Compliance%20Offerings.pdf) and search for "Media Services" to see if it complies with a certificate of interest.|
24-
|Free Trial|East US|Not available|
24+
|Trial|East US|Not available|
2525
|Region availability|See [Cognitive Services availability by region](https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services)|See [Media Services availability by region](https://azure.microsoft.com/global-infrastructure/services/?products=media-services).|
2626

2727
## Next steps

articles/iot-hub/iot-hub-create-using-powershell.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ ms.custom: devx-track-azurepowershell
1818

1919
You can use Azure PowerShell cmdlets to create and manage Azure IoT hubs. This tutorial shows you how to create an IoT hub with PowerShell.
2020

21-
To complete this how-to, you need an Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2221

2322
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
2423

2524
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
2625

2726
## Connect to your Azure subscription
2827

29-
If you are using the Cloud Shell, you are already logged in to your subscription. If you are running PowerShell locally instead, enter the following command to sign in to your Azure subscription:
28+
If you're using the Cloud Shell, you're already logged in to your subscription. If you're running PowerShell locally instead, enter the following command to sign in to your Azure subscription:
3029

3130
```powershell
3231
# Log into Azure account.
@@ -59,42 +58,42 @@ The name of the IoT hub must be globally unique.
5958

6059
[!INCLUDE [iot-hub-pii-note-naming-hub](../../includes/iot-hub-pii-note-naming-hub.md)]
6160

62-
You can list all the IoT hubs in your subscription using the [Get-AzIotHub](/powershell/module/az.IotHub/Get-azIotHub) command:
61+
To list all the IoT hubs in your subscription, use the [Get-AzIotHub](/powershell/module/az.IotHub/Get-azIotHub) command.
62+
63+
This example shows the S1 Standard IoT Hub you created in the previous step.
6364

6465
```azurepowershell-interactive
6566
Get-AzIotHub
6667
```
6768

68-
This example shows the S1 Standard IoT Hub you created in the previous step.
69-
70-
You can delete the IoT hub using the [Remove-AzIotHub](/powershell/module/az.iothub/remove-aziothub) command:
69+
To delete the IoT hub, use the [Remove-AzIotHub](/powershell/module/az.iothub/remove-aziothub) command.
7170

7271
```azurepowershell-interactive
7372
Remove-AzIotHub `
7473
-ResourceGroupName MyIoTRG1 `
7574
-Name MyTestIoTHub
7675
```
7776

78-
Alternatively, you can remove a resource group and all the resources it contains using the [Remove-AzResourceGroup](/powershell/module/az.Resources/Remove-azResourceGroup) command:
77+
Alternatively, to remove a resource group and all the resources it contains, use the [Remove-AzResourceGroup](/powershell/module/az.Resources/Remove-azResourceGroup) command:
7978

8079
```azurepowershell-interactive
8180
Remove-AzResourceGroup -Name MyIoTRG1
8281
```
8382

8483
## Next steps
8584

86-
Now you have deployed an IoT hub using a PowerShell cmdlet, if you want to explore further, check out the following articles:
85+
Now that you've deployed an IoT hub using a PowerShell cmdlet, explore more articles:
8786

8887
* [PowerShell cmdlets for working with your IoT hub](/powershell/module/az.iothub/).
8988

9089
* [IoT Hub resource provider REST API](/rest/api/iothub/iothubresource).
9190

92-
To learn more about developing for IoT Hub, see the following articles:
91+
Develop for IoT Hub:
9392

9493
* [Introduction to C SDK](iot-hub-device-sdk-c-intro.md)
9594

9695
* [Azure IoT SDKs](iot-hub-devguide-sdks.md)
9796

98-
To further explore the capabilities of IoT Hub, see:
97+
Explore the capabilities of IoT Hub:
9998

10099
* [Deploying AI to edge devices with Azure IoT Edge](../iot-edge/quickstart-linux.md)

articles/virtual-machines/workloads/sap/high-availability-guide-rhel-netapp-files.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
---
22
title: Azure VMs high availability for SAP NW on RHEL with Azure NetApp Files| Microsoft Docs
33
description: Establish high availability for SAP NW on Azure virtual machines (VMs) RHEL with Azure NetApp Files.
4-
services: virtual-machines-windows,virtual-network,storage
5-
documentationcenter: saponazure
64
author: rdeltcheva
75
manager: juergent
8-
editor: ''
96
tags: azure-resource-manager
10-
keywords: ''
117
ms.service: virtual-machines-sap
128
ms.topic: article
13-
ms.tgt_pltfrm: vm-windows
149
ms.workload: infrastructure-services
15-
ms.date: 06/08/2022
10+
ms.date: 08/24/2022
1611
ms.author: radeltch
17-
1812
---
1913

2014
# Azure Virtual Machines high availability for SAP NetWeaver on Red Hat Enterprise Linux with Azure NetApp Files for SAP applications
@@ -599,7 +593,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
599593
600594
1. **[A]** Update the /usr/sap/sapservices file
601595
602-
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file. Do not comment out the SAP HANA instance if it will be used with HANA SR.
596+
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file.
603597
604598
```
605599
sudo vi /usr/sap/sapservices
@@ -611,7 +605,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
611605
# LD_LIBRARY_PATH=/usr/sap/QAS/ERS01/exe:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; /usr/sap/QAS/ERS01/exe/sapstartsrv pf=/usr/sap/QAS/ERS01/profile/QAS_ERS01_anftstsapers -D -u qasadm
612606
```
613607
614-
1. **[1]** Create the SAP cluster resources
608+
2. **[1]** Create the SAP cluster resources
615609
616610
If using enqueue server 1 architecture (ENSA1), define the resources as follows:
617611
@@ -739,7 +733,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
739733
# rsc_sap_QAS_ERS01 (ocf::heartbeat:SAPInstance): Started anftstsapcl1
740734
```
741735

742-
1. **[A]** Add firewall rules for ASCS and ERS on both nodes
736+
3. **[A]** Add firewall rules for ASCS and ERS on both nodes
743737
Add the firewall rules for ASCS and ERS on both nodes.
744738
```
745739
# Probe Port of ASCS
@@ -1284,6 +1278,7 @@ Follow these steps to install an SAP application server.
12841278

12851279
## Next steps
12861280

1281+
* To deploy cost optimization scenario where PAS and AAS instance is deployed with SAP NetWeaver HA cluster on RHEL, see [Install SAP Dialog Instance with SAP ASCS/SCS high availability VMs on RHEL](high-availability-guide-rhel-with-dialog-instance.md)
12871282
* [HA for SAP NW on Azure VMs on RHEL for SAP applications multi-SID guide](./high-availability-guide-rhel-multi-sid.md)
12881283
* [Azure Virtual Machines planning and implementation for SAP][planning-guide]
12891284
* [Azure Virtual Machines deployment for SAP][deployment-guide]

articles/virtual-machines/workloads/sap/high-availability-guide-rhel-nfs-azure-files.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
---
22
title: Azure VMs high availability for SAP NW on RHEL with NFS on Azure Files| Microsoft Docs
33
description: Establish high availability for SAP NW on Azure virtual machines (VMs) RHEL with NFS on Azure Files.
4-
services: virtual-machines-windows,virtual-network,storage
5-
documentationcenter: saponazure
64
author: rdeltcheva
75
manager: juergent
86
tags: azure-resource-manager
97
ms.service: virtual-machines-sap
108
ms.topic: tutorial
11-
ms.tgt_pltfrm: vm-windows
129
ms.workload: infrastructure-services
13-
ms.date: 03/28/2022
10+
ms.date: 08/24/2022
1411
ms.author: radeltch
15-
1612
---
1713

1814
# High availability for SAP NetWeaver on Azure VMs on Red Hat Enterprise Linux with NFS on Azure Files
@@ -585,7 +581,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
585581

586582
1. **[A]** Update the /usr/sap/sapservices file
587583

588-
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file. Do not comment out the SAP HANA instance if it will be used with HANA SR.
584+
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file.
589585

590586
```bash
591587
sudo vi /usr/sap/sapservices
@@ -868,6 +864,7 @@ Thoroughly test your Pacemaker cluster. [Execute the typical failover tests](./h
868864

869865
## Next steps
870866

867+
* To deploy cost optimization scenario where PAS and AAS instance is deployed with SAP NetWeaver HA cluster on RHEL, see [Install SAP Dialog Instance with SAP ASCS/SCS high availability VMs on RHEL](high-availability-guide-rhel-with-dialog-instance.md)
871868
* [HA for SAP NW on Azure VMs on RHEL for SAP applications multi-SID guide](./high-availability-guide-rhel-multi-sid.md)
872869
* [Azure Virtual Machines planning and implementation for SAP][planning-guide]
873870
* [Azure Virtual Machines deployment for SAP][deployment-guide]

articles/virtual-machines/workloads/sap/high-availability-guide-rhel.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
---
22
title: Azure VMs high availability for SAP NW on RHEL | Microsoft Docs
33
description: Azure Virtual Machines high availability for SAP NetWeaver on Red Hat Enterprise Linux
4-
services: virtual-machines-windows,virtual-network,storage
5-
documentationcenter: saponazure
64
author: rdeltcheva
75
manager: juergent
8-
editor: ''
96
tags: azure-resource-manager
10-
keywords: ''
117
ms.service: virtual-machines-sap
128
ms.topic: article
13-
ms.tgt_pltfrm: vm-windows
149
ms.workload: infrastructure-services
15-
ms.date: 03/28/2022
10+
ms.date: 08/24/2022
1611
ms.author: radeltch
17-
1812
---
1913

2014
# Azure Virtual Machines high availability for SAP NetWeaver on Red Hat Enterprise Linux
@@ -481,7 +475,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
481475

482476
1. **[A]** Update the /usr/sap/sapservices file
483477

484-
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file. Do not comment out the SAP HANA instance if it will be used with HANA SR.
478+
To prevent the start of the instances by the sapinit startup script, all instances managed by Pacemaker must be commented out from /usr/sap/sapservices file.
485479

486480
<pre><code>
487481
sudo vi /usr/sap/sapservices
@@ -493,7 +487,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
493487
# LD_LIBRARY_PATH=/usr/sap/<b>NW1</b>/ERS<b>02</b>/exe:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; /usr/sap/<b>NW1</b>/ERS<b>02</b>/exe/sapstartsrv pf=/usr/sap/<b>NW1</b>/ERS<b>02</b>/profile/<b>NW1</b>_ERS<b>02</b>_<b>nw1-aers</b> -D -u <b>nw1</b>adm
494488
</code></pre>
495489

496-
1. **[1]** Create the SAP cluster resources
490+
2. **[1]** Create the SAP cluster resources
497491

498492
If using enqueue server 1 architecture (ENSA1), define the resources as follows:
499493

@@ -1036,6 +1030,7 @@ Follow these steps to install an SAP application server.
10361030

10371031
## Next steps
10381032

1033+
* To deploy cost optimization scenario where PAS and AAS instance is deployed with SAP NetWeaver HA cluster on RHEL, see [Install SAP Dialog Instance with SAP ASCS/SCS high availability VMs on RHEL](high-availability-guide-rhel-with-dialog-instance.md)
10391034
* [HA for SAP NW on Azure VMs on RHEL for SAP applications multi-SID guide](./high-availability-guide-rhel-multi-sid.md)
10401035
* [Azure Virtual Machines planning and implementation for SAP][planning-guide]
10411036
* [Azure Virtual Machines deployment for SAP][deployment-guide]

0 commit comments

Comments
 (0)