Merge pull request #297199 from MicrosoftDocs/main

Publish to live, Friday 4 AM PST, 3/28

Author: ttorble

articles/api-management/api-management-capacity.md

@@ -123,10 +123,6 @@ Access metrics in the portal to understand how much capacity is used over time.
 > [!IMPORTANT]
 > Currently, the **CPU Percentage of Gateway** and **Memory Consumption of Gateway** metrics also appear in the portal for instances in classic tiers. However, they're not supported for use in classic tiers and show a value of 0.
 
-
-
-
-
 > [!NOTE]
 > * You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your API Management instance has exceeded its expected peak capacity for more than 20 minutes.
 > * You can use Azure Monitor [autoscaling](api-management-howto-autoscale.md) to automatically add an Azure API Management unit. Scaling operation can take around 30 minutes, so you should plan your rules accordingly.  
@@ -146,8 +142,11 @@ Use capacity metrics for making decisions whether to scale an API Management ins
 >[!TIP]  
 > If you are able to estimate your traffic beforehand, test your API Management instance on workloads you expect. You can increase the request load on your tenant gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.
 
+> [!IMPORTANT]
+> When defining autoscaling rules, make sure to avoid autoscaling flapping that will cause a scale in/scale out loop. To learn more, we recommend reading [Azure Monitor Autoscale's guidance around flapping](/azure/azure-monitor/autoscale/autoscale-flapping).
+
 ## Related content
 
 - [Upgrade and scale an Azure API Management service instance](upgrade-and-scale.md)
 - [Automatically scale an Azure API Management instance](api-management-howto-autoscale.md)
-- [Plan and manage costs for API Management](plan-manage-costs.md)
+- [Plan and manage costs for API Management](plan-manage-costs.md)

articles/azure-app-configuration/howto-create-snapshots.md

@@ -5,7 +5,7 @@ author: Muksvso
 ms.author: mubatra
 ms.service: azure-app-configuration
 ms.topic: how-to 
-ms.date: 11/15/2023
+ms.date: 03/19/2025
 ---
 
 # Manage and use snapshots
@@ -96,8 +96,8 @@ Edit the call to the `AddAzureAppConfiguration` method, which is often found in
 ```csharp
 configurationBuilder.AddAzureAppConfiguration(options =>
 {
-    options.Connect(Environment.GetEnvironmentVariable("ConnectionString"));
-
+    string endpoint = Environment.GetEnvironmentVariable("Endpoint"); 
+    options.Connect(new Uri(endpoint), new DefaultAzureCredential());
     // Select an existing snapshot by name. This will add all of the key-values from the snapshot to this application's configuration.
     options.SelectSnapshot("SnapshotName");
 

articles/azure-app-configuration/howto-labels-aspnet-core.md

@@ -7,13 +7,13 @@ ms.devlang: csharp
 author: maud-lv
 ms.topic: conceptual
 ms.custom: devx-track-csharp
-ms.date: 02/20/2024
+ms.date: 03/19/2025
 ms.author: malev
 
 ---
 # Use labels to provide per-environment configuration values.
 
-Many applications need to use different configurations for different environments. Suppose that an application has a configuration value that defines the connection string to use for its back-end database. The application developers use a different database from the one used in production. The database connection string that the application uses must change as the application moves from development to production.
+Many applications need to use different configurations for different environments. Suppose that an application has a configuration value that defines the endpoint to use for its back-end database. The application developers use a different database from the one used in production. The database endpoint that the application uses must change as the application moves from development to production.
 
 In Azure App Configuration, you can use *labels* to define different values for the same key. For example, you can define a single key with different values for development and production. You can specify which label to load when connecting to App Configuration.
 
@@ -47,17 +47,15 @@ var builder = WebApplication.CreateBuilder(args);
 
 builder.Configuration.AddAzureAppConfiguration(options =>
     {
-            options.Connect(builder.Configuration.GetConnectionString("AppConfig"))
-                // Load configuration values with no label
-                .Select(KeyFilter.Any, LabelFilter.Null)
-                // Override with any configuration values specific to current hosting env
-                .Select(KeyFilter.Any, builder.Environment.EnvironmentName);
+        string endpoint = Environment.GetEnvironmentVariable("Endpoint");
+        options.Connect(new Uri(endpoint), new DefaultAzureCredential())
+               // Load configuration values with no label
+               .Select(KeyFilter.Any, LabelFilter.Null)
+               // Override with any configuration values specific to current hosting env
+               .Select(KeyFilter.Any, builder.Environment.EnvironmentName);
     });
 ```
 
-> [!IMPORTANT]
-> The preceding code snippet uses the Secret Manager tool to load App Configuration connection string. For information storing the connection string using the Secret Manager, see [Quickstart for Azure App Configuration with ASP.NET Core](quickstart-aspnet-core-app.md).
-
 The `Select` method is called twice. The first time, it loads configuration values with no label. Then, it loads configuration values with the label corresponding to the current environment. These environment-specific values override any corresponding values with no label. You don't need to define environment-specific values for every key. If a key doesn't have a value with a label corresponding to the current environment, it uses the value with no label.
 
 ## Test in different environments

articles/backup/blob-backup-configure-quick.md

@@ -2,7 +2,7 @@
 title: Quickstart - Configure vaulted backup for Azure Blobs using Azure Backup
 description: In this quickstart, learn how to configure vaulted backup for Azure Blobs.
 ms.topic: quickstart
-ms.date: 02/12/2025
+ms.date: 03/28/2025
 ms.service: azure-backup
 author: jyothisuri
 ms.author: jsuri
@@ -29,7 +29,6 @@ Things to remember before you start configuring blob vaulted backup:
 
 - Vaulted backup of blobs is a managed offsite backup solution that transfers data to the backup vault and retains as per the retention configured in the backup policy. You can retain data for a maximum of *10 years*.
 - Currently, you can use the vaulted backup solution to restore data to a different storage account only. While performing restores, ensure that the target storage account doesn't contain any *containers* with the same name as those backed up in a recovery point. If any conflicts arise due to the same name of containers, the restore operation fails.
-- Storage accounts to be backed up need to have *cross-tenant replication* enabled. To ensure if the checkbox for this setting is enabled, go to the **storage account** > **Object replication** > **Advanced settings**.
 
 For more information about the supported scenarios, limitations, and availability, see the [support matrix](blob-backup-support-matrix.md).
 

articles/communication-services/tutorials/media/virtual-visits/azure-resource-final.png

@@ -83,11 +83,10 @@ The following properties are supported for the Azure Database for PostgreSQL lin
 |:--- |:--- |:--- |
 | type | The type property must be set to: **AzurePostgreSql**. | Yes |
 | version | The version that you specify. The value is `2.0`. | Yes |
+| authenticationType | Select from basic or service principal authentication | Yes |
 | server | Specifies the host name and optionally port on which Azure Database for PostgreSQL is running. | Yes |
 | port |The TCP port of the Azure Database for PostgreSQL server. The default value is `5432`. |No |
 | database| The name of the Azure Database for PostgreSQL database to connect to. |Yes |
-| username| The username to connect with. Not required if using IntegratedSecurity. |Yes |
-| password| The password to connect with. Not required if using IntegratedSecurity. Mark this field as **SecureString** to store it securely. Or, you can  [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). |Yes |
 | sslMode | Controls whether SSL is used, depending on server support. <br/>- **Disable**: SSL is disabled. If the server requires SSL, the connection will fail.<br/>- **Allow**: Prefer non-SSL connections if the server allows them, but allow SSL connections.<br/>- **Prefer**: Prefer SSL connections if the server allows them, but allow connections without SSL.<br/>- **Require**: The connection fails if the server doesn't support SSL.<br/>- **Verify-ca**: The connection fails if the server doesn't support SSL. Also verifies server certificate.<br/>- **Verify-full**: The connection fails if the server doesn't support SSL. Also verifies server certificate with host's name. <br/>Options: Disable (0) / Allow (1) / Prefer (2) **(Default)** / Require (3) / Verify-ca (4) / Verify-full (5) | No |
 | connectVia | This property represents the [integration runtime](concepts-integration-runtime.md) to be used to connect to the data store. You can use Azure Integration Runtime or Self-hosted Integration Runtime (if your data store is located in private network). If not specified, it uses the default Azure Integration Runtime.|No|
 | ***Additional connection properties:*** |  |  |
@@ -100,6 +99,13 @@ The following properties are supported for the Azure Database for PostgreSQL lin
 | timezone | Gets or sets the session timezone. | No |
 | encoding | Gets or sets the .NET encoding that will be used to encode/decode PostgreSQL string data. | No |
 
+### Basic authentication
+
+| Property | Description | Required |
+|:--- |:--- |:--- |
+| username | The username to connect with. Not required if using IntegratedSecurity. | Yes |
+| password | The password to connect with. Not required if using IntegratedSecurity. Mark this field as **SecureString** to store it securely. Or, you can  [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). | Yes |
+
 **Example**:
 
 ```json
@@ -149,8 +155,81 @@ The following properties are supported for the Azure Database for PostgreSQL lin
         }
     }
 }
+``` 
+
+### Service principal authentication
+
+| Property | Description | Required |
+|:--- |:--- |:--- |
+| username | The display name of the service principal | Yes |
+| tenant | The tenant which the Azure Database for PostgreSQL server is located |Yes |
+| servicePrincipalId | Application ID of service principal |Yes |
+| servicePrincipalCredentialType | Select if service principal certificate or service principal key is desired authentication method<br/>- **ServicePrincipalCert**: Set to service principal certificate for service principal certificate.<br/>- **ServicePrincipalKey**: Set to service principal key for service principal key authentication. | Yes |
+| servicePrincipalKey | Client secret value. Used when service principal key is selected | Yes |
+| azureCloudType | Select the Azure cloud type of your Azure Database for PostgreSQL server | Yes |
+| servicePrincipalEmbeddedCert | Service principal certificate file | Yes |
+| servicePrincipalEmbeddedCertPassword | Service principal certificate password if required | No |
+
+**Example**:
+
+**Service principal key**
+```json
+{
+    "name": "AzurePostgreSqlLinkedService",
+    "type": "Microsoft.DataFactory/factories/linkedservices",
+    "properties": {
+        "annotations": [],
+        "type": "AzurePostgreSql",
+        "version": "2.0",
+        "typeProperties": {
+            "server": "<server name>",
+            "port": 5432,
+            "database": "<database name>",
+            "sslMode": 2,
+            "username": "<service principal name>",
+            "authenticationType": "<authentication type>",
+            "tenant": "<tenant>",
+            "servicePrincipalId": "<service principal ID>",
+            "azureCloudType": "<azure cloud type>",
+            "servicePrincipalCredentialType": "<service principal type>",
+            "servicePrincipalKey": "<service principal key>"
+        }
+    }
+}
+```
+
+**Example**:
+
+**Service principal certificate**
+```json
+{
+    "name": "AzurePostgreSqlLinkedService",
+    "type": "Microsoft.DataFactory/factories/linkedservices",
+    "properties": {
+        "annotations": [],
+        "type": "AzurePostgreSql",
+        "version": "2.0",
+        "typeProperties": {
+            "server": "<server name>",
+            "port": 5432,
+            "database": "<database name>",
+            "sslMode": 2,
+            "username": "<service principal name>",
+            "authenticationType": "<authentication type>",
+            "tenant": "<tenant>",
+            "servicePrincipalId": "<service principal ID>",
+            "azureCloudType": "<azure cloud type>",
+            "servicePrincipalCredentialType": "<service principal type>",
+            "servicePrincipalEmbeddedCert": "<service principal certificate>",
+            "servicePrincipalEmbeddedCertPassword": "<service principal embedded certificate password>"
+        }
+    }
+}
 ```
 
+
+
+
 ### Version 1.0
 
 The following properties are supported for the Azure Database for PostgreSQL linked service when you apply version 1.0: