Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mrb_08_08_2024_usage_tier

mrbullwinkle · mrbullwinkle · commit a78068210f3d · 2024-08-08T12:05:04.000-04:00
diff --git a/articles/app-service/includes/quickstart-python/deploy-zip-file.md b/articles/app-service/includes/quickstart-python/deploy-zip-file.md
@@ -50,33 +50,14 @@ zip -r <file-name>.zip . -x '.??*'
 
 ### Upload the ZIP file to Azure
 
-Once you have a ZIP file, the file can be uploaded to Azure using either Azure CLI or an HTTP client like Postman or cURL.
+Once you have a ZIP file, the file can be uploaded to Azure using either Azure CLI or an HTTP client like cURL.
 
 #### [Azure CLI](#tab/deploy-instructions-zip-azcli)
 
 The [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command can be used to upload and deploy a zip file to Azure.
 
 [!INCLUDE [Azure CLI deploy commands](./deploy-zip-cli-commands.md)]
 
-#### [Postman](#tab/deploy-instructions-zip-postman)
-
-To use [Postman](https://www.postman.com/downloads/) to upload your ZIP file to Azure, you will need the deployment username and password for your App Service. These credentials can be obtained from the Azure portal.
-
-1. On the page for the web app, select **Deployment center** from the menu on the left side of the page.
-1. Select the **FTPS credentials** tab.
-1. The **Username** and **Password** are shown under the **Application scope** heading.  For zip file deployments, only use the part of the username after the `\` character that starts with a `$`, for example `$msdocs-python-webapp-quickstart-123`. These credentials will be needed when uploading your zip file with Postman.
-
-:::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-get-username-600px.png" alt-text="A screenshot showing the location of the deployment credentials in the Azure portal." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-get-username.png":::
-
-In Postman, upload your file using the following steps.
-
-| Instructions    | Screenshot |
-|:----------------|-----------:|
-| [!INCLUDE [Postman upload step 1](./deploy-zip-postman-1.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-1-240px.png" alt-text="A screenshot showing how to create a new POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-1.png"::: |
-| [!INCLUDE [Postman upload step 2](./deploy-zip-postman-2.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-2-240px.png" alt-text="A screenshot showing how to configure basic authorization for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-2.png"::: |
-| [!INCLUDE [Postman upload step 3](./deploy-zip-postman-3.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-3-240px.png" alt-text="A screenshot showing how to select a file for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-3.png"::: |
-| [!INCLUDE [Postman upload step 4](./deploy-zip-postman-4.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-4-240px.png" alt-text="A screenshot showing how to send a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-4.png"::: |
-
 #### [cURL](#tab/deploy-instructions-zip-curl)
 
 To use cURL to upload your ZIP file to Azure, you will need the deployment username and password for your App Service. These credentials can be obtained from the Azure portal.
diff --git a/articles/azure-monitor/containers/prometheus-metrics-scrape-crd.md b/articles/azure-monitor/containers/prometheus-metrics-scrape-crd.md
@@ -7,8 +7,6 @@ ms.reviewer: aul
 ---
 # Customize collection using CRDs (Service and Pod Monitors)
 
-> [!NOTE]
-  > CRD support with Managed Prometheus is currently in preview.
 
 The enablement of Managed Prometheus automatically deploys the custom resource definitions (CRD) for [pod monitors](https://github.com/Azure/prometheus-collector/blob/main/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-podmonitor-crd.yaml) and [service monitors](https://github.com/Azure/prometheus-collector/blob/main/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-servicemonitor-crd.yaml). These custom resource definitions are the same custom resource definitions (CRD) as [OSS Pod monitors](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.PodMonitor) and [OSS service monitors](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.ServiceMonitor) for Prometheus, except for a change in the group name. If you have existing Prometheus CRDs and custom resources on your cluster, these CRDs won't conflict with the CRDs created by the add-on. At the same time, the managed Prometheus addon does not pick up the CRDs created for the OSS Prometheus. This separation is intentional for the purposes of isolation of scrape jobs.
 
diff --git a/articles/azure-netapp-files/azure-netapp-files-set-up-capacity-pool.md b/articles/azure-netapp-files/azure-netapp-files-set-up-capacity-pool.md
@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: how-to
-ms.date: 07/30/2024
+ms.date: 08/08/2024
 ms.author: anfdocs
 ---
 # Create a capacity pool for Azure NetApp Files
@@ -78,18 +78,6 @@ Creating a capacity pool enables you to create volumes within it.
 
     :::image type="content" source="./media/shared/azure-netapp-files-new-capacity-pool.png" alt-text="Screenshot showing the New Capacity Pool window.":::
 
-    Azure NetApp Files double encryption at rest is currently in preview. If using this feature for the first time, you need to register the feature first.  
-
-    1. Register the feature: 
-        ```azurepowershell-interactive
-        Register-AzProviderFeature -ProviderNamespace Microsoft.NetApp -FeatureName ANFDoubleEncryption
-        ```
-    2. Check the status of the feature registration. `RegistrationState` may be in the `Registering` state for up to 60 minutes before changing to`Registered`. Wait until the status is `Registered` before continuing. 
-        ```azurepowershell-interactive
-        Get-AzProviderFeature -ProviderNamespace Microsoft.NetApp -FeatureName ANFDoubleEncryption
-        ```   
-    You can also use [Azure CLI commands](/cli/azure/feature) `az feature register` and `az feature show` to register the feature and display the registration status. 
-
 4. Select **Create**.
 
     The **Capacity pools** page shows the configurations for the capacity pool.  
diff --git a/articles/azure-netapp-files/double-encryption-at-rest.md b/articles/azure-netapp-files/double-encryption-at-rest.md
@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: conceptual
-ms.date: 05/29/2024
+ms.date: 08/08/2024
 ms.author: anfdocs
 ms.custom: references_regions
 ---
@@ -19,7 +19,7 @@ When data is transported over networks, additional encryption such as Transport
 
 Azure NetApp Files double encryption at rest provides two levels of encryption protection: both a hardware-based encryption layer (encrypted SSD drives) and a software-encryption layer. The hardware-based encryption layer resides at the physical storage level, using FIPS 140-2 certified drives. The software-based encryption layer is at the volume level completing the second level of encryption protection.
 
-If you are using this feature for the first time, you need to [register for the feature](azure-netapp-files-set-up-capacity-pool.md#encryption_type) and then create a double-encryption capacity pool. For details, see [Create a capacity pool for Azure NetApp Files](azure-netapp-files-set-up-capacity-pool.md).
+If you are using this feature for the first time, you need to create a double-encryption capacity pool. For details, see [Create a capacity pool for Azure NetApp Files](azure-netapp-files-set-up-capacity-pool.md).
 
 When you create a volume in a double-encryption capacity pool, the default key management (the **Encryption key source** field) is `Microsoft Managed Key`, and the other choice is `Customer Managed Key`. Using customer-managed keys requires additional preparation of an Azure Key Vault and other details.  For more information about using volume encryption with customer managed keys, see [Configure customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md).
 
diff --git a/articles/azure-netapp-files/whats-new.md b/articles/azure-netapp-files/whats-new.md
@@ -14,6 +14,10 @@ ms.author: anfdocs
 
 Azure NetApp Files is updated regularly. This article provides a summary about the latest new features and enhancements.
 
+## August 2024 
+
+* [Azure NetApp Files double encryption at rest](double-encryption-at-rest.md) is now generally available (GA). 
+
 ## July 2024
 
 * Availability zone volume placement enhancement - [**Populate existing volumes**](manage-availability-zone-volume-placement.md#populate-an-existing-volume-with-availability-zone-information) is now generally available (GA).
