Skip to content

Commit e4faf03

Browse files
authored
Merge branch 'main' into patch-9
2 parents 704333a + 5c51208 commit e4faf03

8 files changed

+36
-20
lines changed

articles/automation/automation-hrw-run-runbooks.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,18 +208,22 @@ By default, the Hybrid jobs run under the context of System account. However, to
208208
1. Change the value of **Hybrid Worker credentials** from **Default** to **Custom**.
209209
1. Select the credential and click **Save**.
210210
1. If the following permissions are not assigned for Custom users, jobs might get suspended.
211-
212-
**Folders**
213-
- C:\ProgramData\AzureConnectedMachineAgent\Tokens (read) </br>
214-
- C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows (read and execute)
215211
212+
| **Resource type** | **Folder permissions** |
213+
| --- | --- |
214+
|Azure VM | C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows (read and execute) |
215+
|Arc-enabled Server | C:\ProgramData\AzureConnectedMachineAgent\Tokens (read)</br> C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows (read and execute) |
216+
217+
>[!NOTE]
218+
>Linux Hybrid Worker doesn't support Hybrid Worker credentials.
219+
216220
## <a name="runas-script"></a>Install Run As account certificate
217221
218222
As part of your automated build process for deploying resources in Azure, you might require access to on-premises systems to support a task or set of steps in your deployment sequence. To provide authentication against Azure using the Run As account, you must install the Run As account certificate.
219223
220224
>[!NOTE]
221-
>This PowerShell runbook currently does not run on Linux machines. It runs only on Windows machines.
222-
>
225+
>This PowerShell runbook currently does not run on Linux machines. It runs only on Windows machines.
226+
223227
224228
The following PowerShell runbook, called **Export-RunAsCertificateToHybridWorker**, exports the Run As certificate from your Azure Automation account. The runbook downloads and imports the certificate into the local machine certificate store on a Hybrid Runbook Worker that is connected to the same account. Once it completes that step, the runbook verifies that the worker can successfully authenticate to Azure using the Run As account.
225229

articles/azure-functions/functions-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Getting started with Azure Functions
33
description: Take the first steps toward working with Azure Functions.
44
ms.topic: overview
5-
ms.date: 11/19/2020
5+
ms.date: 12/13/2022
66
zone_pivot_groups: programming-languages-set-functions-lang-workers
77
---
88

articles/azure-functions/functions-how-to-use-azure-function-app-settings.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure function app settings in Azure Functions
33
description: Learn how to configure function app settings in Azure Functions.
44
ms.assetid: 81eb04f8-9a27-45bb-bf24-9ab6c30d205c
55
ms.topic: conceptual
6-
ms.date: 01/21/2021
6+
ms.date: 12/13/2022
77
ms.custom: cc996988-fb4f-47, devx-track-azurecli, devx-track-azurepowershell
88
---
99

@@ -133,9 +133,16 @@ In the previous example replace `<RESOURCE_GROUP>` and `<FUNCTION_APP_NAME>` wit
133133

134134
## Plan migration
135135

136-
You can use Azure CLI commands to migrate a function app between a Consumption plan and a Premium plan on Windows. The specific commands depend on the direction of the migration. Direct migration to a Dedicated (App Service) plan isn't currently supported.
136+
You can use either the Azure portal or Azure CLI commands to migrate a function app between a Consumption plan and a Premium plan on Windows. When migrating between plans, keep in mind the following considerations:
137137

