Skip to content

Commit 0eba254

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fix
2 parents 8167291 + 9c73444 commit 0eba254

File tree

8 files changed

+64
-31
lines changed

8 files changed

+64
-31
lines changed

articles/ai-studio/how-to/create-manage-runtime.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ If you have a compute instance, you can use it to build your compute instance ru
3939
Automatic is the default option for runtime, you can start automatic runtime in runtime dropdown in flow page.
4040

4141

42-
1. Start creates automatic runtime using the environment defined in`flow.dag.yaml` in flow folder on the VM size you have quota in the project.
42+
- **Start** creates automatic runtime using the environment defined in `flow.dag.yaml` in flow folder on the VM size you have quota in the project.
4343

4444
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-create-automatic-init.png" alt-text="Screenshot of prompt flow on the start automatic with default settings on flow page. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-create-automatic-init.png":::
4545

46-
2. Start with advanced settings, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
46+
- **Start with advanced settings**, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
4747

4848
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-creation-automatic-settings.png" alt-text="Screenshot of prompt flow on the start automatic with advanced setting on flow page. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-creation-automatic-settings.png":::
4949

@@ -115,17 +115,26 @@ You can also customize the environment used to run this flow.
115115
116116
#### Add packages in private feed in Azure DevOps
117117

118-
If you want to use a private feed in Azure DevOps, add the Managed Identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity)
118+
If you want to use a private feed in Azure DevOps, you need follow these steps:
119119

