Merge pull request #788 from influxdata/bugfix/tr-missing-field-keys

Fix missing fields from non-default RP

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
 

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

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});
 }