From 23a5acc959855a29e121ef1820c2443f6742c3c2 Mon Sep 17 00:00:00 2001
From: Alirie Gray <alirie@Aliries-MacBook-Pro.local>
Date: Mon, 18 Jun 2018 16:43:16 -0700
Subject: [PATCH 1/9] Implement custom meta query template variable type

Co-authored-by: Chris Henn <chris.henn@influxdata.com>
Co-authored-by: Alirie Gray <alirie.gray@gmail.com>
---
 ui/src/shared/parsing/showSeries.ts           |  26 +++
 .../components/MetaQueryTemplateBuilder.tsx   | 166 ++++++++++++++++++
 .../components/TemplateVariableEditor.tsx     |   2 +
 ui/src/tempVars/constants/index.ts            |  16 ++
 ui/src/tempVars/utils/parsing.ts              |  84 +++++++++
 ui/src/types/tempVars.ts                      |   1 +
 6 files changed, 295 insertions(+)
 create mode 100644 ui/src/shared/parsing/showSeries.ts
 create mode 100644 ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
 create mode 100644 ui/src/tempVars/utils/parsing.ts

diff --git a/ui/src/shared/parsing/showSeries.ts b/ui/src/shared/parsing/showSeries.ts
new file mode 100644
index 0000000000..3cad741e04
--- /dev/null
+++ b/ui/src/shared/parsing/showSeries.ts
@@ -0,0 +1,26 @@
+interface ParseShowSeriesResponse {
+  errors: string[]
+  series: string[]
+}
+
+const parseShowSeries = (response): ParseShowSeriesResponse => {
+  const results = response.results[0]
+
+  if (results.error) {
+    return {errors: [results.error], series: []}
+  }
+
+  const series = results.series[0]
+
+  if (!series.values) {
+    return {errors: [], series: []}
+  }
+
+  const seriesValues = series.values.map(s => {
+    return s[0]
+  })
+
+  return {errors: [], series: seriesValues}
+}
+
+export default parseShowSeries
diff --git a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
new file mode 100644
index 0000000000..b78d64b5fd
--- /dev/null
+++ b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
@@ -0,0 +1,166 @@
+import React, {PureComponent, ChangeEvent} from 'react'
+import _ from 'lodash'
+
+import {proxy} from 'src/utils/queryUrlGenerator'
+import {ErrorHandling} from 'src/shared/decorators/errors'
+import TemplateMetaQueryPreview from 'src/tempVars/components/TemplateMetaQueryPreview'
+import {parseMetaQuery, isInvalidMetaQuery} from 'src/tempVars/utils/parsing'
+
+import {
+  TemplateBuilderProps,
+  RemoteDataState,
+  TemplateValueType,
+} from 'src/types'
+
+// TODO: Ensure save is wired up to changes
+
+const DEBOUNCE_DELAY = 750
+
+interface State {
+  metaQueryInput: string // bound to input
+  metaQuery: string // debounced view of metaQueryInput
+  metaQueryResults: string[]
+  metaQueryResultsStatus: RemoteDataState
+}
+
+@ErrorHandling
+class CustomMetaQueryTemplateBuilder extends PureComponent<
+  TemplateBuilderProps,
+  State
+> {
+  private handleMetaQueryChange: () => void = _.debounce(() => {
+    const {metaQuery, metaQueryInput} = this.state
+    const {template, onUpdateTemplate} = this.props
+
+    if (metaQuery === metaQueryInput) {
+      return
+    }
+
+    this.setState({metaQuery: metaQueryInput}, this.executeQuery)
+
+    const nextTemplate = {...template, query: {influxql: metaQueryInput}}
+
+    onUpdateTemplate(nextTemplate)
+  }, DEBOUNCE_DELAY)
+
+  constructor(props) {
+    super(props)
+
+    this.state = {
+      metaQueryInput: '',
+      metaQuery: '',
+      metaQueryResults: [],
+      metaQueryResultsStatus: RemoteDataState.NotStarted,
+    }
+  }
+
+  public render() {
+    const {metaQueryInput} = this.state
+
+    return (
+      <div className="temp-builder csv-temp-builder">
+        <div className="form-group">
+          <label>Meta Query</label>
+          <div className="temp-builder--mq-controls">
+            <textarea
+              className="form-control"
+              value={metaQueryInput}
+              onChange={this.handleMetaQueryInputChange}
+              onBlur={this.handleMetaQueryChange}
+            />
+          </div>
+        </div>
+        {this.renderResults()}
+      </div>
+    )
+  }
+
+  private renderResults() {
+    const {metaQueryResults, metaQueryResultsStatus} = this.state
+
+    if (this.showInvalidMetaQueryMessage) {
+      return (
+        <div className="temp-builder-results">
+          <p className="error">Meta Query is not valid.</p>
+        </div>
+      )
+    }
+
+    return (
+      <TemplateMetaQueryPreview
+        items={metaQueryResults}
+        loadingStatus={metaQueryResultsStatus}
+      />
+    )
+  }
+
+  private get showInvalidMetaQueryMessage(): boolean {
+    const {metaQuery} = this.state
+
+    return this.isInvalidMetaQuery && metaQuery !== ''
+  }
+
+  private get isInvalidMetaQuery(): boolean {
+    const {metaQuery} = this.state
+
+    return isInvalidMetaQuery(metaQuery)
+  }
+
+  private handleMetaQueryInputChange = (
+    e: ChangeEvent<HTMLTextAreaElement>
+  ) => {
+    this.setState({metaQueryInput: e.target.value})
+    this.handleMetaQueryChange()
+  }
+
+  private executeQuery = async (): Promise<void> => {
+    const {template, source, onUpdateTemplate} = this.props
+    const {metaQuery} = this.state
+
+    if (this.isInvalidMetaQuery) {
+      return
+    }
+
+    this.setState({metaQueryResultsStatus: RemoteDataState.Loading})
+
+    try {
+      const {data} = await proxy({
+        source: source.links.proxy,
+        query: metaQuery,
+      })
+
+      const metaQueryResults = parseMetaQuery(metaQuery, data)
+
+      this.setState({
+        metaQueryResults,
+        metaQueryResultsStatus: RemoteDataState.Done,
+      })
+
+      const nextValues = metaQueryResults.map(result => {
+        return {
+          type: TemplateValueType.Constant,
+          value: result,
+          selected: false,
+        }
+      })
+
+      if (nextValues[0]) {
+        nextValues[0].selected = true
+      }
+
+      const nextTemplate = {
+        ...template,
+        values: nextValues,
+      }
+
+      onUpdateTemplate(nextTemplate)
+    } catch {
+      this.setState({
+        metaQueryResults: [],
+        metaQueryResultsStatus: RemoteDataState.Error,
+      })
+    }
+  }
+}
+
+export default CustomMetaQueryTemplateBuilder
diff --git a/ui/src/tempVars/components/TemplateVariableEditor.tsx b/ui/src/tempVars/components/TemplateVariableEditor.tsx
index 296c3fb23c..a0560d88f4 100644
--- a/ui/src/tempVars/components/TemplateVariableEditor.tsx
+++ b/ui/src/tempVars/components/TemplateVariableEditor.tsx
@@ -18,6 +18,7 @@ import MeasurementsTemplateBuilder from 'src/tempVars/components/MeasurementsTem
 import FieldKeysTemplateBuilder from 'src/tempVars/components/FieldKeysTemplateBuilder'
 import TagKeysTemplateBuilder from 'src/tempVars/components/TagKeysTemplateBuilder'
 import TagValuesTemplateBuilder from 'src/tempVars/components/TagValuesTemplateBuilder'