120-
> [!NOTE]
121-
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
120+
1. Create user assigned managed identity and add this user assigned managed identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity).
121+
122+
> [!NOTE]
123+
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
124+
125+
1. [Add or update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
126+
127+
128+
1. You need to add `{private}` to your private feed URL. For example, if you want to install `test_package` from `test_feed` in Azure devops, add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
129+
130+
```txt
131+
-i https://{private}@{test_feed_url_in_azure_devops}
132+
test_package
133+
```
122134
123-
You need to add `{private}` to your private feed URL. For example, if you want to install `test_package` from `test_feed` in Azure devops, add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
135+
1. Specify the user assigned managed identity in `start with advanced setting` if automatic runtime is not running or `edit` button if automatic runtime is running.
124136
125-
```txt
126-
-i https://{private}@{test_feed_url_in_azure_devops}
127-
test_package
128-
```
137+
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-advanced-setting-msi.png" alt-text="Screenshot of specify user assigned managed identity. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-advanced-setting-msi.png":::
129138
130139
### Update compute instance runtime in runtime page
131140
58.4 KB
Loading

articles/azure-monitor/agents/data-collection-syslog.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,24 @@ When the Azure Monitor agent for Linux is installed, it configures the local Sys
1717
:::image type="content" source="media/azure-monitor-agent/linux-agent-syslog-communication.png" lightbox="media/azure-monitor-agent/linux-agent-syslog-communication.png" alt-text="Diagram that shows Syslog daemon and Azure Monitor Agent communication.":::
1818

1919
The following facilities are supported with the Syslog collector:
20+
* alert
21+
* audit
2022
* auth
2123
* authpriv
24+
* clock (formerly mark)
2225
* cron
2326
* daemon
24-
* mark
27+
* ftp
2528
* kern
29+
* local0-local7
2630
* lpr
2731
* mail
2832
* news
33+
* nopri
34+
* ntp
2935
* syslog
3036
* user
3137
* uucp
32-
* local0-local7
3338

3439
For some device types that don't allow local installation of Azure Monitor Agent, the agent can be installed instead on a dedicated Linux-based log forwarder. The originating device must be configured to send Syslog events to the Syslog daemon on this forwarder instead of the local daemon. For more information, see the [Sentinel tutorial](../../sentinel/forward-syslog-monitor-agent.md).
3540

articles/dev-box/concept-dev-box-architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ There's no requirement to configure your dev boxes to make these connections. Mi
110110

111111
For more information on the network architecture of Azure Virtual Desktop, see [Understanding Azure Virtual Desktop network connectivity](/en-us/azure/virtual-desktop/network-connectivity).
112112

113-
Microft Dev Box doesn't support third-party connection brokers.
113+
Microsoft Dev Box doesn't support third-party connection brokers.
114114

115115
## Related content
116116

117117
- [What is Microsoft Dev Box?](overview-what-is-microsoft-dev-box.md)
118-
- [Quickstart: Configure Microsoft Dev Box](quickstart-configure-dev-box-service.md)
118+
- [Quickstart: Configure Microsoft Dev Box](quickstart-configure-dev-box-service.md)

articles/dev-box/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ items:
9696
items:
9797
- name: Azure roadmap
9898
href: https://azure.microsoft.com/roadmap/
99-
- name: Regional availability
99+
- name: Azure regions supported by Dev Box
100100
href: https://azure.microsoft.com/regions/services/
101101
- name: FAQ
102102
href: dev-box-faq.yml

articles/key-vault/general/rbac-guide.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ More about Azure Key Vault management guidelines, see:
5353
| Key Vault Crypto Officer | Perform any action on the keys of a key vault, except manage permissions. Only works for key vaults that use the 'Azure role-based access control' permission model. | 14b46e9e-c2b7-41b4-b07b-48a6ebf60603 |
5454
| Key Vault Crypto Service Encryption User | Read metadata of keys and perform wrap/unwrap operations. Only works for key vaults that use the 'Azure role-based access control' permission model. | e147488a-f6f5-4113-8e2d-b22465e65bf6 |
5555
| Key Vault Crypto User | Perform cryptographic operations using keys. Only works for key vaults that use the 'Azure role-based access control' permission model. | 12338af0-0e69-4776-bea7-57ae8d297424 |
56+
| Key Vault Crypto Service Release User | Release keys for [Azure Confidential Computing](../../confidential-computing/concept-skr-attestation.md) and equivalent environments. Only works for key vaults that use the 'Azure role-based access control' permission model.
5657
| Key Vault Reader | Read metadata of key vaults and its certificates, keys, and secrets. Cannot read sensitive values such as secret contents or key material. Only works for key vaults that use the 'Azure role-based access control' permission model. | 21090545-7ca7-4776-b22c-e363652d74d2 |
5758
| Key Vault Secrets Officer| Perform any action on the secrets of a key vault, except manage permissions. Only works for key vaults that use the 'Azure role-based access control' permission model. | b86a8fe4-44ce-4948-aee5-eccb2c155cd7 |
5859
| Key Vault Secrets User | Read secret contents including secret portion of a certificate with private key. Only works for key vaults that use the 'Azure role-based access control' permission model. | 4633458b-17de-408a-b874-0445c86b69e6 |

articles/machine-learning/prompt-flow/how-to-create-manage-runtime.md

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ Automatic is the default option for runtime, you can start automatic runtime (pr
5757
> Automatic runtime is currently in public preview. This preview is provided without a service-level agreement, and are not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
5858
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
5959
60-
1. Start creates automatic runtime (preview) using the environment defined in`flow.dag.yaml` in flow folder on the VM size you have quota in the workspace.
60+
- **Start** creates automatic runtime (preview) using the environment defined in`flow.dag.yaml` in flow folder on the VM size you have quota in the workspace.
6161

6262
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-create-automatic-init.png" alt-text="Screenshot of prompt flow on the start automatic with default settings on flow page. " lightbox = "./media/how-to-create-manage-runtime/runtime-create-automatic-init.png":::
6363

64-
2. Start with advanced settings, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to workspace](../how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
64+
- **Start with advanced settings**, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to workspace](../how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
6565

6666
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-creation-automatic-settings.png" alt-text="Screenshot of prompt flow on the start automatic with advanced setting on flow page. " lightbox = "./media/how-to-create-manage-runtime/runtime-creation-automatic-settings.png":::
6767

@@ -113,10 +113,10 @@ When performing evaluation, you can use the original runtime in the flow or chan
113113
### Update automatic runtime (preview) in flow page
114114

115115
You can operate automatic runtime (preview) in flow page. Here are options you can use:
116-
- Install packages, this triggers the `pip install -r requirements.txt` in flow folder. It takes minutes depends on the packages you install.
117-
- Reset, will delete current runtime and create a new one with the same environment. If you encounter package conflict issue, you can try this option.
118-
- Edit, will open runtime config page, you can define the VM side and idle time for the runtime.
119-
- Stop, will delete current runtime. If there's no active runtime on underlining compute, compute resource will also be deleted.
116+
- **Install packages**, this triggers the `pip install -r requirements.txt` in flow folder. It takes minutes depends on the packages you install.
117+
- **Reset**, will delete current runtime and create a new one with the same environment. If you encounter package conflict issue, you can try this option.
118+
- **Edit**, will open runtime config page, you can define the VM side and idle time for the runtime.
119+
- **Stop**, will delete current runtime. If there's no active runtime on underlining compute, compute resource will also be deleted.
120120

121121
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-create-automatic-actions.png" alt-text="Screenshot of actions on automatic runtime (preview) on flow page. " lightbox = "./media/how-to-create-manage-runtime/runtime-create-automatic-actions.png":::
122122

@@ -132,22 +132,40 @@ You can also customize environment used to run this flow.
132132
133133
#### Add packages in private feed in Azure DevOps
134134

135-
If you want to use private feed in Azure DevOps, add the Managed Identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity)
135+
If you want to use a private feed in Azure DevOps, you need follow these steps:
136136

137-
> [!NOTE]
138-
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
137+
1. Create user assigned managed identity and add this user assigned managed identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity).
139138

