From 70fe343e19feb72b86fd3c3d32c687da06144102 Mon Sep 17 00:00:00 2001
From: Tim Raymond <tim@timraymond.com>
Date: Fri, 20 Jan 2017 12:35:33 -0800
Subject: [PATCH] Fix missing fields from non-default RP

When attempting to extract fields from a non-default retention policy in
the Data Explorer, fields would not appear. This was because the query
was sent without an explicit RP, which would use the default RP instead.
This adds an explicit RP to the SHOW FIELDS query.
---
 CHANGELOG.md                                 | 2 ++
 ui/src/data_explorer/components/FieldList.js | 5 +++--
 ui/src/shared/apis/metaQuery.js              | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0abba628..c6754481d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## v1.1.0 [unreleased]
 
 ### Upcoming Bug Fixes
+  1. [#788](https://github.com/influxdata/chronograf/pull/788): Fix missing fields in data explorer when using non-default retention policy
+
 ### Upcoming Features
 ### Upcoming UI Improvements
 
diff --git a/ui/src/data_explorer/components/FieldList.js b/ui/src/data_explorer/components/FieldList.js
index 5531d8bdb..ee700c638 100644
--- a/ui/src/data_explorer/components/FieldList.js
+++ b/ui/src/data_explorer/components/FieldList.js
@@ -11,6 +11,7 @@ const FieldList = React.createClass({
   propTypes: {
     query: shape({
       database: string,
+      retentionPolicy: string,
       measurement: string,
     }).isRequired,
     onToggleField: func.isRequired,
@@ -40,14 +41,14 @@ const FieldList = React.createClass({
   },
 
   componentDidMount() {
-    const {database, measurement} = this.props.query;
+    const {database, measurement, retentionPolicy} = this.props.query;
     if (!database || !measurement) {
       return;
     }
 
     const {source} = this.context;
     const proxySource = source.links.proxy;
-    showFieldKeys(proxySource, database, measurement).then((resp) => {
+    showFieldKeys(proxySource, database, measurement, retentionPolicy).then((resp) => {
       const {errors, fieldSets} = showFieldKeysParser(resp.data);
       if (errors.length) {
         // TODO: do something
diff --git a/ui/src/shared/apis/metaQuery.js b/ui/src/shared/apis/metaQuery.js
index bc9a8a111..6074ae63c 100644
--- a/ui/src/shared/apis/metaQuery.js
+++ b/ui/src/shared/apis/metaQuery.js
@@ -71,8 +71,8 @@ export function dropShard(host, shard, clusterID) {
   return proxy(url, clusterID);
 }
 
-export function showFieldKeys(source, db, measurement) {
-  const query = `SHOW FIELD KEYS FROM "${measurement}"`;
+export function showFieldKeys(source, db, measurement, rp) {
+  const query = `SHOW FIELD KEYS FROM "${rp}"."${measurement}"`;
 
   return proxy({source, query, db});
 }