Skip to content

Commit 8df72af

Browse files
asdonalddominicbetts
authored andcommitted
Fix conflict
1 parent e6f9c50 commit 8df72af

File tree

14 files changed

+13
-11
lines changed

14 files changed

+13
-11
lines changed

articles/iot-accelerators/iot-accelerators-remote-monitoring-email-actions.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Follow these steps to add an email action:
3030

3131
3. Click the checkbox next to the [existing rule](iot-accelerators-remote-monitoring-automate#edit-an-existing-rule) that you would like to modify, and then click **Edit** at the top. An editable flyout will appear.
3232
4. In the Action section, toggle **Email enabled** to on.
33-
5. If this is the first-time email actions have been enabled within the solution accelerator, you will need to [sign in to outlook](#outlook).
33+
5. If it is the first-time email actions have been enabled within the solution accelerator, you will need to [sign in to outlook](#outlook).
3434
6. Enter an email address into the recipient box and hit enter for each email address added.
3535
![address](./media/iot-accelerators-remote-monitoring-email-actions/address.png)
3636
7. Enter a subject for the email.
@@ -48,7 +48,7 @@ Follow these steps to add an email action:
4848

4949
3. Follow the [create a rule](iot-accelerators-remote-monitoring-automate#create-a-rule) and [create an advanced rule](iot-accelerators-remote-monitoring-automate#create-an-advanced-rule) up to the **Severity level** only. Do *not* click apply yet.
5050
4. In the Action section, toggle **Email enabled** to on.
51-
5. If this is the first-time email actions have been enabled within the solution accelerator, you will need to [sign in to outlook](#outlook).
51+
5. If it is the first-time email actions have been enabled within the solution accelerator, you will need to [sign in to outlook](#outlook).
5252
6. Enter an email address into the recipient box and hit enter for each email address added.
5353
![address](./media/iot-accelerators-remote-monitoring-email-actions/address.png)
5454
7. Enter a subject for the email.
@@ -60,14 +60,14 @@ Your rule with *Email Action* has now been enabled. Each time the action is trig
6060

6161
## Sign in to Outlook <a name="outlook"></a>
6262

63-
If this is your first-time enabling email actions within your solution accelerator, you need to sign into Outlook. The purpose of this is to set up an email account, which will be responsible for sending out the email notification.
63+
If it is your first-time enabling email actions within your solution accelerator, you need to sign into Outlook. This is to set up an email account, which will be responsible for sending out the email notification.
6464

6565
> [!NOTE]
6666
> It is recommended that you create a specific Outlook account just for solution accelerator notifications and use that to sign in with. You will continue to see this warning note until you have signed in with an Outlook account. Once you have signed in, you will see a successful message below the email actions toggle.
6767
6868
If your application was deployed by someone with a **contributor** role on the subscription, you will see the following screenshot. Follow the instructions below to set up Outlook for your application.
6969

70-
![learn more](./media/iot-accelerators-emailactions/learnmore.png)
70+
![learn more](./media/iot-accelerators-email-actions/learnmore.png)
7171

7272
### Contributor role Outlook set up
7373
Since the application was deployed by someone with the **contributor** role in the subscription, the application does
@@ -76,23 +76,25 @@ not have sufficient permissions to set up and verify email actions through the W
7676
1. Go to the [Azure portal](https://portal.azure.com)
7777
2. Navigate to the Resource Group for your solution accelerator
7878
3. Click on the office 365 connector (API Connection)
79-
![API Connection](./media/iot-accelerators-emailactions/apiconnector.png)
79+
![API Connection](./media/iot-accelerators-email-actions/apiconnector.png)
8080
4. Click on the banner to begin the authorization process
81-
![authorize](./media/iot-accelerators-emailactions/connector.png)
81+
![authorize](./media/iot-accelerators-email-actions/connector.png)
8282
5. Click the **authorize** button in which it will ask you to sign in. This account you sign in with will be the email address the application uses to send email from. We advise that you create an outlook account ahead of time to send email notifications for your solution accelerator from.
83+
![authorize button](./media/iot-accelerators-email-actions/authorize.png)
84+
![sign in](./media/iot-accelerators-email-actions/signin.png)
8385
7. Click **Save** at the bottom. Your authorization will be successful if the banner is gone.
8486
9. To change the email address from which the notifications are sent from, click **Edit API connection**.
85-
![change email](./media/iot-accelerators-emailactions/editemail.png)
87+
![change email](./media/iot-accelerators-email-actions/editemail.png)
8688

8789
### Owner role Outlook set up
88-
Since the application was deployed by someone with the **owner** role in the subscription, the application is able to verify email actions have been correctly set up through the WebUI. The following steps will help you sign in and set-up email actions.
90+
Since the application was deployed by someone with the **owner** role in the subscription, the application is able to verify email actions have been correctly set up through the WebUI. The following steps will help you sign in and set up email actions.
8991

9092
1. Click to sign in to Outlook. You will be taken to the Azure portal.
91-
![sign in](./media/iot-accelerators-emailactions/owneroutlook.png)
93+
![sign in](./media/iot-accelerators-email-actions/owneroutlook.png)
9294
2. Click the **authorize** button in which it will ask you to sign in. This account you sign in with will be the email address the application uses to send email from. We advise that you create an outlook account ahead of time to send email notifications for your solution accelerator from.
9395
3. Click **Save** at the bottom. Return back to your application and refresh the page.
9496
4. You will see a banner if you have successfully configured the email notification.
95-
![successful lo in](./media/iot-accelerators-emailactions/success.png)
97+
![successful lo in](./media/iot-accelerators-email-actions/success.png)
9698

9799
## Customizing the email HTML <a name="htmledit"></a>
98100

@@ -121,7 +123,7 @@ However, if you would like to edit the HTML to include more information, custom
121123

122124
The Remote Monitoring solution accelerator out of the box uses Outlook to send out the email notifications. Outlook limits the number of emails sent to [30 emails per 1 minute](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#receiving-and-sending-limits). Email clients receiving the emails may also throttle the number of emails received per minute. Check with your specific email client on limitations. It is recommended that when you set up email notification for a rule, that you have the rule calculate over an average of 1 minute or more, and not instant, as shown below.
123125

124-
![calculation](./media/iot-accelerators-emailactions/calculation.png)
126+
![calculation](./media/iot-accelerators-email-actions/calculation.png)
125127

126128
## Next steps
127129

7.45 KB
Loading
2.69 KB
Loading
44.7 KB
Loading
4.29 KB
Loading
9.45 KB
Loading
15.2 KB
Loading
21.6 KB
Loading
20.6 KB
Loading
23.9 KB
Loading

0 commit comments

Comments
 (0)