From 1ba35df2abdda7142cdfcaff349d095a886abd0b Mon Sep 17 00:00:00 2001
From: Hunter Trujillo <cryptoquick@gmail.com>
Date: Thu, 30 Mar 2017 10:13:03 -0600
Subject: [PATCH 1/2] Add simple loading spinner to kapacitor Alert History
 page.

---
 ui/src/alerts/containers/AlertsApp.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/src/alerts/containers/AlertsApp.js b/ui/src/alerts/containers/AlertsApp.js
index d9bb1fbe10..9e97f3bcdd 100644
--- a/ui/src/alerts/containers/AlertsApp.js
+++ b/ui/src/alerts/containers/AlertsApp.js
@@ -91,6 +91,12 @@ const AlertsApp = React.createClass({
 
   render() {
     const {source} = this.props
+    const {loading} = this.state
+
+    if (loading || !source) {
+      return <div className="page-spinner" />
+    }
+
     return (
       // I stole this from the Hosts page.
       // Perhaps we should create an abstraction?

From b70406aa8a2495b83a62b36ddd1f778dd28bc22a Mon Sep 17 00:00:00 2001
From: Hunter Trujillo <cryptoquick@gmail.com>
Date: Thu, 30 Mar 2017 10:19:04 -0600
Subject: [PATCH 2/2] Update Changelog.

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b87c20d2c8..2409f178dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
 
 ### Features
   1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard
-  2. [#1120](https://github.com/influxdata/chronograf/pull/1120): Allow users to update user passwords.
+  1. [#1120](https://github.com/influxdata/chronograf/pull/1120): Allow users to update user passwords.
+  1. [#1130](https://github.com/influxdata/chronograf/pull/1130): Add loading spinner to Alert History page.
 
 ### UI Improvements
   1. [#1101](https://github.com/influxdata/chronograf/pull/1101): Compress InfluxQL responses with gzip