140-
You need add `{private}` to your private feed url. Such as if you want to install `test_package` from `test_feed` in Azure devops, you need add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
139+
> [!NOTE]
140+
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
141+
142+
1. [Add or update user assigned identities to workspace](../how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
141143

142-
```txt
143-
-i https://{private}@{test_feed_url_in_azure_devops}
144-
test_package
145-
```
146144

147-
- By default, we use latest prompt flow image as base image. If you want to use a different base image, you can build custom base image learn more, see [Customize environment with docker context for runtime](how-to-customize-environment-runtime.md#customize-environment-with-docker-context-for-runtime), then you can use put it under `environment` in `flow.dag.yaml` file in flow folder. You need `reset` runtime to use the new base image, this takes several minutes as it pulls the new base image and install packages again.
145+
1. You need to add `{private}` to your private feed URL. For example, if you want to install `test_package` from `test_feed` in Azure devops, add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
146+
147+
```txt
148+
-i https://{private}@{test_feed_url_in_azure_devops}
149+
test_package
150+
```
151+
152+
1. Specify the user assigned managed identity if `start with advanced setting` or **reset** automatic runtime in `edit`.
153+
154+
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-advanced-setting-msi.png" alt-text="Screenshot of specify user assigned managed identity. " lightbox = "./media/how-to-create-manage-runtime/runtime-advanced-setting-msi.png":::
148155
149-
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-creation-automatic-image-flow-dag.png" alt-text="Screenshot of customize environment for automatic runtime on flow page. " lightbox = "./media/how-to-create-manage-runtime/runtime-creation-automatic-image-flow-dag.png":::
156+
#### Change the base image used by automatic runtime (preview)
150157
158+
By default, we use latest prompt flow image as base image. If you want to use a different base image, you can build custom base image learn more, see [Customize environment with docker context for runtime](how-to-customize-environment-runtime.md#customize-environment-with-docker-context-for-runtime), then you can use put it under `environment` in `flow.dag.yaml` file in flow folder. You need `reset` runtime to use the new base image, this takes several minutes as it pulls the new base image and install packages again.
159+
160+
:::image type="content" source="./media/how-to-create-manage-runtime/runtime-creation-automatic-image-flow-dag.png" alt-text="Screenshot of customize environment for automatic runtime on flow page. " lightbox = "./media/how-to-create-manage-runtime/runtime-creation-automatic-image-flow-dag.png":::
161+
162+
163+
```yaml
164+
environment:
165+
image: <your-custom-image>
166+
python_requirements_txt: requirements.txt
167+
168+
```
151169

152170
### Update compute instance runtime in runtime page
153171

58.4 KB
Loading

0 commit comments

Comments
 (0)