Skip to content

Commit 103f89d

Browse files
authored
Merge pull request #285875 from MicrosoftDocs/main
8/30 11:00 AM IST Publish
2 parents 9391a5d + f3e03dc commit 103f89d

File tree

88 files changed

+544
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+544
-445
lines changed
-2.7 KB
Loading
-3.29 KB
Loading
-3.41 KB
Loading

articles/azure-resource-manager/managed-applications/update-managed-resources.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Update managed resources
33
description: Describes how to work on resources in the managed resource group for an Azure managed application.
44
ms.topic: how-to
55
ms.custom: devx-track-azurecli
6-
ms.date: 06/24/2024
6+
ms.date: 08/29/2024
77
---
88

99
# Work with resources in the managed resource group for Azure managed application
1010

11-
This article describes how to update resources that are deployed as part of a managed application. As the publisher of a managed application, you have access to the resources in the managed resource group. To update these resources, you need to find the managed resource group associated with a managed application, and access the resource in that resource group.
11+
This article describes how to update resources that are deployed as part of a managed application. As the publisher of a managed application, you have management access to resources in the managed resource group in the customer's Azure tenant. To update these resources, you need to sign in to the customer's subscription, find the managed resource group associated with a managed application, and access the resources in the managed resource group. For more information about permissions, see [Publisher and customer permissions](./overview.md#publisher-and-customer-permissions).
1212

1313
This article assumes you deployed the managed application in the [Managed Web Application (IaaS) with Azure management services](https://github.com/Azure/azure-managedapp-samples/tree/master/Managed%20Application%20Sample%20Packages/201-managed-web-app) sample project. That managed application includes a **Standard_D1_v2** virtual machine. If you didn't deploy that managed application, you can still use this article to become familiar with the steps for updating a managed resource group.
1414

@@ -26,30 +26,30 @@ In this article, you use Azure CLI to:
2626

2727
## Get managed application and managed resource group
2828

29-
To get the managed applications in a resource group, use:
29+
To get the managed applications in a resource group, use the following commands. Replace `<resourceGroupName>` with your resource group name.
3030

3131
```azurecli-interactive
32-
az managedapp list --query "[?contains(resourceGroup,'DemoApp')]"
32+
az managedapp list --query "[?contains(resourceGroup,'<resourceGroupName>')]"
3333
```
3434

3535
To get the ID of the managed resource group, use:
3636

3737
```azurecli-interactive
38-
az managedapp list --query "[?contains(resourceGroup,'DemoApp')].{ managedResourceGroup:managedResourceGroupId }"
38+
az managedapp list --query "[?contains(resourceGroup,'<resourceGroupName>')].{ managedResourceGroup:managedResourceGroupId }"
3939
```
4040

4141
## Resize VMs in managed resource group
4242

43-
To see the virtual machines in the managed resource group, provide the name of the managed resource group.
43+
To see the virtual machines in the managed resource group, provide the name of the managed resource group. Replace `<mrgName>` with your managed resource group's name.
4444

4545
```azurecli-interactive
46-
az vm list -g DemoApp6zkevchqk7sfq --query "[].{VMName:name,OSType:storageProfile.osDisk.osType,VMSize:hardwareProfile.vmSize}"
46+
az vm list -g <mrgName> --query "[].{VMName:name,OSType:storageProfile.osDisk.osType,VMSize:hardwareProfile.vmSize}"
4747
```
4848

4949
To update the size of the VMs, use:
5050

5151
```azurecli-interactive
52-
az vm resize --size Standard_D2_v2 --ids $(az vm list -g DemoApp6zkevchqk7sfq --query "[].id" -o tsv)
52+
az vm resize --size Standard_D2_v2 --ids $(az vm list -g <mrgName> --query "[].id" -o tsv)
5353
```
5454

5555
After the operation completes, verify the application is running on Standard D2 v2.
@@ -58,10 +58,10 @@ After the operation completes, verify the application is running on Standard D2
5858

5959
## Apply policy to managed resource group
6060

61-
Get the managed resource group and assignment a policy at that scope. The policy **e56962a6-4747-49cd-b67b-bf8b01975c4c** is a built-in policy for specifying allowed locations.
61+
Get the managed resource group and assign a policy at that scope. The policy **e56962a6-4747-49cd-b67b-bf8b01975c4c** is a built-in policy to specify allowed locations.
6262

6363
```azurecli-interactive
64-
managedGroup=$(az managedapp show --name <app-name> --resource-group DemoApp --query managedResourceGroupId --output tsv)
64+
managedGroup=$(az managedapp show --name <app-name> --resource-group <resourceGroupName> --query managedResourceGroupId --output tsv)
6565
6666
az policy assignment create --name locationAssignment --policy e56962a6-4747-49cd-b67b-bf8b01975c4c --scope $managedGroup --params '{
6767
"listofallowedLocations": {
@@ -85,5 +85,5 @@ The policy assignment appears in the portal.
8585

8686
## Next steps
8787

88-
- For an introduction to managed applications, see [Managed application overview](overview.md).
88+
- For an introduction to managed applications, see [Azure Managed Applications overview](overview.md).
8989
- For sample projects, see [Sample projects for Azure managed applications](sample-projects.md).

articles/cdn/cdn-purge-endpoint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This guide walks you through purging assets from all edge nodes of an endpoint.
4747
3. **Root domain purge**: Purge the root of the endpoint with "/" in the path.
4848

4949
> [!TIP]
50-
> 1. Paths must be specified for purge and must be a relative URL that fit the following [RFC 3986 - Uniform Resource Identifier (URI: Generic Syntax](https://datatracker.ietf.org/doc/html/rfc3986#section-3.3).
50+
> 1. Paths must be specified for purge and must be a relative URL that fit the following [RFC 3986 - Uniform Resource Identifier (URI): Generic Syntax](https://datatracker.ietf.org/doc/html/rfc3986#section-3.3).
5151
>
5252
> 1. In Azure CDN from Microsoft, query strings in the purge URL path are not considered. If the path to purge is provided as `/TestCDN?myname=max`, only `/TestCDN` is considered. The query string `myname=max` is omitted. Both `TestCDN?myname=max` and `TestCDN?myname=clark` will be purged.
5353

articles/cost-management-billing/reservations/understand-suse-reservation-charges.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ For example, if your usage has product **Red Hat Enterprise Linux - 1-4 vCPU VM
3838

3939
Get the product name from your usage data and buy the SUSE plan with the same type and size.
4040

41-
For example, if your usage is for product **SUSE Linux Enterprise Server Priority - 2-4 vCPU VM Support**, you should purchase **SUSE Linux Enterprise Server Priority** for **2-4 vCPU**.
42-
43-
:::image type="content" border="true" source="./media/understand-suse-reservation-charges/select-suse-linux-enterprise-server-priority-2-4-vcpu.png" alt-text="Screenshot that shows selecting the product to purchase.":::
41+
For example, if your usage is for product **SUSE for SAP Linux Enterprise Server** **- 2-4 vCPU VM Support**, you should purchase **SUSE for SAP Linux Enterprise Server** for **2-4 vCPU**.
4442

4543
## Discount applies to different VM sizes for SUSE plans
4644

@@ -68,13 +66,13 @@ The following tables show the software plans you can buy a reservation for, thei
6866
|SUSE Linux Enterprise Server for HPC 3-4 vCPUs|4ed70d2d-e2bb-4dcd-b6fa-42da71861a1c|1.92308|D4s_v3|
6967
|SUSE Linux Enterprise Server for HPC 5+ vCPUs |907a85de-024f-4dd6-969c-347d47a1bdff|2.92308|D8s_v3|
7068

71-
### SUSE Linux Enterprise Server for SAP applications
69+
### SUSE for SAP Linux Enterprise Server
7270

7371
|SUSE VM | MeterId | Ratio|Example VM size|
7472
| ------- |------------------------| --- | --- |
75-
|SUSE Linux Enterprise Server for SAP applications 1-2 vCPUs|497fe0b6-fa3c-4e3d-a66b-836097244142|1|D2s_v3|
76-
|SUSE Linux Enterprise Server for SAP applications 3-4 vCPUs |847887de-68ce-4adc-8a33-7a3f4133312f|2|D4s_v3|
77-
|SUSE Linux Enterprise Server for SAP applications 5+ vCPUs |18ae79cd-dfce-48c9-897b-ebd3053c6058|2.41176|D8s_v3|
73+
|SUSE for SAP Linux Enterprise Server 1-2 vCPUs|797618eb-cecb-59e7-a10e-1ee1e4e62d32|1|D2s_v3|
74+
|SUSE for SAP Linux Enterprise Server 3-4 vCPUs |1c0fb48a-e518-53c2-ab56-6feddadbb9a3|2|D4s_v3|
75+
|SUSE for SAP Linux Enterprise Server 5+ vCPUs |3ce5649c-142b-5a59-9b2a-6889da9b56f5|2.41176|D8s_v3|
7876

7977
### SUSE Linux Enterprise Server
8078

articles/dns/dns-operations-recordsets-cli.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ The record set name given must be a *relative* name, meaning it must exclude the
4545

4646
If a new record set is created, a default time-to-live (TTL) of 3600 is used. For instructions on how to use different TTLs, see [Create a DNS record set](#create-a-dns-record-set).
4747

48-
The following example creates an A record called *www* in the zone *contoso.com* in the resource group *MyResourceGroup*. The IP address of the A record is *1.2.3.4*.
48+
The following example creates an A record called *www* in the zone *contoso.com* in the resource group *MyResourceGroup*. The IP address of the A record is *203.0.113.11*.
4949

5050
```azurecli-interactive
51-
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 1.2.3.4
51+
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 203.0.113.11
5252
```
5353

5454
To create a record set in the apex of the zone (in this case, "contoso.com"), use the record name "\@", including the quotation marks:
5555

5656
```azurecli-interactive
57-
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "@" --ipv4-address 1.2.3.4
57+
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "@" --ipv4-address 203.0.113.11
5858
```
5959

6060
## Create a DNS record set
@@ -92,7 +92,7 @@ There's no example for create an SOA record set, since SOAs are created and dele
9292
### Create an AAAA record
9393

9494
```azurecli-interactive
95-
az network dns record-set aaaa add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name test-aaaa --ipv6-address 2607:f8b0:4009:1803::1005
95+
az network dns record-set aaaa add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name test-aaaa --ipv6-address FD00::1
9696
```
9797

9898
### Create a CAA record
@@ -123,7 +123,7 @@ az network dns record-set mx add-record --resource-group myresourcegroup --zone-
123123
### Create an NS record
124124

125125
```azurecli-interactive
126-
az network dns record-set ns add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name test-ns --nsdname ns1.contoso.com
126+
az network dns record-set ns add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name test-ns --nsdname ns1.fabrikam.com
127127
```
128128

129129
### Create a PTR record
@@ -192,10 +192,10 @@ This command deletes a DNS record from a record set. If the last record in a rec
192192

193193
When you use the `az network dns record-set <record-type> add-record` command, you need to specify the record getting deleted and the zone to delete from. These parameters are described in [Create a DNS record](#create-a-dns-record) and [Create records of other types](#create-records-of-other-types) above.
194194

195-
The following example deletes the A record with value '1.2.3.4' from the record set named *www* in the zone *contoso.com*, in the resource group *MyResourceGroup*.
195+
The following example deletes the A record with value '203.0.113.11' from the record set named *www* in the zone *contoso.com*, in the resource group *MyResourceGroup*.
196196

197197
```azurecli-interactive
198-
az network dns record-set a remove-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "www" --ipv4-address 1.2.3.4
198+
az network dns record-set a remove-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "www" --ipv4-address 203.0.113.11
199199
```
200200

201201
## Modify an existing record set
@@ -206,11 +206,11 @@ Each record set contains a [time-to-live (TTL)](dns-zones-records.md#time-to-liv
206206

207207
To modify an existing record of type A, AAAA, CAA, MX, NS, PTR, SRV, or TXT, you should first add a new record and then delete the existing record. For detailed instructions on how to delete and add records, see the earlier sections of this article.
208208

209-
The following example shows how to modify an 'A' record, from IP address 1.2.3.4 to IP address 5.6.7.8:
209+
The following example shows how to modify an 'A' record, from IP address 203.0.113.11 to IP address 203.0.113.22:
210210

211211
```azurecli-interactive
212-
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 5.6.7.8
213-
az network dns record-set a remove-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 1.2.3.4
212+
az network dns record-set a add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 203.0.113.22
213+
az network dns record-set a remove-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name www --ipv4-address 203.0.113.11
214214
```
215215

216216
You can't add, remove, or modify the records in the automatically created NS record set at the zone apex (`--Name "@"`, including quote marks). For this record set, the only changes permitted are to modify the record set TTL and metadata.
@@ -250,7 +250,7 @@ This restriction applies only to the NS record set at the zone apex. Other NS re
250250
The following example shows how to add another name server to the NS record set at the zone apex:
251251

252252
```azurecli-interactive
253-
az network dns record-set ns add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "@" --nsdname ns1.myotherdnsprovider.com
253+
az network dns record-set ns add-record --resource-group myresourcegroup --zone-name contoso.com --record-set-name "@" --nsdname ns1.fabrikam.com
254254
```
255255

256256
### To modify the TTL of an existing record set

articles/energy-data-services/how-to-set-up-private-links.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ You can connect to an Azure Data Manager for Energy instance that's configured w
1919

2020
This article describes how to set up a private endpoint for Azure Data Manager for Energy.
2121

22+
> [!NOTE]
23+
> To enable private endpoint, public access must be disabled for Azure Data Manager for Energy. If public access is enabled and private endpoint is created, the instance will only be accessed via private endpoint and not by public access.
24+
2225
> [!NOTE]
2326
> Terraform currently does not support private endpoint creation for Azure Data Manager for Energy.
2427

0 commit comments

Comments
 (0)