Merge pull request #230598 from MicrosoftDocs/main

Publish to live, Tuesday 4 AM PST, 3/14

Author: ttorble

.openpublishing.redirection.azure-monitor.json

@@ -6005,6 +6005,26 @@
             "source_path_from_root": "/articles/azure-monitor/app/availability-multistep.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/availability-multistep",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-overview.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-get-started.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-detailed-instructions.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-api-reference.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -89,6 +89,61 @@
       "source_path": "articles/lab-services/troubleshoot.md",
       "redirect_url": "/azure/lab-services/troubleshoot-lab-creation",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-portal.md",
+      "redirect_url": "/azure/lab-services/quick-create-connect-lab",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/tutorial-setup-lab-plan.md",
+      "redirect_url": "/azure/lab-services/quick-create-resources",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-portal.md",
+      "redirect_url": "/azure/lab-services/quick-create-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-bicep.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-bicep.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-bicep",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-powershell.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-powershell",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-python.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-template",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-powershell.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-powershell",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-python.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-template",
+      "redirect_document_id": true
     }
   ]
 }

articles/api-management/TOC.yml

@@ -26,6 +26,8 @@
       - name: Create an instance - ARM template
         displayName: Resource Manager
         href: quickstart-arm-template.md
+      - name: Create an instance - Terraform
+        href: quickstart-terraform.md
 - name: Tutorials
   items:
       - name: 1 - Import your first API

articles/api-management/quickstart-terraform.md

