From fe5a4d670f01451e0943587fbac027a10d99aadf Mon Sep 17 00:00:00 2001
From: Jared Scheib <jared.scheib@gmail.com>
Date: Fri, 24 Feb 2017 12:06:47 -0800
Subject: [PATCH 1/2] Fix Kapacitor rule graph display

---
 ui/src/shared/components/Dygraph.js   | 2 +-
 ui/src/shared/components/LineGraph.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/src/shared/components/Dygraph.js b/ui/src/shared/components/Dygraph.js
index f819e7799..2cd539a6c 100644
--- a/ui/src/shared/components/Dygraph.js
+++ b/ui/src/shared/components/Dygraph.js
@@ -174,7 +174,7 @@ export default React.createClass({
 
   render() {
     return (
-      <div ref="self">
+      <div ref="self" style={{height: '100%'}}>
         <div ref="graphContainer" style={this.props.containerStyle} />
         <div className="container--dygraph-legend" ref="legendContainer" />
         <div className="graph-vertical-marker" ref="graphVerticalMarker" />
diff --git a/ui/src/shared/components/LineGraph.js b/ui/src/shared/components/LineGraph.js
index 9658c8d6f..63c8eeb4e 100644
--- a/ui/src/shared/components/LineGraph.js
+++ b/ui/src/shared/components/LineGraph.js
@@ -104,7 +104,10 @@ export default React.createClass({
     }
 
     return (
-      <div className={classNames({"graph--hasYLabel": !!(options.ylabel || options.y2label)})}>
+      <div
+        className={classNames({"graph--hasYLabel": !!(options.ylabel || options.y2label)})}
+        style={{height: '100%'}}
+      >
         {isRefreshing ? this.renderSpinner() : null}
         <Dygraph
           containerStyle={{width: '100%', height: '100%'}}

From 9147f2fcac28d9ccabe679dc82de1527bcc7797f Mon Sep 17 00:00:00 2001
From: Jared Scheib <jared.scheib@gmail.com>
Date: Fri, 24 Feb 2017 12:10:32 -0800
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81aad496d..1481209b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bug Fixes
   1. [#882](https://github.com/influxdata/chronograf/pull/882): Fix y-axis graph padding
   2. [#907](https://github.com/influxdata/chronograf/pull/907): Fix react-router warning
+  3. [#926](https://github.com/influxdata/chronograf/pull/926): Fix Kapacitor RuleGraph display
 
 ### Features
   1. [#873](https://github.com/influxdata/chronograf/pull/873): Add [TLS](https://github.com/influxdata/chronograf/blob/master/docs/tls.md) support