Merge pull request #11693 from influxdata/feat/telegraf-auth-envvar

feat(ui/dataLoaders): Use env var for telegraf config auth token
influxdata · Feb 5, 2019 · 14482cf · 14482cf
2 parents 8f96a72 + 26e2a15
commit 14482cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## v2.0.0-alpha.2 [unreleased]
 
 ## Features
+1. [11693](https://github.com/influxdata/influxdb/pull/11693): Save the $INFLUX_TOKEN environmental variable in telegraf configs
 
 ## Bug Fixes
 1. [11678](https://github.com/influxdata/influxdb/pull/11678): Update the System Telegraf Plugin bundle to include the swap plugin

diff --git a/ui/src/dataLoaders/actions/dataLoaders.ts b/ui/src/dataLoaders/actions/dataLoaders.ts
@@ -283,7 +283,7 @@ export const removePluginBundleWithPlugins = (
   dispatch(removeBundlePlugins(bundle))
 }
 
-export const createOrUpdateTelegrafConfigAsync = (authToken: string) => async (
+export const createOrUpdateTelegrafConfigAsync = () => async (
   dispatch,
   getState: GetState
 ) => {
@@ -299,7 +299,7 @@ export const createOrUpdateTelegrafConfigAsync = (authToken: string) => async (
     type: TelegrafPluginOutputInfluxDBV2.TypeEnum.Output,
     config: {
       urls: ['http://127.0.0.1:9999'],
-      token: authToken,
+      token: '$INFLUX_TOKEN',
       organization: org,
       bucket,
     },

diff --git a/ui/src/dataLoaders/components/verifyStep/CreateOrUpdateConfig.tsx b/ui/src/dataLoaders/components/verifyStep/CreateOrUpdateConfig.tsx
@@ -23,7 +23,6 @@ import {RemoteDataState, NotificationAction} from 'src/types'
 
 export interface OwnProps {
   org: string
-  authToken: string
   children: () => JSX.Element
 }
 
@@ -50,15 +49,14 @@ export class CreateOrUpdateConfig extends PureComponent<Props, State> {
   public async componentDidMount() {
     const {
       onSaveTelegrafConfig,
-      authToken,
       notify,
       createDashboardsForPlugins,
     } = this.props
 
     this.setState({loading: RemoteDataState.Loading})
 
     try {
-      await onSaveTelegrafConfig(authToken)
+      await onSaveTelegrafConfig()
       notify(TelegrafConfigCreationSuccess)
       await createDashboardsForPlugins()
 

diff --git a/ui/src/dataLoaders/components/verifyStep/DataStreaming.tsx b/ui/src/dataLoaders/components/verifyStep/DataStreaming.tsx
@@ -28,7 +28,7 @@ class DataStreaming extends PureComponent<Props> {
 
     return (
       <>
-        <CreateOrUpdateConfig org={org} authToken={authToken}>
+        <CreateOrUpdateConfig org={org}>
           {() => (
             <TelegrafInstructions
               notify={notify}

diff --git a/ui/src/dataLoaders/reducers/dataLoaders.test.ts b/ui/src/dataLoaders/reducers/dataLoaders.test.ts
@@ -36,7 +36,6 @@ import {
   processesTelegrafPlugin,
   systemTelegrafPlugin,
   redisTelegrafPlugin,
-  token,
   telegrafConfig,
   dockerTelegrafPlugin,
   swapTelegrafPlugin,
@@ -488,7 +487,7 @@ describe('dataLoader reducer', () => {
         },
       },
     })
-    await createOrUpdateTelegrafConfigAsync(token)(dispatch, getState)
+    await createOrUpdateTelegrafConfigAsync()(dispatch, getState)
 
     expect(dispatch).toBeCalledWith(setTelegrafConfigID(telegrafConfig.id))
   })