Skip to content

Commit 42547b9

Browse files
authored
Merge pull request #235647 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents d7396d3 + c5b795b commit 42547b9

File tree

11 files changed

+61
-45
lines changed

11 files changed

+61
-45
lines changed

articles/active-directory/hybrid/migrate-from-federation-to-cloud-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Modern authentication clients (Office 2016 and Office 2013, iOS, and Android app
9494
9595
To plan for rollback, use the [documented current federation settings](#document-current-federation-settings) and check the [federation design and deployment documentation](/windows-server/identity/ad-fs/deployment/windows-server-2012-r2-ad-fs-deployment-guide).
9696
97-
The rollback process should include converting managed domains to federated domains by using the [Convert-MSOLDomainToFederated](/powershell/module/microsoft.graph.identity.directorymanagement/new-mgdomainfederationconfiguration?view=graph-powershell-1.0&preserve-view=true) cmdlet. If necessary, configuring extra claims rules.
97+
The rollback process should include converting managed domains to federated domains by using the [New-MgDomainFederationConfiguration](/powershell/module/microsoft.graph.identity.directorymanagement/new-mgdomainfederationconfiguration?view=graph-powershell-1.0&preserve-view=true) cmdlet. If necessary, configuring extra claims rules.
9898
9999
## Migration considerations
100100

articles/advisor/advisor-reference-cost-recommendations.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,18 @@ Apache Spark for Azure Synapse Analytics pool's Autoscale feature automatically
316316

317317
Learn more about [Synapse workspace - EnableSynapseSparkComputeAutoScaleGuidance (Consider enabling autoscale feature on spark compute.)](https://aka.ms/EnableSynapseSparkComputeAutoScaleGuidance).
318318

319+
## Web
320+
321+
### Right-size underutilized App Service plans
322+
323+
We've analyzed the usage patterns of your app service plan over the past 7 days and identified low CPU usage. While certain scenarios can result in low utilization by design, you can often save money by choosing a less expensive SKU while retaining the same features.
324+
325+
> [!NOTE]
326+
> - Currently, this recommendation only works for App Service plans running on Windows on a SKU that allows you to downscale to less expensive tiers without losing any features, like from P3v2 to P2v2 or from P2v2 to P1v2.
327+
> - CPU bursts that last only a few minutes might not be correctly detected. Please perform a careful analysis in your App Service plan metrics blade before downscaling your SKU.
328+
329+
Learn more about [App Service plans](../app-service/overview-hosting-plans.md).
330+
319331
## Azure Monitor
320332

321333
For Azure Monitor cost optimization suggestions, please see [Optimize costs in Azure Monitor](../azure-monitor/best-practices-cost.md).

articles/azure-functions/functions-run-local.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ curl --request POST -H "Content-Type:application/json" --data "{'input':'sample
492492
```
493493
---
494494

495+
The administrator endpoint also provides a list of all (HTTP triggered and non-HTTP triggered) functions on `http://localhost:{port}/admin/functions/`.
496+
495497
When you call an administrator endpoint on your function app in Azure, you must provide an access key. To learn more, see [Function access keys](functions-bindings-http-webhook-trigger.md#authorization-keys).
496498

497499
## <a name="publish"></a>Publish to Azure

articles/azure-maps/how-to-use-indoor-module-ios.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ services: azure-maps
1313

1414
The Azure Maps iOS SDK allows you to render indoor maps created in Azure Maps Creator services.
1515

16-
> [!NOTE]
17-
> The iOS SDK will support *dynamic styling* in a future release, coming soon!
18-
1916
## Prerequisites
2017

21-
1. Be sure to complete the steps in the [Quickstart: Create an iOS app](quick-ios-app.md). Code blocks in this article can be inserted into the `viewDidLoad` function of `ViewController`.
22-
1. [Create a Creator resource](how-to-manage-creator.md)
23-
1. Get a `tilesetId` by completing the [tutorial for creating Indoor maps](tutorial-creator-indoor-maps.md). You'll use this identifier to render indoor maps with the Azure Maps iOS SDK.
18+
1. Complete the steps in the [Quickstart: Create an iOS app]. Code blocks in this article can be inserted into the `viewDidLoad` function of `ViewController`.
19+
1. A [Creator resource]
20+
1. Get a `tilesetId` by completing the [Tutorial: Use Creator to create indoor maps]. The tileset ID is used to render indoor maps with the Azure Maps iOS SDK.
2421

2522
## Instantiate the indoor manager
2623

@@ -74,11 +71,17 @@ func indoorManager(
7471

7572
## Example
7673

77-
The screenshot below shows the above code displaying an indoor map.
74+
The following screenshot shows the above code displaying an indoor map.
7875

7976
![A screenshot that displays an indoor map created using the above sample code.](./media/ios-sdk/indoor-maps/indoor.png)
8077

8178
## Additional information
8279

83-
- [Creator for indoor maps](creator-indoor-maps.md)
84-
- [Drawing package requirements](drawing-requirements.md)
80+
- [Creator for indoor maps]
81+
- [Drawing package requirements]
82+
83+
[Quickstart: Create an iOS app]: quick-ios-app.md
84+
[Creator resource]: how-to-manage-creator.md
85+
[Tutorial: Use Creator to create indoor maps]: tutorial-creator-indoor-maps.md
86+
[Creator for indoor maps]: creator-indoor-maps.md
87+
[Drawing package requirements]: drawing-requirements.md

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To understand the number of Application Insights resources required to cover you
3434

3535
## How do I use Application Insights?
3636

37-
Application Insights is enabled through either [autoinstrumentation](codeless-overview.md) (agent) or by adding the [Application Insights SDK](sdk-support-guidance.md) to your application code. [Many languages](platforms.md) are supported. The applications could be on Azure, on-premises, or hosted by another cloud. To figure out which type of instrumentation is best for you, see [How do I instrument an application?](#how-do-i-instrument-an-application).
37+
Application Insights is enabled through either [autoinstrumentation](codeless-overview.md) (agent) or by adding the [Application Insights SDK](sdk-support-guidance.md) to your application code. [Many languages](#supported-languages) are supported. The applications could be on Azure, on-premises, or hosted by another cloud. To figure out which type of instrumentation is best for you, see [How do I instrument an application?](#how-do-i-instrument-an-application).
3838

3939
The Application Insights agent or SDK preprocesses telemetry and metrics before sending the data to Azure. Then it's ingested and processed further before it's stored in Azure Monitor Logs (Log Analytics). For this reason, an Azure account is required to use Application Insights.
4040

@@ -192,4 +192,4 @@ Leave product feedback for the engineering team in the [Feedback Community](http
192192
- [Autoinstrumentation overview](codeless-overview.md)
193193
- [Overview dashboard](overview-dashboard.md)
194194
- [Availability overview](availability-overview.md)
195-
- [Application Map](app-map.md)
195+
- [Application Map](app-map.md)

articles/azure-resource-manager/bicep/user-defined-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' = {
218218

219219
## Next steps
220220

221-
- For a list of the Bicep date types, see [Data types](./data-types.md).
221+
- For a list of the Bicep data types, see [Data types](./data-types.md).

articles/backup/azure-kubernetes-service-cluster-manage-backups.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage Azure Kubernetes Service (AKS) backups using Azure Backup
33
description: This article explains how to manage Azure Kubernetes Service (AKS) backups using Azure Backup.
44
ms.topic: how-to
55
ms.service: backup
6-
ms.date: 03/27/2023
6+
ms.date: 04/21/2023
77
author: jyothisuri
88
ms.author: jsuri
99
---
@@ -82,23 +82,23 @@ This section provides the set of Azure CLI commands to perform create, update, o
8282
To install the Backup Extension, run the following command:
8383

8484
```azurecli-interactive
85-
az k8s-extension create --name azure-aks-backup --extension-type Microsoft.DataProtection.Kubernetes --scope cluster --cluster-type managedClusters --cluster-name aksclustername --resource-group aksclusterrg --release-train stable --configuration-settings blobContainer=containername storageAccount=storageaccountname storageAccountResourceGroup=storageaccountrg storageAccountSubscriptionId=subscriptionid
85+
az k8s-extension create --name azure-aks-backup --extension-type Microsoft.DataProtection.Kubernetes --scope cluster --cluster-type managedClusters --cluster-name <aksclustername> --resource-group <aksclusterrg> --release-train stable --configuration-settings blobContainer=<containername> storageAccount=<storageaccountname> storageAccountResourceGroup=<storageaccountrg> storageAccountSubscriptionId=<subscriptionid>
8686
```
8787

8888
### View Backup Extension installation status
8989

9090
To view the progress of Backup Extension installation, use the following command:
9191

9292
```azurecli-interactive
93-
az k8s-extension show --name azure-aks-backup --cluster-type managedClusters --cluster-name aksclustername --resource-group aksclusterrg
93+
az k8s-extension show --name azure-aks-backup --cluster-type managedClusters --cluster-name <aksclustername> --resource-group <aksclusterrg>
9494
```
9595

9696
### Update resources in Backup Extension
9797

9898
To update blob container, CPU, and memory in the Backup Extension, use the following command:
9999

100100
```azurecli-interactive
101-
az k8s-extension update --name azure-aks-backup --cluster-type managedClusters --cluster-name aksclustername --resource-group aksclusterrg --release-train stable --configuration-settings [blobContainer=containername storageAccount=storageaccountname storageAccountResourceGroup=storageaccountrg storageAccountSubscriptionId=subscriptionid] [cpuLimit=1] [memoryLimit=1Gi]
101+
az k8s-extension update --name azure-aks-backup --cluster-type managedClusters --cluster-name <aksclustername> --resource-group <aksclusterrg> --release-train stable --configuration-settings [blobContainer=<containername> storageAccount=<storageaccountname> storageAccountResourceGroup=<storageaccountrg> storageAccountSubscriptionId=<subscriptionid>] [cpuLimit=1] [memoryLimit=1Gi]
102102
103103
[]: denotes the 3 different sub-groups of updates possible (discard the brackets while using the command)
104104
@@ -109,15 +109,15 @@ To update blob container, CPU, and memory in the Backup Extension, use the follo
109109
To stop the Backup Extension install operation, use the following command:
110110

111111
```azurecli-interactive
112-
az k8s-extension delete --name azure-aks-backup --cluster-type managedClusters --cluster-name aksclustername --resource-group aksclusterrg
112+
az k8s-extension delete --name azure-aks-backup --cluster-type managedClusters --cluster-name <aksclustername> --resource-group <aksclusterrg>
113113
```
114114

115115
### Grant permission on storage account
116116

117117
To provide *Storage Account Contributor Permission* to the Extension Identity on storage account, run the following command:
118118

119119
```azurecli-interactive
120-
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name aksclustername --resource-group aksclusterresourcegroup --cluster-type managedClusters --query aksAssignedIdentity.principalId --output tsv) --role 'Storage Account Contributor' --scope /subscriptions/subscriptionid/resourceGroups/storageaccountresourcegroup/providers/Microsoft.Storage/storageAccounts/storageaccountname
120+
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name <aksclustername> --resource-group <aksclusterrg> --cluster-type managedClusters --query identity.principalId --output tsv) --role 'Storage Account Contributor' --scope /subscriptions/<subscriptionid>/resourceGroups/<storageaccountrg>/providers/Microsoft.Storage/storageAccounts/<storageaccountname>
121121
```
122122

123123

@@ -127,12 +127,11 @@ To enable Trusted Access between Backup vault and AKS cluster, use the following
127127

128128
```azurecli-interactive
129129
az aks trustedaccess rolebinding create \
130-
-g $myResourceGroup \
131-
--cluster-name $myAKSCluster
132-
–n <randomRoleBindingName> \
133-
-s <vaultID> \
130+
--resource-group <backupvaultrg> \
131+
--cluster-name <aksclustername> \
132+
--name <randomRoleBindingName> \
133+
--source-resource-id /subscriptions/<subscriptionid>/resourcegroups/<backupvaultrg>/providers/Microsoft.DataProtection/BackupVaults/<backupvaultname> \
134134
--roles Microsoft.DataProtection/backupVaults/backup-operator
135-
136135
```
137136

138137
Learn more about [other commands related to Trusted Access](../aks/trusted-access-feature.md#trusted-access-feature-overview).
@@ -141,4 +140,4 @@ Learn more about [other commands related to Trusted Access](../aks/trusted-acces
141140

142141
- [Back up Azure Kubernetes Service cluster (preview)](azure-kubernetes-service-cluster-backup.md)
143142
- [Restore Azure Kubernetes Service cluster (preview)](azure-kubernetes-service-cluster-restore.md)
144-
- [Supported scenarios for backing up Azure Kubernetes Service cluster (preview)](azure-kubernetes-service-cluster-backup-support-matrix.md)
143+
- [Supported scenarios for backing up Azure Kubernetes Service cluster (preview)](azure-kubernetes-service-cluster-backup-support-matrix.md)

articles/devtest-labs/devtest-lab-integrate-ci-cd.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,10 @@ $labVmRgName = (Get-AzResource -Id $labVmComputeId).ResourceGroupName
7070
$labVmName = (Get-AzResource -Id $labVmId).Name
7171
7272
# Get lab VM public IP address
73-
$labVMIpAddress = (Get-AzPublicIpAddress -ResourceGroupName $labVmRgName
74-
-Name $labVmName).IpAddress
73+
$labVMIpAddress = (Get-AzPublicIpAddress -ResourceGroupName $labVmRgName -Name $labVmName).IpAddress
7574
7675
# Get lab VM FQDN
77-
$labVMFqdn = (Get-AzPublicIpAddress -ResourceGroupName $labVmRgName
78-
-Name $labVmName).DnsSettings.Fqdn
76+
$labVMFqdn = (Get-AzPublicIpAddress -ResourceGroupName $labVmRgName -Name $labVmName).DnsSettings.Fqdn
7977
8078
# Set a variable labVmRgName to store the lab VM resource group name
8179
Write-Host "##vso[task.setvariable variable=labVmRgName;]$labVmRgName"
@@ -127,10 +125,10 @@ The next step creates a golden image VM to use for future deployments. This step
127125
- **Virtual Machine Name**: the variable you specified for your virtual machine name: *$vmName*.
128126
- **Template**: Browse to and select the template file you checked in to your project repository.
129127
- **Parameters File**: If you checked a parameters file into your repository, browse to and select it.
130-
- **Parameter Overrides**: Enter `-newVMName '$(vmName)' -userName '$(userName)' -password (ConvertTo-SecureString -String '$(password)' -AsPlainText -Force)`.
131-
- Drop down **Output Variables**, and under **Reference name**, enter the variable for the created lab VM ID. If you use the default *labVmId*, you can refer to the variable in subsequent tasks as **$(labVmId)**.
128+
- **Parameter Overrides**: Enter `-newVMName '$(vmName)' -userName '$(userName)' -password '$(password)'`.
129+
- Drop down **Output Variables**, and under **Reference name**, enter the variable for the created lab VM ID. Let's enter *vm* for **Reference name** for simplicity. **labVmId** will be an attribute of this variable and will be referred to later as *$vm.labVmId*. If you use any other name, then remember to use it accordingly in the subsequent tasks.
132130

133-
You can create a name other than the default, but remember to use the correct name in subsequent tasks. You can write the Lab VM ID in the following form: `/subscriptions/{subscription Id}/resourceGroups/{resource group Name}/providers/Microsoft.DevTestLab/labs/{lab name}/virtualMachines/{vmName}`.
131+
Lab VM ID will be in the following form: `/subscriptions/{subscription Id}/resourceGroups/{resource group Name}/providers/Microsoft.DevTestLab/labs/{lab name}/virtualMachines/{vmName}`.
134132

135133
### Collect the details of the DevTest Labs VM
136134

@@ -143,7 +141,7 @@ Next, the pipeline runs the script you created to collect the details of the Dev
143141
- **Azure Subscription**: Select your service connection or subscription.
144142
- **Script Type**: Select **Script File Path**.
145143
- **Script Path**: Browse to and select the PowerShell script that you checked in to your source code repository. You can use built-in properties to simplify the path, for example: `$(System.DefaultWorkingDirectory/Scripts/GetLabVMParams.ps1`.
146-
- **Script Arguments**: Enter the name of the **labVmId** variable you populated in the previous task, for example *-labVmId '$(labVmId)'*.
144+
- **Script Arguments**: Enter the value as **-labVmId $(vm.labVmId)**.
147145

148146
The script collects the required values and stores them in environment variables within the release pipeline, so you can refer to them in later steps.
149147

@@ -159,7 +157,7 @@ The next task creates an image of the newly deployed VM in your lab. You can use
159157
- **Lab**: Select your lab.
160158
- **Custom Image Name**: Enter a name for the custom image.
161159
- **Description**: Enter an optional description to make it easy to select the correct image.
162-
- **Source Lab VM**: The source **labVmId**. If you changed the default name of the **labVmId** variable, enter it here. The default value is **$(labVmId)**.
160+
- **Source Lab VM**: The source **labVmId**. Enter the value as **$(vm.labVmId)**.
163161
- **Output Variables**: You can edit the name of the default Custom Image ID variable if necessary.
164162

165163
### Deploy your app to the DevTest Labs VM (optional)
@@ -177,7 +175,7 @@ The final task is to delete the VM that you deployed in your lab. You'd ordinari
177175
1. Configure the task as follows:
178176
- **Azure RM Subscription**: Select your service connection or subscription.
179177
- **Lab**: Select your lab.
180-
- **Virtual Machine**: Select the VM you want to delete.
178+
- **Virtual Machine**: Enter the value as **$(vm.labVmId)**.
181179
- **Output Variables**: Under **Reference name**, if you changed the default name of the **labVmId** variable, enter it here. The default value is **$(labVmId)**.
182180

183181
### Save the release pipeline

0 commit comments

Comments
 (0)