From c3e1ada59413ea0f365e28fd79d8a19464ac7342 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 4 Apr 2017 16:29:14 -0500 Subject: [PATCH 1/3] Update schema exploration to support non-default rp --- ui/src/shared/apis/metaQuery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/shared/apis/metaQuery.js b/ui/src/shared/apis/metaQuery.js index 7633f6928..694041a32 100644 --- a/ui/src/shared/apis/metaQuery.js +++ b/ui/src/shared/apis/metaQuery.js @@ -36,14 +36,14 @@ export function showMeasurements(source, db) { } export function showTagKeys({source, database, retentionPolicy, measurement}) { - const query = `SHOW TAG KEYS FROM "${measurement}"` + const query = `SHOW TAG KEYS FROM "${retentionPolicy}"."${measurement}"` return proxy({source, db: database, rp: retentionPolicy, query}) } export function showTagValues({source, database, retentionPolicy, measurement, tagKeys}) { const keys = tagKeys.sort().map((k) => `"${k}"`).join(', ') - const query = `SHOW TAG VALUES FROM "${measurement}" WITH KEY IN (${keys})` + const query = `SHOW TAG VALUES FROM "${retentionPolicy}"."${measurement}" WITH KEY IN (${keys})` return proxy({source, db: database, rp: retentionPolicy, query}) } From 267d2ad9704f258ae96236fdd2a0d244e7e2a940 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 4 Apr 2017 16:33:45 -0500 Subject: [PATCH 2/3] Update CHANGELOG to mention fixing #979 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c12eca8..adb0005ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ 1. [#1164](https://github.com/influxdata/chronograf/pull/1164): Restore ability to save raw queries to a Dashboard Cell 1. [#1115](https://github.com/influxdata/chronograf/pull/1115): Fix Basepath issue where content would fail to render under certain circumstances 1. [#1173](https://github.com/influxdata/chronograf/pull/1173): Fix saving email in Kapacitor alerts + 1. [#979](https://github.com/influxdata/chronograf/issues/979): Fix empty tags for non-default retention policies ### Features 1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard From e3c07e1797872fcdb6233e2676d8a4caa3dbde80 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 4 Apr 2017 17:42:30 -0500 Subject: [PATCH 3/3] Add checks for null retention policies in meta queries --- ui/src/shared/apis/metaQuery.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/src/shared/apis/metaQuery.js b/ui/src/shared/apis/metaQuery.js index 694041a32..fb8424a4f 100644 --- a/ui/src/shared/apis/metaQuery.js +++ b/ui/src/shared/apis/metaQuery.js @@ -1,4 +1,5 @@ import AJAX from 'utils/ajax' +import _ from 'lodash' import {buildInfluxUrl, proxy} from 'utils/queryUrlGenerator' export const showDatabases = async (source) => { @@ -36,14 +37,15 @@ export function showMeasurements(source, db) { } export function showTagKeys({source, database, retentionPolicy, measurement}) { - const query = `SHOW TAG KEYS FROM "${retentionPolicy}"."${measurement}"` - + const rp = _.toString(retentionPolicy) + const query = `SHOW TAG KEYS FROM "${rp}"."${measurement}"` return proxy({source, db: database, rp: retentionPolicy, query}) } export function showTagValues({source, database, retentionPolicy, measurement, tagKeys}) { const keys = tagKeys.sort().map((k) => `"${k}"`).join(', ') - const query = `SHOW TAG VALUES FROM "${retentionPolicy}"."${measurement}" WITH KEY IN (${keys})` + const rp = _.toString(retentionPolicy) + const query = `SHOW TAG VALUES FROM "${rp}"."${measurement}" WITH KEY IN (${keys})` return proxy({source, db: database, rp: retentionPolicy, query}) }