Merge branch 'monitor-alert' into monitor/cleanup

content/v2.0/cloud/monitor-alert/manage-notification-endpoints/view-endpoint-history.md

@@ -0,0 +1,41 @@
+---
+title: View notification endpoint history
+seotitle: View notification endpoint details and history in the InfluxDB.
+description: >
+  View notification endpoint details and history in the InfluxDB UI.
+menu:
+  v2_0:
+    name: View endpoint history
+    parent: Manage notification endpoints
+weight: 202
+v2.0/tags: [monitor, notifications]
+---
+
+View notification endpoint details and history in the InfluxDB user interface (UI).
+
+- [View notification endpoints](#view-notification-endpoints)
+- [View notification endpoint details](#view-notification-endpoint-details)
+- [View history notification endpoint history](#view-notification-endpoint-history), including statues and notifications sent to the endpoint
+
+## View notification endpoints
+
+- Click **Monitoring & Alerting** in the InfluxDB UI sidebar.
+
+    {{< nav-icon "alerts" >}}
+
+    In the **Notification Endpoints** column, view existing notification endpoints.
+
+## View notification endpoint details
+
+1. Click **Monitoring & Alerting** in the InfluxDB UI sidebar.
+2. In the **Notification Endpoints** column, click the name of the notification endpoint you want to view.
+3. View the notification endpoint destination, name, and information to connect to the endpoint.
+
+## View notification endpoint history
+
+1. Click **Monitoring & Alerting** in the InfluxDB UI sidebar.
+2. In the **Notification Endpoints** column, hover over the notification endpoint, click the **{{< icon "view" >}}** icon, then **View History**. 
+The Check Statuses History page displays:
+
+ - Statuses generated for the selected notification endpoint
+ - Notifications sent to the selected notification endpoint

content/v2.0/cloud/monitor-alert/notification-rules/view-notification-rules.md

@@ -0,0 +1,42 @@
+---
+title: View notification rules
+description: >
+  Update notification rules to update the notification message or change the schedule or conditions.
+
+weight: 201
+v2.0/tags: [notifications]
+menu:
+  v2_0:
+    name: View notification rules
+    parent: Manage notification rules
+---
+
+View notification rule details and statuses and notifications generated by notification rules in the InfluxDB user interface (UI).
+
+- [View a list of all notification rules](#view-a-list-of-all-notification-rules)
+- [View notification rule details](#view-notification-rule-details)
+- [View statuses generated by a check](#view-statuses-generated-by-a-notification-rule)
+- [View notifications triggered by a notification rule](#view-notifications-triggered-by-a-notification-rule)
+
+To view notification rules, click **Monitoring & Alerting** in the InfluxDB UI sidebar.
+
+{{< nav-icon "alerts" >}}
+
+## View a list of all notification rules
+The **Notification Rules** column on the Monitoring & Alerting landing page displays all existing checks.
+
+## View notification rule details
+In the **Notification Rules** column, click the name of the check you want to view.
+The check builder appears.
+Here you can view the check query and logic.
+
+## View statuses generated by a notification rule
+1.  In the **Notification Rules** column, hover over the check, click the **{{< icon "view" >}}**
+    icon, then **View History**.
+    The Statuses History page displays statuses generated by the selected check.
+
+## View notifications triggered by a notification rule
+1.  In the **Notification Rules** column, hover over the notification rule, click the **{{< icon "view" >}}**
+    icon, then **View History**.
+2.  In the top left corner, click **Notifications**.
+    The Notifications History page displays notifications initiated by the selected notification rule.

content/v2.0/security/tokens/create-token.md

@@ -16,9 +16,9 @@ command line interface (CLI).
 
 ## Create a token in the InfluxDB UI
 
-1. Click the **Settings** icon in the navigation bar.
+1. Click the **Load Data** icon in the navigation bar.
 
-    {{< nav-icon "settings" >}}
+    {{< nav-icon "disks" >}}
 
 2. Click **Tokens**.
 3. Click the **+ Generate** dropdown in the upper right and select a token type (**Read/Write Token** or **All Access Token**).

content/v2.0/security/tokens/delete-token.md

@@ -17,9 +17,9 @@ have access to your InfluxDB instance.
 
 ## Delete tokens in the InfluxDB UI
 
-1. Click the **Settings** icon in the navigation bar.
+1. Click the Click the **Load Data** icon in the navigation bar.
 
-    {{< nav-icon "settings" >}}
+    {{< nav-icon "disks" >}}
 
 2. Click **Tokens**. All of your account's tokens appear.
 3. Hover over the token you want to delete and click **Delete** and **Confirm**.

content/v2.0/security/tokens/update-tokens.md

@@ -15,9 +15,9 @@ Update an authentication token's description using the InfluxDB user interface (
 
 ## Update a token in the InfluxDB UI
 
-1. Click the **Settings** icon in the navigation bar.
+1. Click the **Load Data** icon in the navigation bar.
 
-    {{< nav-icon "settings" >}}
+    {{< nav-icon "disks" >}}
 
 2. Click **Tokens**. All of your account's tokens appear.
 3. Click the pencil icon {{< icon "pencil" >}} next to the token's name in the **Description** column.

content/v2.0/security/tokens/view-tokens.md

@@ -16,9 +16,9 @@ command line interface (CLI).
 
 ## View tokens in the InfluxDB UI
 
-1. Click the **Settings** icon in the navigation bar.
+1. Click the **Load Data** icon in the navigation bar.
 
-    {{< nav-icon "settings" >}}
+    {{< nav-icon "disks" >}}
 
 2. Click **Tokens**. All of your account's tokens appear.
 3. Click on a token name from the list to view the token and a summary of access permissions.