Skip to content

Commit 5ff5ad6

Browse files
ttorblettorble
authored
Merge pull request #269275 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 3/18
2 parents 00774ef + 5510997 commit 5ff5ad6

File tree

39 files changed

+640
-155
lines changed

39 files changed

+640
-155
lines changed

‎articles/ai-studio/how-to/prompt-flow-tools/prompt-flow-tools-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To discover more custom tools developed by the open-source community, see [More
3838

3939
## Remarks
4040
- If existing tools don't meet your requirements, you can [develop your own custom tool and make a tool package](https://microsoft.github.io/promptflow/how-to-guides/develop-a-tool/create-and-use-tool-package.html).
41-
- To install the custom tools, if you're using the automatic runtime, you can readily install the package by adding the custom tool package name into the `requirements.txt` file in the flow folder. Then select the **Save and install** button to start installation. After completion, you can see the custom tools displayed in the tool list. To learn more, see [How to create and manage a runtime](../create-manage-runtime.md).
41+
- To install the custom tools, if you're using the automatic runtime, you can readily install the publicly released package by adding the custom tool package name into the `requirements.txt` file in the flow folder. Then select the **Save and install** button to start installation. After completion, you can see the custom tools displayed in the tool list. In addition, if you want to use local or private feed package, please build an image first, then set up the runtime based on your image. To learn more, see [How to create and manage a runtime](../create-manage-runtime.md).
4242
:::image type="content" source="../../media/prompt-flow/install-package-on-automatic-runtime.png" alt-text="Screenshot of how to install packages on automatic runtime."lightbox = "../../media/prompt-flow/install-package-on-automatic-runtime.png":::
4343

4444
## Next steps

‎articles/azure-app-configuration/quickstart-dotnet-core-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You can use the [.NET command-line interface (CLI)](/dotnet/core/tools/) to crea
6262
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
6363
```
6464
65-
4. Use App Configuration by calling the `builder.AddAzureAppConfiguration()` method in the `Program.cs` file.
65+
4. Use App Configuration by calling the `AddAzureAppConfiguration` method in the `Program.cs` file.
6666
6767
```csharp
6868
var builder = new ConfigurationBuilder();

‎articles/azure-app-configuration/use-key-vault-references-dotnet-core.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ author: maud-lv
66
ms.service: azure-app-configuration
77
ms.devlang: csharp
88
ms.topic: tutorial
9-
ms.date: 02/20/2024
10-
ms.author: malev
9+
ms.date: 03/10/2024
10+
ms.author: zhiyuanliang
1111
ms.custom: devx-track-csharp, mvc, devx-track-dotnet
1212
#Customer intent: I want to update my ASP.NET Core application to reference values stored in Key Vault through App Configuration.
1313
---
@@ -98,21 +98,28 @@ To add a secret to the vault, you need to take just a few additional steps. In t
9898
using Azure.Identity;
9999
```
100100
101-
1. Update the `CreateWebHostBuilder` method to use App Configuration by calling the `config.AddAzureAppConfiguration` method. Include the `ConfigureKeyVault` option, and pass the correct credential to your Key Vault using the `SetCredential` method. If you have multiple Key Vaults, the same credential will be used for all of them. If your Key Vaults require different credentials, you can set them using `Register` or `SetSecretResolver` methods from the [`AzureAppConfigurationKeyVaultOptions`](/dotnet/api/microsoft.extensions.configuration.azureappconfiguration.azureappconfigurationkeyvaultoptions) class.
101+
1. Use App Configuration by calling the `AddAzureAppConfiguration` method. Include the `ConfigureKeyVault` option, and pass the correct credential to your Key Vault using the `SetCredential` method.
102102
103103
```csharp
104104
var builder = WebApplication.CreateBuilder(args);
105105
106+
// Retrieve the connection string
107+
string connectionString = builder.Configuration.GetConnectionString("AppConfig");
108+
109+
// Load configuration from Azure App Configuration
106110
builder.Configuration.AddAzureAppConfiguration(options =>
111+
{
112+
options.Connect(connectionString);
113+
114+
options.ConfigureKeyVault(keyVaultOptions =>
107115
{
108-
options.Connect(
109-
builder.Configuration["ConnectionStrings:AppConfig"])
110-
.ConfigureKeyVault(kv =>
111-
{
112-
kv.SetCredential(new DefaultAzureCredential());
113-
});
116+
keyVaultOptions.SetCredential(new DefaultAzureCredential());
114117
});
118+
});
115119
```
120+
121+
> [!TIP]
122+
> If you have multiple Key Vaults, the same credential will be used for all of them. If your Key Vaults require different credentials, you can set them using `Register` or `SetSecretResolver` methods from the [`AzureAppConfigurationKeyVaultOptions`](/dotnet/api/microsoft.extensions.configuration.azureappconfiguration.azureappconfigurationkeyvaultoptions) class.
116123
117124
1. When you initialized the connection to App Configuration, you set up the connection to Key Vault by calling the `ConfigureKeyVault` method. After the initialization, you can access the values of Key Vault references in the same way you access the values of regular App Configuration keys.
118125

‎articles/azure-arc/system-center-virtual-machine-manager/remove-scvmm-from-azure-arc.md

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
---
2+
title: Remove your SCVMM environment from Azure Arc
3+
description: This article explains the steps to cleanly remove your SCVMM environment from Azure Arc and delete related Azure Arc resources from Azure.
4+
author: Farha-Bano
5+
ms.author: v-farhabano
6+
manager: jsuri
7+
ms.topic: how-to
8+
ms.date: 03/18/2024
9+
ms.service: azure-arc
10+
ms.subservice: azure-arc-scvmm
11+
ms.custom:
12+
# Customer intent: As an infrastructure admin, I want to cleanly remove my SCVMM environment from Azure Arc.
13+
---
14+
15+
# Remove your SCVMM environment from Azure Arc
16+
17+
> [!CAUTION]
18+
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly.
19+
20+
In this article, you learn how to cleanly remove your SCVMM managed environment from Azure Arc-enabled SCVMM. For SCVMM environments that you no longer want to manage with Azure Arc-enabled SCVMM, follow the steps in the article to:
21+
22+
1. Remove guest management from SCVMM virtual machines
23+
2. Remove your SCVMM environment from Azure Arc
24+
3. Remove Arc resource bridge related items in your SCVMM management server
25+
26+
## 1. Remove guest management from SCVMM virtual machines
27+
To prevent continued billing of Azure management services after you remove the SCVMM environment from Azure Arc, you must first cleanly remove guest management from all Arc-enabled SCVMM virtual machines where it was enabled. When you enable guest management on Arc-enabled SCVMM virtual machines, the Arc connected machine agent is installed on them.
28+
29+
Once guest management is enabled, you can install VM extensions on them and use Azure management services like the Log Analytics on them. To cleanly remove guest management, you must follow the steps below to remove any VM extensions from the virtual machine, disconnect the agent, and uninstall the software from your virtual machine. It's important to complete each of the three steps to fully remove all related software components from your virtual machines.
30+
31+
### Step 1: Remove VM extensions
32+
33+
If you have deployed Azure VM extensions to an Azure Arc-enabled SCVMM VM, you must uninstall the extensions before disconnecting the agent or uninstalling the software. Uninstalling the Azure Connected Machine agent doesn't automatically remove extensions, and they won't be recognized if you later connect the VM to Azure Arc again. Uninstall extensions using the following steps:
34+
35+
1. Go to [Azure Arc center in Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/overview)
36+
37+
2. Select **SCVMM management servers**.
38+
39+
3. Search and select the VMM management server you want to remove from Azure Arc.
40+
41+
4. Select Virtual machines under SCVMM inventory.
42+
43+
5. Search and select the virtual machine where you have Guest Management enabled.
44+
45+
6. Select Extensions.
46+
47+
7. Select the extensions and select Uninstall.
48+
49+
### Step 2: Disconnect the agent from Azure Arc
50+
51+
Disconnecting the agent clears the local state of the agent and removes agent information from our systems. To disconnect the agent, sign-in and run the following command as an administrator/root account on the virtual machine.
52+
53+
```powershell
54+
azcmagent disconnect --force-local-only
55+
```
56+
57+
### Step 3: Uninstall the agent
58+
59+
#### For Windows virtual machines
60+
61+
To uninstall the Windows agent from the machine, do the following:
62+
63+
1. Sign in to the computer with an account that has administrator permissions.
64+
2. In Control Panel, select Programs and Features.
65+
3. In Programs and Features, select Azure Connected Machine Agent, select Uninstall, and then select Yes.
66+
4. Delete the `C:\Program Files\AzureConnectedMachineAgent` folder.
67+
68+
#### For Linux virtual machines
69+
70+
To uninstall the Linux agent, the command to use depends on the Linux operating system. You must have `root` access permissions or your account must have elevated rights using sudo.
71+
72+
- For Ubuntu, run the following command:
73+
74+
```bash
75+
sudo apt purge azcmagent
76+
```
77+
78+
- For RHEL, CentOS, Oracle Linux run the following command:
79+
80+
```bash
81+
sudo yum remove azcmagent
82+
```
83+
84+
- For SLES, run the following command:
85+
86+
```bash
87+
sudo zypper remove azcmagent
88+
```
89+
90+
## 2. Remove your SCVMM environment from Azure Arc
91+
92+
You can remove your SCVMM resources from Azure Arc using either the deboarding script or manually.
93+
94+
### Remove SCVMM managed resources from Azure Arc using deboarding script
95+
96+
Download the [deboarding script](https://download.microsoft.com/download/a/d/b/adb5650c-5c90-4e94-8a93-2a4707c2020a/arcscvmm-deboard-windows.ps1) to do a full cleanup of all the Arc-enabled SCVMM resources. The script removes all the Azure resources, including SCVMM management server, custom location, virtual machines, virtual templates, hosts, clusters, resource pools, datastores, virtual networks, Azure Resource Manager (ARM) resource of Appliance, and the appliance VM running on the SCVMM management server.
97+
98+
#### Run the script
99+
100+
To run the deboarding script, follow these steps:
101+
102+
##### Windows
103+
1. Open a PowerShell window as an Administrator and go to the folder where you've downloaded the PowerShell script.
104+
105+
2. Run the following command to allow the script to run because it's an unsigned script. (If you close the session before you complete all the steps, run this command again for the new session.)
106+
107+
```powershell-interactive
108+
Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass
109+
```
110+
3. Run the script.
111+
112+
```powershell-interactive
113+
./arcvmm-deboard-windows.ps1
114+
```
115+
116+
#### Inputs for the script
117+
118+
- **vmmServerId**: The Azure resource ID of the SCVMM management server resource. </br> For example: */subscriptions/204898ee-cd13-4332-1111-88ca5c11111c/resourceGroups/Synthetics/providers/Microsoft.ScVmm/VMMServers/scvmmserverresource*
119+
120+
- **ApplianceConfigFilePath (optional)**: Path to kubeconfig, output from deploy command. Providing applianceconfigfilepath also deletes the appliance VM running on the SCVMM management server.
121+
122+
- **Force**: Using the Force flag deletes all the Azure resources without reaching resource bridge. Use this option if resource bridge VM isn't in running state.
123+
124+
### Remove SCVMM managed resources from Azure manually
125+
126+
If you aren't using the deboarding script, follow these steps to remove the SCVMM resources manually:
127+
128+
>[!NOTE]
129+
>When you enable SCVMM resources in Azure, an Azure resource representing them is created. Before you can delete the SCVMM management server resource in Azure, you must delete all the Azure resources that represent your related SCVMM resources.
130+
131+
1. Go to [Azure Arc center in Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/overview)
132+
133+
2. Select **SCVMM management servers**.
134+
135+
3. Search and select the SCVMM management server you want to remove from Azure Arc.
136+
137+
4. Select **Virtual machines** under **SCVMM inventory**.
138+
139+
5. Select all the VMs that have **Virtual hardware management** value as **Enabled**.
140+
141+
6. Select **Remove from Azure**.
142+
143+
This action only removes these resource representations from Azure. The resources continue to remain in your SCVMM management server.
144+
145+
7. Do the steps 4, 5, and 6 for **Clouds**, **VM networks**, and **VM templates** by performing **Remove from Azure** operation for resources with **Azure Enabled** value as **Yes**.
146+
147+
8. Once the deletion is complete, select **Overview**.
148+
149+
9. Note the **Custom location** and the **Azure Arc Resource bridge** resource in the **Essentials** section.
150+
151+
10. Select **Remove from Azure** to remove the SCVMM management server resource from Azure.
152+
153+
11. Go to the noted **Custom location** resource and select **Delete**
154+
155+
12. Go to the noted **Azure Arc Resource bridge** resource and select **Delete**
156+
157+
At this point, all your Arc-enabled SCVMM resources are removed from Azure.
158+
159+
## 3. Remove Arc resource bridge related items in your VMM management server
160+
161+
During onboarding, to create a connection between your SCVMM management server and Azure, an Azure Arc resource bridge was deployed in your SCVMM managed environment. As the last step, you must delete the resource bridge VM and the VM template created during the onboarding.
162+
163+
You can find both the virtual machine and the template on the resource pool/cluster/host/cloud that you provided during [Azure Arc-enabled SCVMM onboarding](./quickstart-connect-system-center-virtual-machine-manager-to-arc.md).
164+
165+
## Next steps
166+
167+
[Connect your System Center Virtual Machine Manager management server to Azure Arc again](./quickstart-connect-system-center-virtual-machine-manager-to-arc.md).

‎articles/azure-arc/system-center-virtual-machine-manager/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
items:
4747
- name: Administer Arc-enabled SCVMM
4848
href: administer-arc-scvmm.md
49+
- name: Remove your SCVMM environment from Azure Arc
50+
href: remove-scvmm-from-azure-arc.md
4951
- name: Perform recovery operations for Arc resource bridge
5052
href: disaster-recovery.md
5153

‎articles/azure-monitor/logs/log-analytics-workspace-health.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,16 @@ To view Log Analytics workspace health metrics:
8383
1. Select **Metrics** from the Log Analytics workspace menu. This opens [Metrics Explorer](../essentials/metrics-charts.md) in context of your Log Analytics workspace.
8484
1. In the **Metric** field, select one of the Log Analytics workspace health metrics:
8585

86-
| Metric name | Description |
87-
| - | - |
88-
| Query count | Total number of user queries in the Log Analytics workspace within the selected time range.<br>This number includes only user-initiated queries, and doesn't include queries initiated by Sentinel rules and alert-related queries. |
89-
| Query failure count | Total number of failed user queries in the Log Analytics workspace within the selected time range.<br>This number includes all queries that return 5XX response codes - except 504 *Gateway Timeout* - which indicate an error related to the application gateway or the backend server.|
90-
| AvailabilityRate_Query | Percentage of successful user queries in the Log Analytics workspace within the selected time range.<br>This number includes all queries that return 2XX, 4XX, and 504 response codes; in other words, all user queries that don't result in a service error. |
86+
| Category | Metric name | Scope | Description |
87+
| - | - | - | - |
88+
| SLI | AvailabilityRate_Query | Workspace | Percentage of successful user queries in the Log Analytics workspace within the selected time range.<br>This number includes all queries that return 2XX, 4XX, and 504 response codes; in other words, all user queries that don't result in a service error. |
89+
| SLI | Ingestion Time | Workspace or table | Time in seconds it took since record recieved in Azure Monitor Logs cloud service until it was available for queries. It is recommended to examine ingestion time for specific tables. See more details [here](./data-ingestion-time.md). |
90+
| SLI | Ingestion Volume | Workspace or table | Number of records ingested into a workspace or a table. |
91+
| User Queries | Query count | Workspace | Total number of user queries in the Log Analytics workspace within the selected time range.<br>This number includes only user-initiated queries, and doesn't include queries initiated by Sentinel rules and alert-related queries. |
92+
| User Queries | Query failure count | Workspace | Total number of failed user queries in the Log Analytics workspace within the selected time range.<br>This number includes all queries that return 5XX response codes - except 504 *Gateway Timeout* - which indicate an error related to the application gateway or the backend server.|
93+
| [Data Export](./logs-data-export.md) | Bytes Exported | Workspace | Total number of bytes exported to destination from Log Analytics workspace within the selected time range. The size of data exported is the number of bytes in the exported JSON formatted data. 1 GB = 10^9 bytes. |
94+
| [Data Export](./logs-data-export.md) | Export Failures | Workspace | Total number of failed export requests in the Log Analytics workspace within the selected time range. <br>This number includes export failures that can result by Azure Monitor, destination resource availability, or throttling. |
95+
| [Data Export](./logs-data-export.md) | Records exported | Workspace | Total number of records exported from Log Analytics workspace within the selected time range. |
9196

9297
## Investigate Log Analytics workspace health issues
9398

0 commit comments

Comments
 (0)