Skip to content

Commit f2d3e1e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram22-0505a
2 parents cfd5dff + 315831e commit f2d3e1e

12 files changed

+376
-242
lines changed

articles/app-service/app-service-key-vault-references.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,21 @@ If your vault is configured with [network restrictions](../key-vault/general/ove
3232

3333
1. Make sure the application has outbound networking capabilities configured, as described in [App Service networking features](./networking-features.md) and [Azure Functions networking options](../azure-functions/functions-networking-options.md).
3434

35-
Linux applications attempting to use private endpoints additionally require that the app be explicitly configured to have all traffic route through the virtual network. This requirement will be removed in a forthcoming update. To set this, use the following CLI command:
35+
Linux applications attempting to use private endpoints additionally require that the app be explicitly configured to have all traffic route through the virtual network. This requirement will be removed in a forthcoming update. To set this, use the following Azure CLI or Azure PowerShell command:
36+
37+
# [Azure CLI](#tab/azure-cli)
3638

3739
```azurecli
38-
az webapp config set --subscription <sub> -g <rg> -n <appname> --generic-configurations '{"vnetRouteAllEnabled": true}'
40+
az webapp config set --subscription <sub> -g MyResourceGroupName -n MyAppName --generic-configurations '{"vnetRouteAllEnabled": true}'
41+
```
42+
43+
# [Azure PowerShell](#tab/azure-powershell)
44+
45+
```azurepowershell
46+
Update-AzFunctionAppSetting -Name MyAppName -ResourceGroupName MyResourceGroupName -AppSetting @{vnetRouteAllEnabled = $true}
3947
```
48+
49+
---
4050
4151
2. Make sure that the vault's configuration accounts for the network or subnet through which your app will access it.
4252
@@ -53,11 +63,24 @@ Once you have granted permissions to the user-assigned identity, follow these st
5363
5464
1. Configure the app to use this identity for Key Vault reference operations by setting the `keyVaultReferenceIdentity` property to the resource ID of the user-assigned identity.
5565
66+
# [Azure CLI](#tab/azure-cli)
67+
5668
```azurecli-interactive
5769
userAssignedIdentityResourceId=$(az identity show -g MyResourceGroupName -n MyUserAssignedIdentityName --query id -o tsv)
5870
appResourceId=$(az webapp show -g MyResourceGroupName -n MyAppName --query id -o tsv)
5971
az rest --method PATCH --uri "${appResourceId}?api-version=2021-01-01" --body "{'properties':{'keyVaultReferenceIdentity':'${userAssignedIdentityResourceId}'}}"
6072
```
73+
# [Azure PowerShell](#tab/azure-powershell)
74+
75+
```azurepowershell-interactive
76+
$userAssignedIdentityResourceId = Get-AzUserAssignedIdentity -ResourceGroupName MyResourceGroupName -Name MyUserAssignedIdentityName | Select-Object -ExpandProperty Id
77+
$appResourceId = Get-AzFunctionApp -ResourceGroupName MyResourceGroupName -Name MyAppName | Select-Object -ExpandProperty Id
78+
79+
$Path = "{0}?api-version=2021-01-01" -f $appResourceId
80+
Invoke-AzRestMethod -Method PATCH -Path $Path -Payload "{'properties':{'keyVaultReferenceIdentity':'$userAssignedIdentityResourceId'}}"
81+
```
82+
83+
---
6184
6285
This configuration will apply to all references for the app.
6386

articles/azure-arc/data/release-notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Add support for specifying labels and annotations on the secondary service endpo
5656
- If three replicas, then `REQUIRED_SECONDARIES_TO_COMMIT = 1`.
5757
- If one or two replicas, then `REQUIRED_SECONDARIES_TO_COMMIT = 0`.
5858

59+
In this release, the default value of the readable secondary service is `Cluster IP`. The secondary service type can be set in the Kubernetes yaml/json at `spec.services.readableSecondaries.type`. In the next release, the default value will be the same as the primary service type.
60+
5961
### User experience improvements
6062

6163
Notifications added in Azure Portal if billing data has not been uploaded to Azure recently.

articles/azure-arc/kubernetes/quickstart-connect-cluster.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -255,24 +255,6 @@ eastus AzureArcTest1 microsoft.kubernetes/connectedclusters
255255

256256
---
257257

258-
## Connect a cluster with custom certificate
259-
260-
If you need the outbound communication from Arc agents to authenticate via a certificate, pass the certificate during onboarding. In case you need to pass multiple certificates, combine them into a single certificate chain and pass it through.
261-
262-
### [Azure CLI](#tab/azure-cli)
263-
264-
Run the connect command with parameters specified:
265-
266-
```azurecli
267-
az connectedk8s connect --name <cluster-name> --resource-group <resource-group> --proxy-cert <path-to-cert-file>
268-
```
269-
270-
### [Azure PowerShell](#tab/azure-powershell)
271-
272-
This scenario is not supported via the powershell cmdlet.
273-
274-
---
275-
276258
## Connect using an outbound proxy server
277259

278260
If your cluster is behind an outbound proxy server, requests must be routed via the outbound proxy server.
@@ -317,6 +299,22 @@ If your cluster is behind an outbound proxy server, requests must be routed via
317299

318300
---
319301

302+
For outbound proxy servers where only a trusted certificate needs to be provided without the proxy server endpoint inputs, `az connectedk8s connect` can be run with just the `--proxy-cert` input specified. In case multiple trusted certificates are expected, the combined certificate chain can be provided in a single file using the `--proxy-cert` parameter.
303+
304+
### [Azure CLI](#tab/azure-cli)
305+
306+
Run the connect command with the `--proxy-cert` parameter specified:
307+
308+
```azurecli
309+
az connectedk8s connect --name <cluster-name> --resource-group <resource-group> --proxy-cert <path-to-cert-file>
310+
```
311+
312+
### [Azure PowerShell](#tab/azure-powershell)
313+
314+
The ability to pass in the proxy certificate only without the proxy server endpoint details is not yet supported via PowerShell.
315+
316+
---
317+
320318
## Verify cluster connection
321319

322320
Run the following command:

articles/azure-functions/functions-networking-options.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,26 @@ When you run a Premium plan, you can connect non-HTTP trigger functions to servi
211211

212212
:::image type="content" source="media/functions-networking-options/virtual-network-trigger-toggle.png" alt-text="VNETToggle":::
213213

214+
### [Azure CLI](#tab/azure-cli)
215+
214216
You can also enable virtual network triggers by using the following Azure CLI command:
215217

216218
```azurecli-interactive
217219
az resource update -g <resource_group> -n <function_app_name>/config/web --set properties.functionsRuntimeScaleMonitoringEnabled=1 --resource-type Microsoft.Web/sites
218220
```
219221

222+
### [Azure PowerShell](#tab/azure-powershell)
223+
224+
You can also enable virtual network triggers by using the following Azure PowerShell command:
225+
226+
```azurepowershell-interactive
227+
$Resource = Get-AzResource -ResourceGroupName <resource_group> -ResourceName <function_app_name>/config/web -ResourceType Microsoft.Web/sites
228+
$Resource.Properties.functionsRuntimeScaleMonitoringEnabled = $true
229+
$Resource | Set-AzResource -Force
230+
```
231+
232+
---
233+
220234
> [!TIP]
221235
> Enabling virtual network triggers may have an impact on the performance of your application since your App Service plan instances will need to monitor your triggers to determine when to scale. This impact is likely to be very small.
222236

articles/azure-functions/functions-premium-plan.md

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In the Premium plan, you can have your app always ready on a specified number of
5757

5858
You can configure the number of always ready instances in the Azure portal by selected your **Function App**, going to the **Platform Features** tab, and selecting the **Scale Out** options. In the function app edit window, always ready instances are specific to that app.
5959

60-
![Elastic Scale Settings](./media/functions-premium-plan/scale-out.png)
60+
![Elastic scale settings in the portal](./media/functions-premium-plan/scale-out.png)
6161

6262
# [Azure CLI](#tab/azurecli)
6363

@@ -66,6 +66,17 @@ You can also configure always ready instances for an app with the Azure CLI.
6666
```azurecli-interactive
6767
az resource update -g <resource_group> -n <function_app_name>/config/web --set properties.minimumElasticInstanceCount=<desired_always_ready_count> --resource-type Microsoft.Web/sites
6868
```
69+
70+
# [Azure PowerShell](#tab/azure-powershell)
71+
72+
You can also configure always ready instances for an app with the Azure PowerShell.
73+
74+
```azurepowershell-interactive
75+
$Resource = Get-AzResource -ResourceGroupName <resource_group> -ResourceName <function_app_name>/config/web -ResourceType Microsoft.Web/sites
76+
$Resource.Properties.minimumElasticInstanceCount = <desired_always_ready_count>
77+
$Resource | Set-AzResource -Force
78+
```
79+
6980
---
7081

7182
### Pre-warmed instances
@@ -80,12 +91,32 @@ Consider this example of how always-ready instances and pre-warmed instances wor
8091

8192
As soon as the first trigger comes in, the five always-ready instances become active, and a pre-warmed instance is allocated. The app is now running with six provisioned instances: the five now-active always ready instances, and the sixth pre-warmed and inactive buffer. If the rate of executions continues to increase, the five active instances are eventually used. When the platform decides to scale beyond five instances, it scales into the pre-warmed instance. When that happens, there are now six active instances, and a seventh instance is instantly provisioned and fill the pre-warmed buffer. This sequence of scaling and pre-warming continues until the maximum instance count for the app is reached. No instances are pre-warmed or activated beyond the maximum.
8293

94+
# [Portal](#tab/portal)
95+
96+
You can configure the number of pre-warmed instances in the Azure portal by selecting the **Scale Out** options under **Settings** of a function app deployed to that plan and then adjusting the **Always Ready Instances** count.
97+
98+
![Pre-warmed instance Settings in the portal](./media/functions-premium-plan/scale-out.png)
99+
100+
# [Azure CLI](#tab/azurecli)
101+
83102
You can modify the number of pre-warmed instances for an app using the Azure CLI.
84103

85104
```azurecli-interactive
86105
az resource update -g <resource_group> -n <function_app_name>/config/web --set properties.preWarmedInstanceCount=<desired_prewarmed_count> --resource-type Microsoft.Web/sites
87106
```
88107

108+
# [Azure PowerShell](#tab/azure-powershell)
109+
110+
You can modify the number of pre-warmed instances for an app using the Azure PowerShell.
111+
112+
```azurepowershell-interactive
113+
$Resource = Get-AzResource -ResourceGroupName <resource_group> -ResourceName <function_app_name>/config/web -ResourceType Microsoft.Web/sites
114+
$Resource.Properties.preWarmedInstanceCount = <desired_prewarmed_count>
115+
$Resource | Set-AzResource -Force
116+
```
117+
118+
---
119+
89120
### Maximum function app instances
90121

91122
In addition to the [plan maximum instance count](#plan-and-sku-settings), you can configure a per-app maximum. The app maximum can be configured using the [app scale limit](./event-driven-scaling.md#limit-scale-out).
@@ -120,27 +151,61 @@ When you create the plan, there are two plan size settings: the minimum number o
120151

121152
If your app requires instances beyond the always-ready instances, it can continue to scale out until the number of instances hits the maximum burst limit. You're billed for instances beyond your plan size only while they are running and allocated to you, on a per-second basis. The platform makes it's best effort at scaling your app out to the defined maximum limit.
122153

123-
You can configure the plan size and maximums in the Azure portal by selecting the **Scale Out** options in the plan or a function app deployed to that plan (under **Platform Features**).
154+
# [Portal](#tab/portal)
155+
156+
You can configure the plan size and maximums in the Azure portal by selecting the **Scale Out** options under **Settings** of a function app deployed to that plan.
157+
158+
![Elastic plan size settings in the portal](./media/functions-premium-plan/scale-out.png)
159+
160+
# [Azure CLI](#tab/azurecli)
124161

125162
You can also increase the maximum burst limit from the Azure CLI:
126163

127164
```azurecli-interactive
128165
az functionapp plan update -g <resource_group> -n <premium_plan_name> --max-burst <desired_max_burst>
129166
```
130167

168+
# [Azure PowerShell](#tab/azure-powershell)
169+
170+
You can also increase the maximum burst limit from the Azure PowerShell:
171+
172+
```azurepowershell-interactive
173+
Update-AzFunctionAppPlan -ResourceGroupName <resource_group> -Name <premium_plan_name> -MaximumWorkerCount <desired_max_burst> -Force
174+
```
175+
176+
---
177+
131178
The minimum for every plan will be at least one instance. The actual minimum number of instances will be autoconfigured for you based on the always ready instances requested by apps in the plan. For example, if app A requests five always ready instances, and app B requests two always ready instances in the same plan, the minimum plan size will be calculated as five. App A will be running on all 5, and app B will only be running on 2.
132179

133180
> [!IMPORTANT]
134181
> You are charged for each instance allocated in the minimum instance count regardless if functions are executing or not.
135182
136183
In most circumstances, this autocalculated minimum is sufficient. However, scaling beyond the minimum occurs at a best effort. It's possible, though unlikely, that at a specific time scale-out could be delayed if additional instances are unavailable. By setting a minimum higher than the autocalculated minimum, you reserve instances in advance of scale-out.
137184

185+
# [Portal](#tab/portal)
186+
187+
You can configure the minimum instances in the Azure portal by selecting the **Scale Out** options under **Settings** of a function app deployed to that plan.
188+
189+
![Minimum instance settings in the portal](./media/functions-premium-plan/scale-out.png)
190+
191+
# [Azure CLI](#tab/azurecli)
192+
138193
Increasing the calculated minimum for a plan can be done using the Azure CLI.
139194

140195
```azurecli-interactive
141196
az functionapp plan update -g <resource_group> -n <premium_plan_name> --min-instances <desired_min_instances>
142197
```
143198

199+
# [Azure PowerShell](#tab/azure-powershell)
200+
201+
Increasing the calculated minimum for a plan can be done using the Azure PowerShell.
202+
203+
```azurepowershell-interactive
204+
Update-AzFunctionAppPlan -ResourceGroupName <resource_group> -Name <premium_plan_name> -MinimumWorkerCount <desired_min_instances> -Force
205+
```
206+
207+
---
208+
144209
### Available instance SKUs
145210

146211
When creating or scaling your plan, you can choose between three instance sizes. You will be billed for the total number of cores and memory provisioned, per second that each instance is allocated to you. Your app can automatically scale out to multiple instances as needed.

articles/azure-monitor/agents/agent-linux.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ ms.date: 03/31/2022
77
---
88

99
# Install Log Analytics agent on Linux computers
10-
The Log Analytics agents are on a **deprecation path** and will no longer be supported after **August 31, 2024**. If you use the Log Analytics agents to ingest data to Azure Monitor, make sure to [migrate to the new Azure Monitor agent](./azure-monitor-agent-migration.md) prior to that date.
11-
12-
1310
This article provides details on installing the Log Analytics agent on Linux computers using the following methods:
1411

1512
* [Install the agent for Linux using a wrapper-script](#install-the-agent-using-wrapper-script) hosted on GitHub. This is the recommended method to install and upgrade the agent when the computer has connectivity with the Internet, directly or through a proxy server.
1613
* [Manually download and install](#install-the-agent-manually) the agent. This is required when the Linux computer does not have access to the Internet and will be communicating with Azure Monitor or Azure Automation through the [Log Analytics gateway](./gateway.md).
1714

15+
The installation methods described in this article are typically used for virtual machines on-premises or in other clouds. See [Installation options](./log-analytics-agent.md#installation-options) for more efficient options you can use for Azure virtual machines.
16+
1817
>[!IMPORTANT]
19-
> The installation methods described in this article are typically used for virtual machines on-premises or in other clouds. See [Installation options](./log-analytics-agent.md#installation-options) for more efficient options you can use for Azure virtual machines.
18+
> The Log Analytics agents are on a **deprecation path** and will no longer be supported after **August 31, 2024**. If you use the Log Analytics agents to ingest data to Azure Monitor, make sure to [migrate to the new Azure Monitor agent](./azure-monitor-agent-migration.md) prior to that date.
2019
2120

2221

articles/index.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,6 @@ productDirectory:
400400
- analytics
401401
url: /power-bi/developer/azure-pbie-what-is-power-bi-embedded
402402
# Card
403-
- title: R Server for HDInsight
404-
summary: Predictive analytics, machine learning, and statistical modeling for big data
405-
imageSrc: https://static.docs.com/ui/media/product/azure/hdinsight.svg
406-
azureCategories:
407-
- analytics
408-
url: hdinsight/r-server/r-server-overview.md
409-
# Card
410403
- title: Azure Cosmos DB
411404
summary: Fast NoSQL database with open APIs for any scale
412405
imageSrc: https://static.docs.com/ui/media/product/azure/cosmos-db.svg

0 commit comments

Comments
 (0)