Skip to content

Commit 4980375

Browse files
authored
Merge pull request #197783 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 104f4fd + 970422e commit 4980375

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

articles/azure-functions/configure-monitoring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ To configure these values at App settings level (and avoid redeployment on just
391391
| Host.json path | App setting |
392392
|----------------|-------------|
393393
| logging.logLevel.default | AzureFunctionsJobHost__logging__logLevel__default |
394-
| logging.logLeve.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
394+
| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
395395
| logging.logLevel.Function | AzureFunctionsJobHost__logging__logLevel__Function |
396-
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function1 |
397-
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function1.User |
396+
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function.Function1 |
397+
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function.Function1.User |
398398

399399

400400
You can override the settings directly at the Azure portal Function App Configuration blade or by using an Azure CLI or PowerShell script.

articles/azure-functions/functions-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ A Blob Storage SAS URL for a second storage account used for key storage. By def
203203

204204
|Key|Sample value|
205205
|--|--|
206-
|AzureWebJobsSecretStorageSa| `<BLOB_SAS_URL>` |
206+
|AzureWebJobsSecretStorageSas| `<BLOB_SAS_URL>` |
207207

208208
## AzureWebJobsSecretStorageType
209209

articles/iot-edge/how-to-provision-devices-at-scale-linux-on-windows-tpm.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ Simulated TPM samples:
139139
```powershell
140140
Provision-EflowVM -provisioningType "DpsTpm" -scopeId "SCOPE_ID_HERE"
141141
```
142+
143+
If you have enrolled the device using a custom **Registration Id**, you must specify that Registration Id as well when provisioning:
144+
145+
```powershell
146+
Provision-EflowVM -provisioningType "DpsTpm" -scopeId "SCOPE_ID_HERE" -registrationId "REGISTRATION_ID_HERE"
147+
```
142148

143149
# [Windows Admin Center](#tab/windowsadmincenter)
144150

@@ -167,6 +173,12 @@ Simulated TPM samples:
167173
```powershell
168174
Provision-EflowVM -provisioningType "DpsTpm" -scopeId "SCOPE_ID_HERE"
169175
```
176+
177+
If you have enrolled the device using a custom **Registration Id**, you must specify that Registration Id as well when provisioning:
178+
179+
```powershell
180+
Provision-EflowVM -provisioningType "DpsTpm" -scopeId "SCOPE_ID_HERE" -registrationId "REGISTRATION_ID_HERE"
181+
```
170182

171183
:::moniker-end
172184

@@ -272,4 +284,4 @@ Use the following commands on your device to verify that the IoT Edge installed
272284
273285
The device provisioning service enrollment process lets you set the device ID and device twin tags at the same time as you provision the new device. You can use those values to target individual devices or groups of devices by using automatic device management.
274286
275-
Learn how to [deploy and monitor IoT Edge modules at scale by using the Azure portal](how-to-deploy-at-scale.md) or [the Azure CLI](how-to-deploy-cli-at-scale.md).
287+
Learn how to [deploy and monitor IoT Edge modules at scale by using the Azure portal](how-to-deploy-at-scale.md) or [the Azure CLI](how-to-deploy-cli-at-scale.md).

articles/iot-edge/reference-iot-edge-for-linux-on-windows-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ The **Provision-EflowVm** command adds the provisioning information for your IoT
287287
| deviceId | The device ID of an existing IoT Edge device | Device ID for provisioning an IoT Edge device (**ManualX509**). |
288288
| scopeId | The scope ID for an existing DPS instance. | Scope ID for provisioning an IoT Edge device (**DpsTPM**, **DpsX509**, or **DpsSymmetricKey**). |
289289
| symmKey | The primary key for an existing DPS enrollment or the primary key of an existing IoT Edge device registered using symmetric keys | Symmetric key for provisioning an IoT Edge device (**DpsSymmetricKey**). |
290-
| registrationId | The registration ID of an existing IoT Edge device | Registration ID for provisioning an IoT Edge device (**DpsSymmetricKey**). |
290+
| registrationId | The registration ID of an existing IoT Edge device | Registration ID for provisioning an IoT Edge device (**DpsSymmetricKey**, **DpsTPM**). |
291291
| identityCertPath | Directory path | Absolute destination path of the identity certificate on your Windows host machine (**ManualX509**, **DpsX509**). |
292292
| identityPrivKeyPath | Directory path | Absolute source path of the identity private key on your Windows host machine (**ManualX509**, **DpsX509**). |
293293
| globalEndpoint | Device Endpoint URL | URL for Global Endpoint to be used for DPS provisioning. |

articles/machine-learning/how-to-secure-training-vnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ When you enable **No public IP**, your compute cluster doesn't use a public IP f
232232
> [!WARNING]
233233
> By default, you do not have public internet access from No Public IP Compute Cluster. You need to configure User Defined Routing (UDR) to reach to a public IP to access the internet. For example, you can use a public IP of your firewall, or you can use [Virtual Network NAT](/azure/virtual-network/nat-gateway/nat-overview) with a public IP.
234234
235-
A compute cluster with **No public IP** enabled has **no inbound communication requirements** from public internet. Specifically, neither inbound NSG rule (`BatchNodeManagement`, `AzureMachineLearning`) is required. You still need to allow inbound from source of **VirtualNetwork** and any port source, to destination of **VirtualNetwork**, and destination port of **29876, 29877**.
235+
A compute cluster with **No public IP** enabled has **no inbound communication requirements** from public internet. Specifically, neither inbound NSG rule (`BatchNodeManagement`, `AzureMachineLearning`) is required. You still need to allow inbound from source of **VirtualNetwork** and any port source, to destination of **VirtualNetwork**, and destination port of **29876, 29877** and inbound from source **AzureLoadBalancer** and any port source to destination **VirtualNetwork** and port **44224** destination.
236236

237237
**No public IP** clusters are dependent on [Azure Private Link](how-to-configure-private-link.md) for Azure Machine Learning workspace.
238238
A compute cluster with **No public IP** also requires you to disable private endpoint network policies and private link service network policies. These requirements come from Azure private link service and private endpoints and aren't Azure Machine Learning specific. Follow instruction from [Disable network policies for Private Link service](../private-link/disable-private-link-service-network-policy.md) to set the parameters `disable-private-endpoint-network-policies` and `disable-private-link-service-network-policies` on the virtual network subnet.
@@ -340,4 +340,4 @@ This article is part of a series on securing an Azure Machine Learning workflow.
340340
* [Secure the inference environment](how-to-secure-inferencing-vnet.md)
341341
* [Enable studio functionality](how-to-enable-studio-virtual-network.md)
342342
* [Use custom DNS](how-to-custom-dns.md)
343-
* [Use a firewall](how-to-access-azureml-behind-firewall.md)
343+
* [Use a firewall](how-to-access-azureml-behind-firewall.md)

includes/functions-folder-structure.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ The code for all the functions in a specific function app is located in a root p
1616
* [F# script](../articles/azure-functions/functions-reference-fsharp.md#folder-structure)
1717
* [Java](../articles/azure-functions/functions-reference-java.md#folder-structure)
1818
* [JavaScript](../articles/azure-functions/functions-reference-node.md#folder-structure)
19+
* [PowerShell](../articles/azure-functions/functions-reference-powershell.md#folder-structure)
1920
* [Python](../articles/azure-functions/functions-reference-python.md#folder-structure)
2021

2122
In version 2.x and higher of the Functions runtime, all functions in the function app must share the same language stack.

0 commit comments

Comments
 (0)