@@ -0,0 +1,126 @@
+---
+title: 'Quickstart: Create an Azure API Management service using Terraform'
+description: 'In this article, you create an Azure API Management service using Terraform.'
+ms.topic: quickstart
+ms.service: api-management
+ms.date: 3/13/2023
+ms.custom: devx-track-terraform
+author: TomArcherMsft
+ms.author: tarcher
+---
+
+# Quickstart: Create an Azure API Management service using Terraform
+
+This article shows how to use [Terraform](/azure/terraform) to create an [API Management service instance](/azure/api-management/api-management-key-concepts) on Azure. API Management helps organizations publish APIs to external, partner, and internal developers to unlock the potential of their data and services. API Management provides the core competencies to ensure a successful API program through developer engagement, business insights, analytics, security, and protection. API Management enables you to create and manage modern API gateways for existing backend services hosted anywhere. For more information, see the [Azure API Management - Overview and key concepts](api-management-key-concepts.md).
+
+[!INCLUDE [Terraform abstract](~/azure-dev-docs-pr/articles/terraform/includes/abstract.md)]
+
+In this article, you learn how to:
+
+> [!div class="checklist"]
+> * Create a random pet name for the Azure resource group name using [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet)
+> * Create an Azure resource group using [azurerm_resource_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group)
+> * Create a random string for the Azure API Management service name using [random_string](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string)
+> * Create an Azure API Management service using [azurerm_api_management](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management)
+
+[!INCLUDE [AI attribution](../../includes/ai-generated-attribution.md)]
+
+## Prerequisites
+
+- [Install and configure Terraform](/azure/developer/terraform/quickstart-configure)
+
+## Implement the Terraform code
+
+> [!NOTE]
+> The sample code for this article is located in the [Azure Terraform GitHub repo](https://github.com/Azure/terraform/tree/master/quickstart/101-azure-api-management-create). You can view the log file containing the [test results from current and previous versions of Terraform](https://github.com/Azure/terraform/tree/master/quickstart/101-azure-api-management-create/TestRecord.md).
+> 
+> See more [articles and sample code showing how to use Terraform to manage Azure resources](/azure/terraform)
+
+1. Create a directory in which to test and run the sample Terraform code and make it the current directory.
+
+1. Create a file named `main.tf` and insert the following code:
+
+    [!code-terraform[master](~/terraform_samples/quickstart/101-azure-api-management-create/main.tf)]
+
+1. Create a file named `outputs.tf` and insert the following code:
+
+    [!code-terraform[master](~/terraform_samples/quickstart/101-azure-api-management-create/outputs.tf)]
+
+1. Create a file named `providers.tf` and insert the following code:
+
+    [!code-terraform[master](~/terraform_samples/quickstart/101-azure-api-management-create/providers.tf)]
+
+1. Create a file named `variables.tf` and insert the following code:
+
+    [!code-terraform[master](~/terraform_samples/quickstart/101-azure-api-management-create/variables.tf)]
+
+## Initialize Terraform
+
+[!INCLUDE [terraform-init.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
+
+## Create a Terraform execution plan
+
+[!INCLUDE [terraform-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
+
+## Apply a Terraform execution plan
+
+[!INCLUDE [terraform-apply-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
+
+## Verify the results
+
+#### [Azure CLI](#tab/azure-cli)
+
+1. Get the Azure resource group name.
+
+    ```console
+    resource_group_name=$(terraform output -raw resource_group_name)
+    ```
+
+1. Get the service name.
+
+    ```console
+    api_management_service_name=$(terraform output -raw api_management_service_name)
+    ```
+
+1. Run [az apim show](/cli/azure/apim#az-apim-show) to display information about the new service.
+
+    ```azurecli
+    az apim show --resource-group $resource_group_name \
+                 --name $api_management_service_name
+    ```
+
+#### [Azure PowerShell](#tab/azure-powershell)
+
+1. Get the Azure resource group name.
+
+    ```console
+    $resource_group_name=$(terraform output -raw resource_group_name)
+    ```
+
+1. Get the service name.
+
+    ```console
+    $api_management_service_name=$(terraform output -raw api_management_service_name)
+    ```
+
+1. Run [Get-AzApiManagement](/powershell/module/az.apimanagement/get-azapimanagement) to display information about the new service.
+
+    ```azurepowershell
+    Get-AzApiManagement -ResourceGroupName $resource_group_name `
+                        -Name $api_management_service_name
+    ```
+
+---
+
+## Clean up resources
+
+[!INCLUDE [terraform-plan-destroy.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-destroy.md)]
+
+## Troubleshoot Terraform on Azure
+
+[Troubleshoot common problems when using Terraform on Azure](/azure/developer/terraform/troubleshoot)
+
+## Next steps
+
+> [!div class="nextstepaction"] 
+> [Tutorial: Import and publish your first API](import-and-publish.md)

articles/app-service/overview.md

@@ -25,7 +25,7 @@ Azure App Service is a fully managed platform as a service (PaaS) offering for d
 * **Containerization and Docker** - Dockerize your app and host a custom Windows or Linux container in App Service. Run multi-container apps with Docker Compose. Migrate your Docker skills directly to App Service.
 * **DevOps optimization** - Set up [continuous integration and deployment](deploy-continuous-deployment.md) with Azure DevOps, GitHub, BitBucket, Docker Hub, or Azure Container Registry. Promote updates through [test and staging environments](deploy-staging-slots.md). Manage your apps in App Service by using [Azure PowerShell](/powershell/azure/) or the [cross-platform command-line interface (CLI)](/cli/azure/install-azure-cli).
 * **Global scale with high availability** - Scale [up](manage-scale-up.md) or [out](../azure-monitor/autoscale/autoscale-get-started.md) manually or automatically. Host your apps anywhere in Microsoft's global datacenter infrastructure, and the App Service [SLA](https://azure.microsoft.com/support/legal/sla/app-service/) promises high availability.
-* **Connections to SaaS platforms and on-premises data** - Choose from more than 50 [connectors](../connectors/apis-list.md) for enterprise systems (such as SAP), SaaS services (such as Salesforce), and internet services (such as Facebook). Access on-premises data using [Hybrid Connections](app-service-hybrid-connections.md) and [Azure Virtual Networks](./overview-vnet-integration.md).
+* **Connections to SaaS platforms and on-premises data** - Choose from [many hundreds of  connectors](/connectors/connector-reference/connector-reference-logicapps-connectors) for enterprise systems (such as SAP), SaaS services (such as Salesforce), and internet services (such as Facebook). Access on-premises data using [Hybrid Connections](app-service-hybrid-connections.md) and [Azure Virtual Networks](./overview-vnet-integration.md).
 * **Security and compliance** - App Service is [ISO, SOC, and PCI compliant](https://www.microsoft.com/trustcenter). Authenticate users with [Azure Active Directory](configure-authentication-provider-aad.md), [Google](configure-authentication-provider-google.md), [Facebook](configure-authentication-provider-facebook.md), [Twitter](configure-authentication-provider-twitter.md), or [Microsoft account](configure-authentication-provider-microsoft.md). Create [IP address restrictions](app-service-ip-restrictions.md) and [manage service identities](overview-managed-identity.md). [Prevent subdomain takeovers](reference-dangling-subdomain-prevention.md).
 * **Application templates** - Choose from an extensive list of application templates in the [Azure Marketplace](https://azure.microsoft.com/marketplace/), such as WordPress, Joomla, and Drupal.
 * **Visual Studio and Visual Studio Code integration** - Dedicated tools in Visual Studio and Visual Studio Code streamline the work of creating, deploying, and debugging.

articles/azure-arc/data/backup-restore-postgresql.md

@@ -1,47 +1,41 @@
 ---
-title: Backup and restore for Azure Database for PostgreSQL server
-description: Explains how to back up and restore for Azure Database for PostgreSQL servers
+title: Automated backup for Azure Arc-enabled PostgreSQL server
+description: Explains how to configure backups for Azure Arc-enabled PostgreSQL server
 services: azure-arc
 ms.service: azure-arc
 ms.subservice: azure-arc-data-postgresql
 author: dhanmm
 ms.author: dhmahaja
 ms.reviewer: mikeray
-ms.date: 11/03/2021
+ms.date: 03/12/2023
 ms.topic: how-to
 ---
 
-# Back up and restore Azure Arc-enabled PostgreSQL servers
+# Automated backup Azure Arc-enabled PostgreSQL servers
 
-Automated backups can be enabled by including the `--storage-class-backups` argument when creating an Azure Arc-enabled PostgreSQL server. Specify the retention period for backups with the `--retention-days` parameter, when creating or updating an Arc-enabled PostgreSQL server. The retention period can be between 0 and 35 days. If backups are enabled but no retention period is specified, the default is seven days.
+To enable automated backups, include the `--storage-class-backups` argument when you create an Azure Arc-enabled PostgreSQL server. Specify the retention period for backups with the `--retention-days` parameter. Use this parameter when you create or update an Arc-enabled PostgreSQL server. The retention period can be between 0 and 35 days. If backups are enabled but no retention period is specified, the default is seven days.
 
-Restoring an Azure Arc-enable PostgreSQL server creates a new server by copying the configuration of the existing server (for example resource requests/limits, extensions etc.). Configurations that could cause conflicts (for example primary endpoint port) aren't copied. The storage configuration for the new resource can be defined by passing `--storage-class*` and `--volume-size-*` parameters to the `restore` command.
+Additionally, if you set the retention period to zero, then automated backups are disabled. 
 
-Restore an Azure Arc-enabled PostgreSQL server to a new server with the `restore` command:
-```azurecli
-az postgres server-arc restore -n <destination-server-name> --source-server <source-server-name> --k8s-namespace <namespace> --use-k8s
-```
+[!INCLUDE [azure-arc-data-preview](../../../includes/azure-arc-data-preview.md)]
 
-## Examples:
+## Create server with automated backup
 
-Create a new Arc-enabled PostgreSQL server `pg02` by restoring `pg01` using the latest backups:
-```azurecli
-az postgres server-arc restore -n pg02 --source-server pg01 --k8s-namespace arc --use-k8s
-```
+Create an Azure Arc-enabled PostgreSQL server with automated backups: 
 
-Create a new Arc-enabled PostgreSQL server `pg02` by restoring `pg01` using the latest backups, defining new storage requirements for pg02:
 ```azurecli
-az postgres server-arc restore -n pg02 --source-server pg01 --k8s-namespace arc --storage-class-data azurefile-csi-premium --volume-size-data 10Gi --storage-class-logs azurefile-csi-premium --volume-size-logs 2Gi--use-k8s --storage-class-backups azurefile-csi-premium --volume-size-backups 15Gi
+az postgres server-arc create -n <name> -k <namespace> --storage-class-backups <storage-class> --retention-days <number of days> --use-k8s 
 ```
 
-Create a new Arc-enabled PostgreSQL server `pg02` by restoring `pg01` to its state at `2023-02-01T00:00:00Z`:
-```azurecli
-az postgres server-arc restore -n pg02 --source-server pg01 --k8s-namespace arc -t 2023-02-01T00:00:00Z --use-k8s
-```
+## Update a server to set retention period
+
+Update the backup retention period for an Azure Arc-enabled PostgreSQL server: 
 
-For details about all the parameters available for restore review the output of the command:
 ```azurecli
-az postgres server-arc restore --help
+az postgres server-arc update -n pg01 -k test --retention-days <number of days> --use-k8s 
 ```
 
-- Read about [scaling up or down (increasing/decreasing memory/vcores)](scale-up-down-postgresql-server-using-cli.md) your server.
+## Next steps
+
+- [Restore Azure Arc-enabled PostgreSQL servers](restore-postgresql.md)
+- [Scaling up or down (increasing/decreasing memory/vcores)](scale-up-down-postgresql-server-using-cli.md) your server.

articles/azure-arc/data/configure-security-postgresql.md

@@ -169,6 +169,10 @@ To configure roles and users in your Azure Arc-enabled PostgreSQL server, use th
 
 For audit scenarios please configure your server group to use the `pgaudit` extensions of Postgres. For more details about `pgaudit` see [`pgAudit` GitHub project](https://github.com/pgaudit/pgaudit/blob/master/README.md). To enable the `pgaudit` extension in your server group read [Use PostgreSQL extensions](using-extensions-in-postgresql-server.md).
 
+## Use SSL connection
+
+SSL is required for client connections. In connection string, the SSL mode parameter should not be disabled. [Form connection strings](get-connection-endpoints-and-connection-strings-postgresql-server.md#form-connection-strings).
+
 ## Next steps
 - See [`pgcrypto` extension](https://www.postgresql.org/docs/current/pgcrypto.html)
 - See [Use PostgreSQL extensions](using-extensions-in-postgresql-server.md)

articles/azure-arc/data/deploy-active-directory-postgresql-server-cli.md

@@ -28,6 +28,8 @@ Before you proceed, install the following tools:
 
 To know more further details about how to set up OU and AD account, go to [Deploy Azure Arc-enabled data services in Active Directory authentication - prerequisites](active-directory-prerequisites.md)
 
+> [!IMPORTANT]
+> When using Active Directory, the default account must be named "postgres" in order for connections to succeed.
 
 ## Deploy and update Active Directory integrated Azure Arc-enabled PostgreSQL server
 

articles/azure-arc/data/get-connection-endpoints-and-connection-strings-postgresql-server.md

@@ -64,6 +64,7 @@ Use these end points to:
 - Access the Grafana and Kibana dashboards from your browser
 
 For example, you can use the end point named _PostgreSQL Instance_ to connect with psql to your server group:
+
 ```console
 psql postgresql://postgres:[email protected]:5432
 psql (10.14 (Ubuntu 10.14-0ubuntu0.18.04.1), server 12.4 (Ubuntu 12.4-1.pgdg16.04+1))
@@ -80,6 +81,7 @@ postgres=#
 
 
 ## From CLI with kubectl
+
 ```console
 kubectl get postgresqls/<server name> -n <namespace name>
 ```
@@ -100,6 +102,9 @@ postgres01   Ready   3/3          12.345.567.89:5432   9d
 
 Use the connections string examples below for your server group. Copy, paste, and customize them as needed:
 
+> [!IMPORTANT]
+> SSL is required for client connections. In connection string, the SSL mode parameter should not be disabled. For more information, review [https://www.postgresql.org/docs/14/runtime-config-connection.html](https://www.postgresql.org/docs/14/runtime-config-connection.html).
+
 ### ADO.NET
 
 ```ado.net