Merge pull request #232923 from gourdsay/main

Compliance updates 03312024

Author: prmerger-automator[bot]

articles/data-manager-for-agri/how-to-set-up-private-links.md

@@ -17,6 +17,10 @@ By using Azure Private Link, you can connect to an Azure Data Manager for Agricu
 
 This article describes how to create a private endpoint and approval process for Azure Data Manager for Agriculture Preview.
 
+## Prerequisites
+
+[Create a virtual network](../virtual-network/quick-create-portal.md) in the same subscription as the Azure Data Manager for Agriculture Preview instance. This virtual network will allow automatic approval of the Private Link endpoint.
+
 ## How to set up a private endpoint
 Private Endpoints can be created using the Azure portal, PowerShell, or the Azure CLI:
 

articles/data-manager-for-agri/index.yml

@@ -1,6 +1,6 @@
 ### YamlMime:Landing
 
-title: Microsoft Azure Data Manager for Agriculture. # < 60 chars
+title: Microsoft Azure Data Manager for Agriculture Preview. # < 60 chars
 summary: Microsoft Azure Data Manager for Agriculture enables the industry to accelerate agriculture and sustainability digital solutions. By bringing together and transforming data, Azure Data Manager empowers organizations to drive innovation through insight, reduce environmental impact, optimize operations across the agri-food value chain, and cultivate trust rooted in transparency.
 
 metadata:

articles/industry/agriculture/install-azure-farmbeats.md

@@ -11,7 +11,10 @@ ms.author: atinb
 
 This article describes how to install Azure FarmBeats in your Azure subscription.
 
-Azure FarmBeats is a business-to-business offering available in Azure Marketplace. It enables aggregation of agriculture data sets across providers and generation of actionable insights. Azure FarmBeats does this by enabling you to build artificial intelligence (AI) or machine learning (ML) models based on fused data sets. The two main components of Azure FarmBeats are:
+Azure FarmBeats is a business-to-business offering available in Azure Marketplace. It enables aggregation of agriculture data sets across providers and generation of actionable insights. Azure FarmBeats does so by enabling you to build artificial intelligence (AI) or machine learning (ML) models based on fused data sets. The two main components of Azure FarmBeats are:
+
+> [!NOTE]
+> Azure FarmBeats is on path to be retired. We have built a new agriculture focused service, it's name is Azure Data Manager for Agriculture and it's now available as a preview service. For more information see public documentation [**here**](../../data-manager-for-agri/overview-azure-data-manager-for-agriculture.md) or write to us at [email protected]. 
 
 - **Data hub**: An API layer that enables aggregation, normalization, and contextualization of various agriculture data sets across different providers.
 
@@ -74,11 +77,11 @@ You'll need to complete the following steps before you start the actual installa
 
 You'll need the following permissions in the Azure tenant to install Azure FarmBeats:
 
-- Tenant - AAD app creator
+- Tenant - Azure AD app creator
 - Subscription - Owner
 - Resource Group in which FarmBeats is being installed - Owner
 
