Merge pull request #97915 from uhabiba04/master

updated review inputs

Author: ttorble

articles/industry/agriculture/ingest-historical-telemetry-data.md

@@ -34,23 +34,23 @@ Follow these steps.
 > You must be an administrator to do the following steps.
 
 1. Download this [script](https://aka.ms/farmbeatspartnerscript), and extract it on your local drive. Two files are inside the zip file.
-2. Sign in to the [Azure portal](https://portal.azure.com/), and open Azure Cloud Shell. This option is available on the toolbar in the upper-right corner of the portal. 
+2. Sign in to the [Azure portal](https://portal.azure.com/), and open Azure Cloud Shell. This option is available on the toolbar in the upper-right corner of the portal.
 
     ![Azure portal toolbar](./media/for-tutorials/navigation-bar-1.png)
 
 3. Make sure the environment is set to **PowerShell**.
 
     ![PowerShell setting](./media/for-tutorials/power-shell-new-1.png)
 
-4. Upload the two files that you downloaded from step 1 in your Cloud Shell instance. 
+4. Upload the two files that you downloaded from step 1 in your Cloud Shell instance.
 
     ![Upload button on the toolbar](./media/for-tutorials/power-shell-two-1.png)
 
 5. Go to the directory where the files were uploaded.
 
    >[!NOTE]
    > By default, files get uploaded to the home directory/home/username.
-6. Run the script by using this command: 
+6. Run the script by using this command:
 
     ```azurepowershell-interactive
     ./generateCredentials.ps1
@@ -62,10 +62,10 @@ Follow these steps.
 
  Now that you have the required credentials, you can define the device and sensors. To do this, create the metadata by using FarmBeats APIs.
 
- FarmBeats Datahub has the following APIs that enable creation and management of device or sensor metadata. 
+ FarmBeats Datahub has the following APIs that enable creation and management of device or sensor metadata.
 
-- /**DeviceModel**: DeviceModel corresponds to the metadata of the device, such as the manufacturer and the type of device, which is either a gateway or a node. 
-- /**Device**: Device corresponds to a physical device present on the farm. 
+- /**DeviceModel**: DeviceModel corresponds to the metadata of the device, such as the manufacturer and the type of device, which is either a gateway or a node.
+- /**Device**: Device corresponds to a physical device present on the farm.
 - /**SensorModel**: SensorModel corresponds to the metadata of the sensor, such as the manufacturer, the type of sensor, which is either analog or digital, and the sensor measurement, such as ambient temperature and pressure.
 - /**Sensor**: Sensor corresponds to a physical sensor that records values. A sensor is typically connected to a device with a device ID.  
 
@@ -264,7 +264,7 @@ Sensor
   }
 }
 ```
-The following sample request creates a device. This request has input JSON as payload with the request body. 
+The following sample request creates a device. This request has input JSON as payload with the request body.
 
 ```bash
 curl -X POST "https://<datahub>.azurewebsites.net/Device" -H  
@@ -287,7 +287,7 @@ You must send the telemetry to Azure Event Hubs for processing. Azure Event Hubs
 
 ### Send a telemetry message as the client
 
-After you have a connection established as an Event Hubs client, you can send messages to the event hub as JSON. 
+After you have a connection established as an Event Hubs client, you can send messages to the event hub as JSON.
 
 Here's sample Python code that sends telemetry as a client to a specified event hub:
 
@@ -308,7 +308,7 @@ write_client.stop()
 
 ```
 
-Convert the historical sensor data format to a canonical format that Azure FarmBeats understands. The canonical message format is as follows: 
+Convert the historical sensor data format to a canonical format that Azure FarmBeats understands. The canonical message format is as follows:
 
 ```json
 {

articles/industry/agriculture/manage-users.md

@@ -1,6 +1,6 @@
 ---
 title: Manage users
-description: Describes how to manage users
+description: This article describes how to manage users.
 author: uhabiba04
 ms.topic: article
 ms.date: 12/02/2019
@@ -10,7 +10,7 @@ ms.author: v-umha
 
 # Manage users
 
-Azure FarmBeats includes user management for people who are part of your Azure Active Directory (Azure AD). You will be able to add users to your Azure FarmBeats instance to access the APIs, view the generated maps and sensor telemetry from the farm
+Azure FarmBeats includes user management for people who are part of your Azure Active Directory (Azure AD). You are able to add users to your Azure FarmBeats instance to access the APIs, view the generated maps, and sensor telemetry from the farm.
 
 ## Prerequisites
 
@@ -34,40 +34,43 @@ There are two kinds of user roles supported in Azure FarmBeats today:
 
 ## Add user to Azure FarmBeats
 
-To add a user to Azure FarmBeats, 
-1.	Sign in to the Accelerator and click on the Settings   icon
-2.	Click on Access Control
+Follow the steps to add a user to Azure FarmBeats:
+
+1.	Sign in to the Accelerator and then select the **Settings** icon.
+2.	Select **Access Control**.
 
     ![Project Farm Beats](./media/create-farms/settings-users-1.png)
 
-3.	Enter the email ID of the user you want to give access to
-4.	Select the desired role – Admin or Read-Only
-5.	Click on Add Role
+3.	Enter the email ID of the user you want to provide access.
+4.	Select the desired role – Admin or Read-Only.
+5.	Select **Add Role**.
 
 The added user(s) will now be able to access Azure FarmBeats (both Data hub and Accelerator).
 
 ## Delete user from Azure FarmBeats
 
-To remove a user from the Azure FarmBeats system, you can
-1.	Sign in to the Accelerator and click on the Settings icon
-2.	Click on Access Control
-3.	Click on the Delete Icon near the email ID of the user you want to remove
+Follow the steps to remove a user from the Azure FarmBeats system:
 
-The user is removed from the system. You will receive the following message to confirm the successful operation
+1.	Sign in to the Accelerator and then select the **Settings** icon.
+2.	Select **Access Control**.
+3.	Select the **Delete** to delete a user.
 
+The user is deleted from the system. You will receive the following message to confirm the successful operation.
 
 ![Project Farm Beats](./media/create-farms/manage-users-2.png)
 
-
 ## Add Azure AD users
 
 > [!NOTE]
-> You will need to do the following steps, only if the user you are trying to provide access to Azure FarmBeats is not present in the Azure AD tenant. If the user is already present, the below steps need not be performed
+> Follow the below steps to provide user access to Azure FarmBeats, if the user doesn't exist in the Azure AD tenant. You can skip the below steps if the user exists in Azure AD tenant.
+>
+
+FarmBeats users need to exist in the Azure AD tenant before you can assign them to applications and roles. To add users to Azure AD, use the following steps:
 
-FarmBeats users need to exist in the Azure AD   tenant before you can assign them to applications and roles. To add users to Azure AD, use the following steps:
 1.	Sign in to the [Azure portal](https://portal.azure.com/).
-2.	Select your account in the top-right corner, and switch to the Azure AD tenant associated to FarmBeats
-3.	Select **Azure Active Directory > Users**. You see a list of users in your directory.
+2.	Select your account in the top-right corner, and switch to the Azure AD tenant associated to FarmBeats.
+3.	Select **Azure Active Directory > Users**.
+    You see a list of users in your directory.
 4.	To add users to the directory, select **New user**. For external users, select **New guest user**.
 
     ![Project Farm Beats](./media/create-farms/manage-users-3.png)
@@ -78,5 +81,4 @@ Visit [Azure AD](https://docs.microsoft.com/azure/active-directory/fundamentals/
 
 ## Next steps
 
-You have deployed Azure FarmBeats. Now, learn how to [create farms](manage-farms.md#create-farms).
-
+You have successfully added users to Azure FarmBeats instance. Now, learn how to [create farms](manage-farms.md#create-farms).

articles/industry/agriculture/media/create-farms/manage-users-2.png

@@ -28,7 +28,7 @@ A quick deployment of Azure FarmBeats should take less than an hour. Costs for D
 
 Azure FarmBeats deployment creates the following resources within your subscription:
 
-| S. no.  | Resource name  | FarmBeats component  |
+| Serial. no.  | Resource name  | FarmBeats component  |
 |---------|---------|---------|
 |1  |       Azure Cosmos DB   |  Datahub       |
 |2  |    Application Insights      |     Datahub/Accelerator     |
@@ -44,7 +44,6 @@ Azure FarmBeats deployment creates the following resources within your subscript
 |12|      Azure App Service      |  Datahub/Accelerator       |
 |13 |    App service plan        |     Datahub/Accelerator      |
 |14 |Azure Maps account     |Accelerator    |
-|15 |       Azure Time Series Insights      |  Datahub     |
 
 Azure FarmBeats is available for download in Azure Marketplace, which you can access directly from the Azure portal.  
 
@@ -78,7 +77,7 @@ Before you start the deployment, ensure that the following prerequisites are in
 
 An account with Sentinel helps you to download the Sentinel satellite imagery from their official website to your device. To create a free account, do the following:
 
-1. Go to the [Sentinel account registration page](https://scihub.copernicus.eu/dhus/#/self-registration). 
+1. Go to the [Sentinel account registration page](https://scihub.copernicus.eu/dhus/#/self-registration).
 1. On the registration form, provide your first name, last name, username, password, and email address.
 
 A verification email will be sent to the registered email address for confirmation. Select the link to confirm your email address. Your registration process is complete.
@@ -206,7 +205,7 @@ In this scenario, which is described earlier in "Option 1," Installer creates th
     > The token expires after 60 minutes. If it expires, you can restart by retyping the deployment command.
 
 1. At the prompt, enter your Sentinel account password.
-   
+
    The installer validates and starts the deployment, which can take about 20 minutes.
 
    After the deployment finishes successfully, you'll receive the following output links:
@@ -277,12 +276,8 @@ If you encounter any issues, review [Troubleshoot](troubleshoot-project-farmbeat
 After the Datahub installation is complete, you'll receive the URL to access Azure FarmBeats APIs via the Swagger interface in the format https://\<yourdatahub-website-name>.azurewebsites.net/swagger.
 
 1. To sign in via Swagger, copy and paste the URL in your browser.
-1. Sign in with your Azure portal credentials.
-1. (Optional) Try this "sanity test": 
-
-     - Sign in successfully to the Swagger portal by using the Datahub link, which you received as an output to a successful deployment.
-     - Extended types Get API- Select "Try it out /Execute"
-     - You should receive the server response Code 200 and not an exception, such as "403 unauthorized user."
+2. Sign in with your Azure portal credentials.
+3. You can see the swagger and perform all REST operations on the Azure FarmBeats   APIs. This indicates successful deployment of Azure FarmBeats.
 
 ### Accelerator
 

articles/industry/agriculture/media/create-farms/manage-users-3.png

@@ -18,7 +18,7 @@ The Azure FarmBeats APIs provide agricultural businesses with a standardized RES
 - APIs to get sensor, camera, drone, weather, satellite, and curated ground data.
 - Normalization and contextualization of data across common data providers.
 - Schematized access and query capabilities on all ingested data.
-- Automatic generation of metadata that can be queried, based on agronomic features. 
+- Automatic generation of metadata that can be queried, based on agronomic features.
 - Automatically generated time sequence aggregates for rapid model building.
 - Integrated Azure Data Factory engine to easily build custom data processing pipelines.
 
@@ -97,7 +97,7 @@ curl -X POST "https://microsoft-farmbeats.azurewebsites.net/Device" -H  "accept:
 ### Query parameters
 
 For REST GET calls, you can filter, limit the size of, and sort the data in an API response by including one or more query parameters on the request URI. For the query parameters, see the API documentation and the individual GET calls.
-For example, when you query the list of devices (GET call on /Device), the following query parameters can be specified: 
+For example, when you query the list of devices (GET call on /Device), the following query parameters can be specified:
 
 ![List of devices](./media/for-references/query-parameters-device-1.png)
 
@@ -158,12 +158,12 @@ Azure FarmBeats APIs can be accessed by a user or an app registration in Azure A
 
 4. Go to your [Datahub Swagger](https://<yourdatahub>.azurewebsites.net/swagger/index.html) and do the following:
     - Go to the **RoleAssignment API**.
-    - Perform a POST to create a **RoleAssignment** object for the **Object ID** you just created. 
+    - Perform a POST to create a **RoleAssignment** object for the **Object ID** you just created.
 
   > [!NOTE]
   > For more information on how to add users and Active Directory registration, see [Azure Active Directory](https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
 
-After you finish the previous steps, your app registration (client) can call the Azure FarmBeats APIs by using an access token via bearer authentication. 
+After you finish the previous steps, your app registration (client) can call the Azure FarmBeats APIs by using an access token via bearer authentication.
 
 Use the access token to send it in subsequent API requests in the header section as:
 

articles/industry/agriculture/media/create-farms/settings-users-1.png

@@ -11,23 +11,26 @@ ms.author: v-umha
 
 This article provides solutions to common Azure FarmBeats issues.
 
-For additional help, contact us at [email protected]. Be sure to include the *deployer.log* file in your email.
+For additional help, contact us at [email protected]. Be sure to include the **deployer.log** file in your email.
 
-To download the *deployer.log* file, do the following:
+To download the **deployer.log** file, do the following:
 
-1. Select the highlighted icon and then, in the drop-down list, select **Download**.
+1. Sign-in to **Azure portal** and select your subscription and Azure AD tenant.
+2. Launch Cloud Shell from the top navigation of the Azure portal.
+3. Select **Bash** as the preferred Cloud Shell experience.
+4. Select the highlighted icon and then, in the drop-down list, select **Download**.
 
     ![Project FarmBeats](./media/troubleshooting-farmbeats/download-deployer-log-1.png)
 
-1. In the next pane, enter the path to your *deployer.log* file. For example, enter **farmbeats-deployer.log**.
+5. In the next pane, enter the path to your **deployer.log** file. For example, enter **farmbeats-deployer.log**.
 
 ## Sensor telemetry
 
 ### Can't view telemetry data
 
 **Symptom**: Devices or sensors are deployed, and you've linked FarmBeats with your device partner, but you can't get or view telemetry data on FarmBeats.
 
-**Corrective action**: 
+**Corrective action**:
 
 1. Go to your FarmBeats Datahub resource group.   
 1. Select the **Event Hub** (DatafeedEventHubNamespace), and then check for the number of incoming messages.
@@ -39,14 +42,14 @@ To understand how to download logs, go to the ["Collect logs manually"](#collect
 
 ### Don't have the Azure Event Hubs connection string
 
-**Corrective action**: 
+**Corrective action**:
 
 1. In Datahub Swagger, go to the Partner API.
 1. Select **Get** > **Try it out** > **Execute**.
 1. Note the partner ID of the sensor partner you're interested in.
 1. Go back to the Partner API, and select **Get/\<ID>**.
 1. Specify the partner ID from step 3, and then select **Execute**.
-   
+
    The API response should have the Event Hubs connection string.
 
 ### Device appears offline
@@ -124,7 +127,7 @@ If the error persists, add the error message in a post on the FarmBeats forum, o
 **Issue**: FarmBeats Accelerator isn't showing the latest version, even after you've upgraded FarmBeatsDeployment.
 
 **Corrective action**: This error occurs because of service worker persistence in the browser. Do the following:
-1. Close all browser tabs that have Accelerator open, and close the browser window. 
+1. Close all browser tabs that have Accelerator open, and close the browser window.
 1. Start a new instance of the browser, and reload the Accelerator URI. This action loads the new version of Accelerator.
 
 ## Sentinel: Imagery-related issues
@@ -133,7 +136,7 @@ If the error persists, add the error message in a post on the FarmBeats forum, o
 
 **Job failure message**: "Full authentication is required to access this resource."
 
-**Corrective action**: 
+**Corrective action**:
 
 Do one of the following:
 * Rerun the installer for upgrading Datahub with the correct username and password.
@@ -204,7 +207,7 @@ Try either of the following:
 
     ![Project FarmBeats](./media/troubleshooting-farmbeats/collecting-logs-manually-1.png)
 
-### Collect Azure Data Factory job logs in Accelerator 
+### Collect Azure Data Factory job logs in Accelerator
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. In the **Search** box, search for the FarmBeats Accelerator resource group.