Merge pull request #3678 from influxdata/bugfix/flux-base

Bugfix/flux base

ui/src/flux/apis/index.ts

@@ -52,7 +52,7 @@ export const getTimeSeries = async (
   const and = encodeURIComponent('&')
   const mark = encodeURIComponent('?')
   const garbage = script.replace(/\s/g, '') // server cannot handle whitespace
-  const url = `${
+  const url = `${window.basepath}${
     service.links.proxy
   }?path=/v1/query${mark}orgName=defaulorgname${and}q=${garbage}`
 
@@ -78,41 +78,6 @@ export const getTimeSeries = async (
   }
 }
 
-// TODO: replace with actual requests to Flux daemon
-export const getDatabases = async () => {
-  try {
-    const response = {data: {dbs: ['telegraf', 'chronograf', '_internal']}}
-    const {data} = await Promise.resolve(response)
-
-    return data.dbs
-  } catch (error) {
-    console.error('Could not get databases', error)
-    throw error
-  }
-}
-
-export const getTags = async () => {
-  try {
-    const response = {data: {tags: ['tk1', 'tk2', 'tk3']}}
-    const {data} = await Promise.resolve(response)
-    return data.tags
-  } catch (error) {
-    console.error('Could not get tags', error)
-    throw error
-  }
-}
-
-export const getTagValues = async () => {
-  try {
-    const response = {data: {values: ['tv1', 'tv2', 'tv3']}}
-    const {data} = await Promise.resolve(response)
-    return data.values
-  } catch (error) {
-    console.error('Could not get tag values', error)
-    throw error
-  }
-}
-
 export const updateScript = async (service: Service, script: string) => {
   const updates = {...service, metadata: {script}}
 

ui/src/kapacitor/apis/index.js

@@ -109,7 +109,7 @@ const kapacitorLogHeaders = {
 export const getLogStream = kapacitor => {
   // axios doesn't support the chunked transfer encoding response kapacitor uses for logs
   // AJAX adds basepath, but we need to supply it directly to fetch
-  const url = `${kapacitor.links.proxy}?pat=/kapacitor/v1preview/logs`
+  const url = `${kapacitor.links.proxy}?path=/kapacitor/v1preview/logs`
   const basepath = window.basepath || ''
 
   return fetch(`${basepath}${url}`, {