138-
This migration isn't supported on Linux.
138+
+ Direct migration to a Dedicated (App Service) plan isn't currently supported.
139+
+ Migration isn't supported on Linux.
140+
+ The source plan and the target plan must be in the same resource group and geographical region. For more information, see [Move an app to another App Service plan](../app-service/app-service-plan-manage.md#move-an-app-to-another-app-service-plan).
141+
+ The specific CLI commands depend on the direction of the migration.
142+
143+
### Migration in the portal
144+
145+
In the Azure portal, navigate to your Consumption or Premium plan app and choose **Change App Service plan** under **App Service plan**. Select the other **Plan type**, create a new App Service plan of the new type, and select **OK**. For more information, see [Move an app to another App Service plan](../app-service/app-service-plan-manage.md#move-an-app-to-another-app-service-plan).
139146

140147
### Consumption to Premium
141148

@@ -189,7 +196,7 @@ Use the following procedure to migrate from a Premium plan to a Consumption plan
189196
az functionapp delete --name <NEW_CONSUMPTION_APP_NAME> --resource-group <MY_RESOURCE_GROUP>
190197
```
191198
192-
1. If you no longer need your previous Premium function app plan, delete your original function app plan after confirming you have successfully migrated to the new one. Please note that if the plan is not deleted, you will still be charged for the Premium plan. Run the [az functionapp plan list](/cli/azure/functionapp/plan#az-functionapp-plan-list) command as follows to get a list of all Premium plans in your resource group.
199+
1. If you no longer need your previous Premium function app plan, delete your original function app plan after confirming you have successfully migrated to the new one. Note that if the plan isn't deleted, you'll still be charged for the Premium plan. Run the [az functionapp plan list](/cli/azure/functionapp/plan#az-functionapp-plan-list) command as follows to get a list of all Premium plans in your resource group.
193200
194201
```azurecli-interactive
195202
az functionapp plan list --resource-group <MY_RESOURCE_GROUP> --query "[?sku.family=='EP'].{PlanName:name,Sites:numberOfSites}" -o table

articles/azure-functions/functions-recover-storage-account.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
22
title: 'Troubleshoot error: Azure Functions Runtime is unreachable'
33
description: Learn how to troubleshoot an invalid storage account.
4-
54
ms.topic: article
6-
ms.date: 09/05/2018
5+
ms.date: 12/13/2022
76
---
87

98
# Troubleshoot error: "Azure Functions Runtime is unreachable"

articles/azure-functions/security-concepts.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Securing Azure Functions
33
description: Learn about how to make your function code running in Azure more secure from common attacks.
4-
ms.date: 4/13/2020
4+
ms.date: 12/13/2022
55
ms.topic: conceptual
66

77
#Customer intent: As a developer, I want to understand the security features and principles of Azure Functions so that I can make my cloud-based function code as secure as possible.
@@ -231,6 +231,10 @@ Restricting network access to your function app lets you control who can access
231231

232232
Access restrictions allow you to define lists of allow/deny rules to control traffic to your app. Rules are evaluated in priority order. If there are no rules defined, then your app will accept traffic from any address. To learn more, see [Azure App Service Access Restrictions](../app-service/app-service-ip-restrictions.md?toc=/azure/azure-functions/toc.json).
233233

234+
### Secure the storage account
235+
236+
When you create a function app, you must create or link to a general-purpose Azure Storage account that supports Blob, Queue, and Table storage. You can replace this storage account with one that is secured with service endpoints or private endpoints. For more information, see [Restrict your storage account to a virtual network](./functions-networking-options.md#restrict-your-storage-account-to-a-virtual-network).
237+
234238
### Private site access
235239

236240
[!INCLUDE [functions-private-site-access](../../includes/functions-private-site-access.md)]

articles/azure-functions/storage-considerations.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Storage considerations for Azure Functions
33
description: Learn about the storage requirements of Azure Functions and about encrypting stored data.
44
ms.topic: conceptual
5-
ms.date: 04/21/2022
5+
ms.date: 12/13/2022
66
---
77

88
# Storage considerations for Azure Functions
@@ -37,6 +37,8 @@ Every function app requires a storage account to operate. When that account is d
3737

3838
For best performance, your function app should use a storage account in the same region, which reduces latency. The Azure portal enforces this best practice. If for some reason you need to use a storage account in a region different than your function app, you must create your function app outside of the portal.
3939

40+
The storage account must be accessible to the function app. If you need to use a secured storage account, consider [restricting your storage account to a virtual network](./functions-networking-options.md#restrict-your-storage-account-to-a-virtual-network).s
41+
4042
### Storage account connection setting
4143

4244
The storage account connection is maintained in the [AzureWebJobsStorage application setting](./functions-app-settings.md#azurewebjobsstorage).

articles/container-apps/azure-arc-enable-cluster.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: cebundy
66
ms.service: container-apps
77
ms.topic: tutorial
8-
ms.date: 11/29/2022
8+
ms.date: 12/16/2022
99
ms.author: v-bcatherine
1010

1111
---
@@ -468,7 +468,7 @@ Before you can start creating apps in the custom location, you need an [Azure Co
468468
# [bash](#tab/bash)
469469

470470
```azurecli
471-
az containerapps connected-env create \
471+
az containerapp connected-env create \
472472
--resource-group $GROUP_NAME \
473473
--name $CONNECTED_ENVIRONMENT_NAME \
474474
--custom-location $CUSTOM_LOCATION_ID
@@ -477,7 +477,7 @@ Before you can start creating apps in the custom location, you need an [Azure Co
477477
# [PowerShell](#tab/azure-powershell)
478478

479479
```azurecli
480-
az containerapps connected-env create `
480+
az containerapp connected-env create `
481481
--resource-group $GROUP_NAME `
482482
--name $CONNECTED_ENVIRONMENT_NAME `
483483
--custom-location $CUSTOM_LOCATION_ID
@@ -488,7 +488,7 @@ Before you can start creating apps in the custom location, you need an [Azure Co
488488
1. Validate that the Container Apps connected environment is successfully created with the following command. The output should show the `provisioningState` property as `Succeeded`. If not, run it again after a minute.
489489

490490
```azurecli
491-
az containerapps connected-env show --resource-group $GROUP_NAME --name $CONNECTED_ENVIRONMENT_NAME
491+
az containerapp connected-env show --resource-group $GROUP_NAME --name $CONNECTED_ENVIRONMENT_NAME
492492
```
493493

494494
## Next steps

articles/machine-learning/how-to-deploy-online-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ To save time debugging, we *highly recommend* that you test-run your endpoint lo
424424
> - Local endpoints support only one deployment per endpoint.
425425

426426
> [!TIP]
427-
> You can use [Azure Machine Learning inference HTTP server Python package](how-to-inference-server-http.md) to debug your scoring script locally. Debugging with the inference server helps you to debug the scoring script before deploying to local endpoints so that you can debug without being affected by the deployment container configurations.
427+
> You can use [Azure Machine Learning inference HTTP server Python package](how-to-inference-server-http.md) to debug your scoring script locally **without Docker Engine**. Debugging with the inference server helps you to debug the scoring script before deploying to local endpoints so that you can debug without being affected by the deployment container configurations.
428428

429429
### Deploy the model locally
430430

0 commit comments

Comments
 (0)