+import MetaQueryTemplateBuilder from 'src/tempVars/components/MetaQueryTemplateBuilder'
 
 import {
   Template,
@@ -59,6 +60,7 @@ const TEMPLATE_BUILDERS = {
   [TemplateType.FieldKeys]: FieldKeysTemplateBuilder,
   [TemplateType.TagKeys]: TagKeysTemplateBuilder,
   [TemplateType.TagValues]: TagValuesTemplateBuilder,
+  [TemplateType.MetaQuery]: MetaQueryTemplateBuilder,
 }
 
 const formatName = name => `:${name.replace(/:/g, '')}:`
diff --git a/ui/src/tempVars/constants/index.ts b/ui/src/tempVars/constants/index.ts
index 414c2e546e..1e14198cca 100644
--- a/ui/src/tempVars/constants/index.ts
+++ b/ui/src/tempVars/constants/index.ts
@@ -34,6 +34,10 @@ export const TEMPLATE_TYPES_LIST: TemplateTypesListItem[] = [
     text: 'CSV',
     type: TemplateType.CSV,
   },
+  {
+    text: 'Custom Meta Query',
+    type: TemplateType.MetaQuery,
+  },
 ]
 
 export const TEMPLATE_VARIABLE_TYPES = {
@@ -136,6 +140,18 @@ export const DEFAULT_TEMPLATES: DefaultTemplates = {
       },
     }
   },