-The first two permissions are needed for [creating the AAD application](#create-an-aad-application) step. If needed, you can get someone with the appropriate permissions to create the AAD application.
+The first two permissions are needed for [creating the Azure AD application](#create-an-aad-application) step. If needed, you can get someone with the appropriate permissions to create the Azure AD application.
 
 The person running the FarmBeats install from marketplace needs to be an owner of the Resource Group in which FarmBeats is being installed. For subscription owners, this happens automatically when Resource Group is created. For others, please pre-create the Resource Group and ask the Subscription owner to make you an owner of the Resource Group.
 
@@ -92,14 +95,14 @@ Make a note of the **Azure Subscription ID** and the **Azure Region**.
 
 ### Create an AAD application
 
-Azure FarmBeats require Azure Active Directory application creation and registration. To successfully run the AAD creation script, the following permissions are needed:
+Azure FarmBeats require Azure Active Directory application creation and registration. To successfully run the Azure AD creation script, the following permissions are needed:
 
-- Tenant - AAD app creator
+- Tenant - Azure AD app creator
 - Subscription - Owner
 
 Run the following steps in a Cloud Shell instance using the PowerShell environment. First-time users will be prompted to select a subscription and create a storage account. Complete the setup as instructed.
 
-1. Download the AAD app generator script
+1. Download the Azure AD app generator script
 
     ```azurepowershell-interactive
         wget -q https://aka.ms/FarmBeatsAADScript -O ./create_aad_script.ps1
@@ -111,21 +114,21 @@ Run the following steps in a Cloud Shell instance using the PowerShell environme
         cd
     ```
 
-3. Run the AAD script
+3. Run the Azure AD script
 
     ```azurepowershell-interactive
         ./create_aad_script.ps1
     ```
 
 4. The script asks for the following three inputs:
 
-    - **FarmBeats Website Name**: This is the unique URL prefix for your FarmBeats web application. In case the prefix is already taken, the script will error out. Once installed, your FarmBeats deployment will be accessible from https://\<FarmBeats-website-name>.azurewebsites.net and the swagger APIs will be at https://\<FarmBeats-website-name>-api.azurewebsites.net
+    - **FarmBeats Website Name** is the unique URL prefix for your FarmBeats web application. In case the prefix is already taken, the script will error out. Once installed, your FarmBeats deployment will be accessible from https://\<FarmBeats-website-name>.azurewebsites.net and the swagger APIs will be at https://\<FarmBeats-website-name>-api.azurewebsites.net
 
     - **Azure login ID**: Provide Azure login ID for the user who you want to be added as admin of FarmBeats. This user can then grant access to access FarmBeats web application to other users. The login ID is generally of the form [email protected]. Azure UPN is also supported.
 
     - **Subscription ID**: This is the ID of the subscription in which you want to install Azure FarmBeats
 
-5. The AAD script takes around 2 minutes to run and outputs values on screen as well as to a json file in the same directory. If you had someone else run the script, ask them to share this output with you.
+5. The Azure AD script takes around 2 minutes to run and outputs values on screen as well as to a json file in the same directory. If you had someone else run the script, ask them to share this output with you.
 
 ### Create Sentinel account
 
@@ -155,7 +158,7 @@ You're now ready to install FarmBeats. Follow the steps below to start the insta
 
     ![Basics Tab](./media/install-azure-farmbeats/create-azure-farmbeats-basics.png)
 
-6. Copy the individual entries from the output of [AAD script](#create-an-aad-application) to the inputs in the AAD application section.
+6. Copy the individual entries from the output of [Azure AD script](#create-an-aad-application) to the inputs in the Azure AD application section.
 
 7. Enter the [Sentinel account](#create-sentinel-account) user name and password in the Sentinel Account section. Select **Next** to move to the **Review + Create** tab.
 

articles/industry/agriculture/overview-azure-farmbeats.md

@@ -13,7 +13,7 @@ ms.author: riyazp
 Azure FarmBeats is a business-to-business offering available in Azure Marketplace. It enables aggregation of agriculture data sets across providers. Azure FarmBeats enables you to build artificial intelligence (AI) or machine learning (ML) models based on fused data sets. By using Azure FarmBeats, agriculture businesses can focus on core value-adds instead of the undifferentiated heavy lifting of data engineering.
 
 > [!NOTE]
-> We have built a new PaaS version of Azure FarmBeats as a fully managed service and currently in private preview. For more information on trying out the new Azure FarmBeats, write to us at FarmBeatsSupport@microsoft.com. 
+> Azure FarmBeats is on path to be retired. We have built a new agriculture focused service, it's name is Azure Data Manager for Agriculture and it's now available as a preview service. For more information see public documentation [**here**](../../data-manager-for-agri/overview-azure-data-manager-for-agriculture.md) or write to us at madma@microsoft.com. 
 
 ![Project Farm Beats](./media/architecture-for-farmbeats/farmbeats-architecture-1.png)
 
@@ -27,20 +27,20 @@ With the preview of Azure FarmBeats you can:
 - Build or augment your digital agriculture solution by providing farm health advisories.
 
 > [!NOTE]
-> Azure FarmBeats is currently in public preview. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Azure FarmBeats is provided without a service level agreement. Use the [Azure FarmBeats Support Forum](/answers/topics/azure-farmbeats.html) for support.
+> Azure FarmBeats is currently in public preview. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Azure FarmBeats is provided without a service level agreement.
 
-## Datahub
+## Data hub
 
-The Azure FarmBeats Datahub is an API layer, which enables aggregation, normalization, and contextualization of various agriculture datasets across providers. You can use Azure FarmBeats to get:
+The Azure FarmBeats Data hub is an API layer, which enables aggregation, normalization, and contextualization of various agriculture datasets across providers. You can use Azure FarmBeats to get:
 - **Sensor data** from two sensor providers [Davis Instruments](https://www.davisinstruments.com/products/enviromonitor-gateway-us-lte), [Teralytic](https://teralytic.com/), [Pessl Instruments](https://metos.at/)
 - **Satellite imagery** from European Space Agency's [Sentinel-2](https://sentinel.esa.int/web/sentinel/home) satellite mission
 - **Drone imagery** from three drone imagery providers [senseFly](https://www.sensefly.com/) , [SlantRange](https://slantrange.com/) , [DJI](https://dji.com/)
 
-Datahub is designed as an extensible API platform. We are working with many more providers to integrate with Azure FarmBeats, so you have more choice while building your solution.
+Data hub is designed as an extensible API platform. We're working with many more providers to integrate with Azure FarmBeats, so you have more choice while building your solution.
 
 ## Accelerator
 
-The Azure FarmBeats Accelerator is a sample web application, that is built on top of Datahub. The Accelerator jump-starts your user interface and model development. The Azure FarmBeats accelerator uses Azure FarmBeats' APIs. It visualizes ingested sensor data as charts and  model outputs as maps. For example, you can use the accelerator to create a farm quickly and get a vegetation index map or a sensor placement map for that farm easily.
+The Azure FarmBeats Accelerator is a sample web application, that is built on top of Data hub. The Accelerator jump-starts your user interface and model development. The Azure FarmBeats accelerator uses Azure FarmBeats' APIs. It visualizes ingested sensor data as charts and  model outputs as maps. For example, you can use the accelerator to create a farm quickly and get a vegetation index map or a sensor placement map for that farm easily.
 
 ## Azure role-based access control (Azure RBAC)
 
@@ -62,7 +62,7 @@ An administrator can add multiple partners as data providers to Azure FarmBeats.
 
 ## Resources
 
-Azure FarmBeats is offered at no additional charge and you pay only for the Azure resources you use. You can use the below resources to know more about the offering:
+Azure FarmBeats is offered at no extra charge and you pay only for the Azure resources you use. You can use the below resources to know more about the offering:
 
 - Stay informed about the latest Azure FarmBeats news by visiting our [Azure FarmBeats blog](https://aka.ms/farmbeatsblog).
 - Seek help by posting a question on our [Azure FarmBeats support forum](/answers/topics/azure-farmbeats.html).