+  [TemplateType.MetaQuery]: () => {
+    return {
+      id: uuid.v4(),
+      tempVar: ':my-meta-query:',
+      values: [],
+      type: TemplateType.MetaQuery,
+      label: '',
+      query: {
+        influxql: '',
+      },
+    }
+  },
 }
 
 export const RESERVED_TEMPLATE_NAMES = [
diff --git a/ui/src/tempVars/utils/parsing.ts b/ui/src/tempVars/utils/parsing.ts
new file mode 100644
index 0000000000..3af8a05c91
--- /dev/null
+++ b/ui/src/tempVars/utils/parsing.ts
@@ -0,0 +1,84 @@
+import parseShowDatabases from 'src/shared/parsing/showDatabases'
+import parseShowFieldKeys from 'src/shared/parsing/showFieldKeys'
+import parseShowTagKeys from 'src/shared/parsing/showTagKeys'
+import parseShowTagValues from 'src/shared/parsing/showTagValues'
+import parseShowMeasurements from 'src/shared/parsing/showMeasurements'
+import parseShowSeries from 'src/shared/parsing/showSeries'
+
+export const parseMetaQuery = (metaQuery: string, response): string[] => {
+  const metaQueryStart = getMetaQueryStart(metaQuery)
+
+  if (!metaQueryStart) {
+    throw new Error('Could not find parser for meta query')
+  }
+
+  const parser = PARSERS[metaQueryStart]
+  const extractor = EXTRACTORS[metaQueryStart]
+  const parsed = parser(response)
+
+  if (parsed.errors.length) {
+    throw new Error(parsed.errors)
+  }
+
+  return extractor(parsed)
+}
+
+export const isInvalidMetaQuery = (metaQuery: string): boolean =>
+  !getMetaQueryStart(metaQuery)
+
+const getMetaQueryStart = (metaQuery: string): string | null => {
+  const words = metaQuery
+    .trim()
+    .toUpperCase()
+    .split(' ')
+  const firstTwoWords = words.slice(0, 2).join(' ')
+  const firstThreeWords = words.slice(0, 3).join(' ')
+
+  return VALID_META_QUERY_STARTS.find(
+    q => q === firstTwoWords || q === firstThreeWords
+  )
+}
+
+const VALID_META_QUERY_STARTS = [
+  'SHOW DATABASES',
+  'SHOW MEASUREMENTS',
+  'SHOW SERIES',
+  'SHOW TAG VALUES',
+  'SHOW FIELD KEYS',
+  'SHOW TAG KEYS',
+]
+
+const PARSERS = {
+  'SHOW DATABASES': parseShowDatabases,
+  'SHOW FIELD KEYS': parseShowFieldKeys,
+  'SHOW MEASUREMENTS': parseShowMeasurements,
+  'SHOW SERIES': parseShowSeries,
+  'SHOW TAG VALUES': parseShowTagValues,
+  'SHOW TAG KEYS': parseShowTagKeys,
+}
+
+const EXTRACTORS = {
+  'SHOW DATABASES': parsed => parsed.databases,
+  'SHOW FIELD KEYS': parsed => {
+    const {fieldSets} = parsed
+    const fieldSetsValues = Object.values(fieldSets) as string[]
+
+    return fieldSetsValues.reduce((acc, current) => [...acc, ...current], [])
+  },
+  'SHOW MEASUREMENTS': parsed => {
+    const {measurementSets} = parsed
+
+    return measurementSets.reduce(
+      (acc, current) => [...acc, ...current.measurements],
+      []
+    )
+  },
+  'SHOW TAG KEYS': parsed => parsed.tagKeys,
+  'SHOW TAG VALUES': parsed => {
+    const {tags} = parsed
+    const tagsValues = Object.values(tags) as string[]
+
+    return tagsValues.reduce((acc, current) => [...acc, ...current], [])
+  },
+  'SHOW SERIES': parsed => parsed.series,
+}
diff --git a/ui/src/types/tempVars.ts b/ui/src/types/tempVars.ts
index 26d9b3f9a2..9d49f4a41a 100644
--- a/ui/src/types/tempVars.ts
+++ b/ui/src/types/tempVars.ts
@@ -36,6 +36,7 @@ export enum TemplateType {
   CSV = 'csv',
   Query = 'query',
   Databases = 'databases',
+  MetaQuery = 'metaQuery',
 }
 
 export interface Template {

From 95a45fda9ff5de26cb890585511526ab86ca03dc Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Tue, 19 Jun 2018 14:45:47 -0700
Subject: [PATCH 2/9] Support persisting "influxql" template variables

---
 chronograf.go            | 4 ++--
 influx/templates.go      | 2 +-
 server/templates.go      | 8 ++++----
 ui/src/types/tempVars.ts | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/chronograf.go b/chronograf.go
index 3faeabe030..1fed8dbbbf 100644
--- a/chronograf.go
+++ b/chronograf.go
@@ -159,7 +159,7 @@ type Range struct {
 // TemplateValue is a value use to replace a template in an InfluxQL query
 type TemplateValue struct {
 	Value    string `json:"value"`         // Value is the specific value used to replace a template in an InfluxQL query
-	Type     string `json:"type"`          // Type can be tagKey, tagValue, fieldKey, csv, measurement, database, constant
+	Type     string `json:"type"`          // Type can be tagKey, tagValue, fieldKey, csv, measurement, database, constant, influxql
 	Selected bool   `json:"selected"`      // Selected states that this variable has been picked to use for replacement
 	Key      string `json:"key,omitempty"` // Key is the key for the Value if the Template Type is 'map'
 }
@@ -177,7 +177,7 @@ type TemplateID string
 type Template struct {
 	TemplateVar
 	ID    TemplateID     `json:"id"`              // ID is the unique ID associated with this template
-	Type  string         `json:"type"`            // Type can be fieldKeys, tagKeys, tagValues, CSV, constant, query, measurements, databases, map
+	Type  string         `json:"type"`            // Type can be fieldKeys, tagKeys, tagValues, CSV, constant, query, measurements, databases, map, influxql
 	Label string         `json:"label"`           // Label is a user-facing description of the Template
 	Query *TemplateQuery `json:"query,omitempty"` // Query is used to generate the choices for a template
 }
diff --git a/influx/templates.go b/influx/templates.go
index fe6a24a404..86168f7727 100644
--- a/influx/templates.go
+++ b/influx/templates.go
@@ -72,7 +72,7 @@ func RenderTemplate(query string, t chronograf.TemplateVar, now time.Time) (stri
 		return strings.Replace(q, t.Var, `"`+t.Values[0].Value+`"`, -1), nil
 	case "tagValue", "timeStamp":
 		return strings.Replace(q, t.Var, `'`+t.Values[0].Value+`'`, -1), nil
-	case "csv", "constant":
+	case "csv", "constant", "influxql":
 		return strings.Replace(q, t.Var, t.Values[0].Value, -1), nil
 	}
 
diff --git a/server/templates.go b/server/templates.go
index e70c1dab96..41109b35d9 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -15,14 +15,14 @@ func ValidTemplateRequest(template *chronograf.Template) error {
 	switch template.Type {
 	default:
 		return fmt.Errorf("Unknown template type %s", template.Type)
-	case "query", "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map":
+	case "query", "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map", "influxql":
 	}
 
 	for _, v := range template.Values {
 		switch v.Type {
 		default:
 			return fmt.Errorf("Unknown template variable type %s", v.Type)
-		case "csv", "fieldKey", "tagKey", "tagValue", "measurement", "database", "constant":
+		case "csv", "fieldKey", "tagKey", "tagValue", "measurement", "database", "constant", "influxql":
 		}
 
 		if template.Type == "map" && v.Key == "" {
@@ -30,8 +30,8 @@ func ValidTemplateRequest(template *chronograf.Template) error {
 		}
 	}
 
-	if template.Type == "query" && template.Query == nil {
-		return fmt.Errorf("No query set for template of type 'query'")
+	if template.Type == "influxql" && template.Query == nil {
+		return fmt.Errorf("No query set for template of type 'influxql'")
 	}
 
 	return nil
diff --git a/ui/src/types/tempVars.ts b/ui/src/types/tempVars.ts
index 9d49f4a41a..c51599edf6 100644
--- a/ui/src/types/tempVars.ts
+++ b/ui/src/types/tempVars.ts
@@ -34,9 +34,8 @@ export enum TemplateType {
   TagKeys = 'tagKeys',
   TagValues = 'tagValues',
   CSV = 'csv',
-  Query = 'query',
   Databases = 'databases',
-  MetaQuery = 'metaQuery',
+  MetaQuery = 'influxql',
 }
 
 export interface Template {

From eee06b07bbbf343b812f14f750d5afff765b8a43 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Tue, 19 Jun 2018 16:09:13 -0700
Subject: [PATCH 3/9] Hydrate MetaQueryTemplateBuilder correctly

---
 .../components/MetaQueryTemplateBuilder.tsx   | 22 ++++++++++---------
 ui/src/types/tempVars.ts                      |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
index b78d64b5fd..c21472bd58 100644
--- a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
+++ b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
@@ -12,8 +12,6 @@ import {
   TemplateValueType,
 } from 'src/types'
 
-// TODO: Ensure save is wired up to changes
-
 const DEBOUNCE_DELAY = 750
 
 interface State {
@@ -30,30 +28,31 @@ class CustomMetaQueryTemplateBuilder extends PureComponent<
 > {
   private handleMetaQueryChange: () => void = _.debounce(() => {
     const {metaQuery, metaQueryInput} = this.state
-    const {template, onUpdateTemplate} = this.props
 
     if (metaQuery === metaQueryInput) {
       return
     }
 
     this.setState({metaQuery: metaQueryInput}, this.executeQuery)
-
-    const nextTemplate = {...template, query: {influxql: metaQueryInput}}
-
-    onUpdateTemplate(nextTemplate)
   }, DEBOUNCE_DELAY)
 
   constructor(props) {
     super(props)
 
+    const metaQuery = _.get(props.template, 'query.influxql', '')
+
     this.state = {
-      metaQueryInput: '',
-      metaQuery: '',
+      metaQuery,
+      metaQueryInput: metaQuery,
       metaQueryResults: [],
       metaQueryResultsStatus: RemoteDataState.NotStarted,
     }
   }
 
+  public componentDidMount() {
+    this.executeQuery()
+  }
+
   public render() {
     const {metaQueryInput} = this.state
 
@@ -138,7 +137,7 @@ class CustomMetaQueryTemplateBuilder extends PureComponent<
 
       const nextValues = metaQueryResults.map(result => {
         return {
-          type: TemplateValueType.Constant,
+          type: TemplateValueType.MetaQuery,
           value: result,
           selected: false,
         }
@@ -151,6 +150,9 @@ class CustomMetaQueryTemplateBuilder extends PureComponent<
       const nextTemplate = {
         ...template,
         values: nextValues,
+        query: {
+          influxql: metaQuery,
+        },
       }
 
       onUpdateTemplate(nextTemplate)
diff --git a/ui/src/types/tempVars.ts b/ui/src/types/tempVars.ts
index c51599edf6..cc17663c4a 100644
--- a/ui/src/types/tempVars.ts
+++ b/ui/src/types/tempVars.ts
@@ -9,6 +9,7 @@ export enum TemplateValueType {
   CSV = 'csv',
   Points = 'points',
   Constant = 'constant',
+  MetaQuery = 'influxql',
 }
 
 export interface TemplateValue {

From 78c35f4f3052435204b0b20c6bd47c818b493a67 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Tue, 19 Jun 2018 16:19:41 -0700
Subject: [PATCH 4/9] Refactor hydrateTempVarValuesAsync

---
 ui/src/dashboards/actions/index.ts | 32 +++++++++++++-----------------
 ui/src/dashboards/apis/index.js    | 17 ----------------
 ui/src/tempVars/constants/index.ts |  1 +
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/ui/src/dashboards/actions/index.ts b/ui/src/dashboards/actions/index.ts
index 658574bd6e..051a6659ba 100644
--- a/ui/src/dashboards/actions/index.ts
+++ b/ui/src/dashboards/actions/index.ts
@@ -5,7 +5,9 @@ import {replace} from 'react-router-redux'
 import _ from 'lodash'
 import queryString from 'query-string'
 
+import {proxy} from 'src/utils/queryUrlGenerator'
 import {isUserAuthorized, EDITOR_ROLE} from 'src/auth/Authorized'
+import {parseMetaQuery} from 'src/tempVars/utils/parsing'
 
 import {
   getDashboards as getDashboardsAJAX,
@@ -15,7 +17,6 @@ import {
   updateDashboardCell as updateDashboardCellAJAX,
   addDashboardCell as addDashboardCellAJAX,
   deleteDashboardCell as deleteDashboardCellAJAX,
-  getTempVarValuesBySourceQuery,
   createDashboard as createDashboardAJAX,
 } from 'src/dashboards/apis'
 import {getMe} from 'src/shared/apis/auth'
@@ -48,7 +49,6 @@ import {
 } from 'src/shared/copy/notifications'
 
 import {makeQueryForTemplate} from 'src/dashboards/utils/tempVars'
-import parsers from 'src/shared/parsing'
 import {getDeep} from 'src/utils/wrappers'
 
 import idNormalizer, {TYPE_ID} from 'src/normalizers/id'
@@ -628,25 +628,21 @@ export const hydrateTempVarValuesAsync = (
     const dashboard = getState().dashboardUI.dashboards.find(
       d => d.id === dashboardID
     )
+    const templates: Template[] = dashboard.templates
+    const queries = templates
+      .filter(template => !!template.query.influxql)
+      .map(async template => {
+        const query = makeQueryForTemplate(template.query)
+        const response = await proxy({source: source.links.proxy, query})
+        const values = parseMetaQuery(query, response.data)
 
-    const tempsWithQueries = dashboard.templates.filter(
-      ({query}) => !!query.influxql
-    )
-
-    const asyncQueries = tempsWithQueries.map(({query}) =>
-      getTempVarValuesBySourceQuery(source, {
-        query: makeQueryForTemplate(query),
+        return {template, values}
       })
-    )
+    const results = await Promise.all(queries)
 
-    const results = await Promise.all(asyncQueries)
-
-    results.forEach(({data}, i) => {
-      const {type, query, id} = tempsWithQueries[i]
-      const parsed = parsers[type](data, query.tagKey || query.measurement)
-      const vals = parsed[type]
-      dispatch(editTemplateVariableValues(+dashboard.id, id, vals))
-    })
+    for (const {template, values} of results) {
+      dispatch(editTemplateVariableValues(+dashboard.id, template.id, values))
+    }
   } catch (error) {
     console.error(error)
     dispatch(errorThrown(error))
diff --git a/ui/src/dashboards/apis/index.js b/ui/src/dashboards/apis/index.js
index 5719a0b05c..ff04e841a1 100644
--- a/ui/src/dashboards/apis/index.js
+++ b/ui/src/dashboards/apis/index.js
@@ -1,5 +1,4 @@
 import AJAX from 'utils/ajax'
-import {proxy} from 'utils/queryUrlGenerator'
 
 export function getDashboards() {
   return AJAX({
@@ -98,19 +97,3 @@ export const editTemplateVariables = async templateVariable => {
     throw error
   }
 }
-
-export const getTempVarValuesBySourceQuery = async (source, templateQuery) => {
-  const {
-    query,
-    db,
-    // rp, TODO
-    tempVars,
-  } = templateQuery
-  try {
-    // TODO: add rp as argument to proxy
-    return await proxy({source: source.links.proxy, query, db, tempVars})
-  } catch (error) {
-    console.error(error)
-    throw error
-  }
-}
diff --git a/ui/src/tempVars/constants/index.ts b/ui/src/tempVars/constants/index.ts
index 1e14198cca..d5fa36e058 100644
--- a/ui/src/tempVars/constants/index.ts
+++ b/ui/src/tempVars/constants/index.ts
@@ -47,6 +47,7 @@ export const TEMPLATE_VARIABLE_TYPES = {
   [TemplateType.FieldKeys]: TemplateValueType.FieldKey,
   [TemplateType.TagKeys]: TemplateValueType.TagKey,
   [TemplateType.TagValues]: TemplateValueType.TagValue,
+  [TemplateType.MetaQuery]: TemplateValueType.MetaQuery,
 }
 
 export const TEMPLATE_VARIABLE_QUERIES = {

From 59864a36e6492648ca3d62af56f73a325ce2d9d3 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Tue, 19 Jun 2018 16:37:02 -0700
Subject: [PATCH 5/9] Fix failing template test

---
 server/templates_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/templates_test.go b/server/templates_test.go
index 83813342bb..cd775acea9 100644
--- a/server/templates_test.go
+++ b/server/templates_test.go
@@ -57,7 +57,7 @@ func TestValidTemplateRequest(t *testing.T) {
 			name:    "No query set",
 			wantErr: true,
 			template: &chronograf.Template{
-				Type: "query",
+				Type: "influxql",
 			},
 		},
 		{

From 1b987b883da2f7b7294d58ae69f934198fba3df2 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Tue, 19 Jun 2018 16:39:28 -0700
Subject: [PATCH 6/9] Use more consistent naming

---
 ui/src/tempVars/utils/parsing.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/src/tempVars/utils/parsing.ts b/ui/src/tempVars/utils/parsing.ts
index 3af8a05c91..b31442abac 100644
--- a/ui/src/tempVars/utils/parsing.ts
+++ b/ui/src/tempVars/utils/parsing.ts
@@ -6,7 +6,7 @@ import parseShowMeasurements from 'src/shared/parsing/showMeasurements'
 import parseShowSeries from 'src/shared/parsing/showSeries'
 
 export const parseMetaQuery = (metaQuery: string, response): string[] => {
-  const metaQueryStart = getMetaQueryStart(metaQuery)
+  const metaQueryStart = getMetaQueryPrefix(metaQuery)
 
   if (!metaQueryStart) {
     throw new Error('Could not find parser for meta query')
@@ -24,9 +24,9 @@ export const parseMetaQuery = (metaQuery: string, response): string[] => {
 }
 
 export const isInvalidMetaQuery = (metaQuery: string): boolean =>
-  !getMetaQueryStart(metaQuery)
+  !getMetaQueryPrefix(metaQuery)
 
-const getMetaQueryStart = (metaQuery: string): string | null => {
+const getMetaQueryPrefix = (metaQuery: string): string | null => {
   const words = metaQuery
     .trim()
     .toUpperCase()
@@ -34,12 +34,12 @@ const getMetaQueryStart = (metaQuery: string): string | null => {
   const firstTwoWords = words.slice(0, 2).join(' ')
   const firstThreeWords = words.slice(0, 3).join(' ')
 
-  return VALID_META_QUERY_STARTS.find(
+  return VALID_META_QUERY_PREFIXES.find(
     q => q === firstTwoWords || q === firstThreeWords
   )
 }
 
-const VALID_META_QUERY_STARTS = [
+const VALID_META_QUERY_PREFIXES = [
   'SHOW DATABASES',
   'SHOW MEASUREMENTS',
   'SHOW SERIES',

From 2841cf902a9e4980ba7bb51e4aff4aa74efc4dfe Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Wed, 20 Jun 2018 09:17:12 -0700
Subject: [PATCH 7/9] Remove unused "query" template type

---
 chronograf.go       | 2 +-
 server/templates.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chronograf.go b/chronograf.go
index 1fed8dbbbf..b26c3bea0d 100644
--- a/chronograf.go
+++ b/chronograf.go
@@ -177,7 +177,7 @@ type TemplateID string
 type Template struct {
 	TemplateVar
 	ID    TemplateID     `json:"id"`              // ID is the unique ID associated with this template
-	Type  string         `json:"type"`            // Type can be fieldKeys, tagKeys, tagValues, CSV, constant, query, measurements, databases, map, influxql
+	Type  string         `json:"type"`            // Type can be fieldKeys, tagKeys, tagValues, CSV, constant, measurements, databases, map, influxql
 	Label string         `json:"label"`           // Label is a user-facing description of the Template
 	Query *TemplateQuery `json:"query,omitempty"` // Query is used to generate the choices for a template
 }
diff --git a/server/templates.go b/server/templates.go
index 41109b35d9..6f158ac3c3 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -15,7 +15,7 @@ func ValidTemplateRequest(template *chronograf.Template) error {
 	switch template.Type {
 	default:
 		return fmt.Errorf("Unknown template type %s", template.Type)
-	case "query", "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map", "influxql":
+	case "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map", "influxql":
 	}
 
 	for _, v := range template.Values {

From 797b214d9564c9b25bf8ca527769c28019ac747f Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Wed, 20 Jun 2018 10:02:33 -0700
Subject: [PATCH 8/9] Access properties more safely

---
 ui/src/dashboards/actions/index.ts                   |  4 +++-
 ui/src/shared/parsing/showSeries.ts                  | 12 ++++++------
 .../tempVars/components/MetaQueryTemplateBuilder.tsx |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ui/src/dashboards/actions/index.ts b/ui/src/dashboards/actions/index.ts
index 051a6659ba..4fd8fd7985 100644
--- a/ui/src/dashboards/actions/index.ts
+++ b/ui/src/dashboards/actions/index.ts
@@ -630,7 +630,9 @@ export const hydrateTempVarValuesAsync = (
     )
     const templates: Template[] = dashboard.templates
     const queries = templates
-      .filter(template => !!template.query.influxql)
+      .filter(
+        template => getDeep<string>(template, 'query.influxql', '') !== ''
+      )
       .map(async template => {
         const query = makeQueryForTemplate(template.query)
         const response = await proxy({source: source.links.proxy, query})
diff --git a/ui/src/shared/parsing/showSeries.ts b/ui/src/shared/parsing/showSeries.ts
index 3cad741e04..0ebd1436a9 100644
--- a/ui/src/shared/parsing/showSeries.ts
+++ b/ui/src/shared/parsing/showSeries.ts
@@ -1,3 +1,5 @@
+import {getDeep} from 'src/utils/wrappers'
+
 interface ParseShowSeriesResponse {
   errors: string[]
   series: string[]
@@ -10,17 +12,15 @@ const parseShowSeries = (response): ParseShowSeriesResponse => {
     return {errors: [results.error], series: []}
   }
 
-  const series = results.series[0]
+  const seriesValues = getDeep<string[]>(results, 'series.0.values', [])
 
-  if (!series.values) {
+  if (!seriesValues.length) {
     return {errors: [], series: []}
   }
 
-  const seriesValues = series.values.map(s => {
-    return s[0]
-  })
+  const series = seriesValues.map(s => s[0])
 
-  return {errors: [], series: seriesValues}
+  return {series, errors: []}
 }
 
 export default parseShowSeries
diff --git a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
index c21472bd58..514b2459dc 100644
--- a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
+++ b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
@@ -5,6 +5,7 @@ import {proxy} from 'src/utils/queryUrlGenerator'
 import {ErrorHandling} from 'src/shared/decorators/errors'
 import TemplateMetaQueryPreview from 'src/tempVars/components/TemplateMetaQueryPreview'
 import {parseMetaQuery, isInvalidMetaQuery} from 'src/tempVars/utils/parsing'
+import {getDeep} from 'src/utils/wrappers'
 
 import {
   TemplateBuilderProps,
@@ -39,7 +40,7 @@ class CustomMetaQueryTemplateBuilder extends PureComponent<
   constructor(props) {
     super(props)
 
-    const metaQuery = _.get(props.template, 'query.influxql', '')
+    const metaQuery = getDeep<string>(props.template, 'query.influxql', '')
 
     this.state = {
       metaQuery,

From b734f7cf007d2885ca46c4cba3f5e038185e84e7 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Wed, 20 Jun 2018 10:03:18 -0700
Subject: [PATCH 9/9] Type MetaQueryTemplateBuilder constructor props

---
 ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
index 514b2459dc..6fdc421006 100644
--- a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
+++ b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx
@@ -37,7 +37,7 @@ class CustomMetaQueryTemplateBuilder extends PureComponent<
     this.setState({metaQuery: metaQueryInput}, this.executeQuery)
   }, DEBOUNCE_DELAY)
 
-  constructor(props) {
+  constructor(props: TemplateBuilderProps) {
     super(props)
 
     const metaQuery = getDeep<string>(props.template, 'query.influxql', '')