Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11051 from influxdata/fix/add-update-config 

fix(ui/dataLoaders): Add check for existing configs for update
pull/11056/head
Iris Scholten 2019-01-14 11:47:41 -08:00 committed by GitHub
parent ba170c9944 358e1820c7
commit 07d4b41c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http/cur_swagger.yml
View File

@ -80,7 +80,7 @@ paths:
- Telegrafs
parameters:
- in: query
name: org
name: orgID
description: specifies the organization of the resource
required: true
schema:

2
http/swagger.yml
View File

@ -142,7 +142,7 @@ paths:
parameters:
- $ref: '#/components/parameters/TraceSpan'
- in: query
name: org
name: orgID
description: specifies the organization of the resource
required: true
schema:

32
ui/src/api/api.ts
View File

@ -12697,14 +12697,14 @@ export const TelegrafsApiAxiosParamCreator = function (configuration?: Configura
return {
/**
*
* @param {string} org specifies the organization of the resource
* @param {string} orgID specifies the organization of the resource
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
telegrafsGet(org: string, options: any = {}): RequestArgs {
// verify required parameter 'org' is not null or undefined
if (org === null || org === undefined) {
throw new RequiredError('org','Required parameter org was null or undefined when calling telegrafsGet.');
telegrafsGet(orgID: string, options: any = {}): RequestArgs {
// verify required parameter 'orgID' is not null or undefined
if (orgID === null || orgID === undefined) {
throw new RequiredError('orgID','Required parameter orgID was null or undefined when calling telegrafsGet.');
}
const localVarPath = `/telegrafs`;
const localVarUrlObj = url.parse(localVarPath, true);
@ -12716,8 +12716,8 @@ export const TelegrafsApiAxiosParamCreator = function (configuration?: Configura
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
if (org !== undefined) {
localVarQueryParameter['org'] = org;
if (orgID !== undefined) {
localVarQueryParameter['orgID'] = orgID;
}
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
@ -13089,12 +13089,12 @@ export const TelegrafsApiFp = function(configuration?: Configuration) {
return {
/**
*
* @param {string} org specifies the organization of the resource
* @param {string} orgID specifies the organization of the resource
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
telegrafsGet(org: string, options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<Telegrafs> {
const localVarAxiosArgs = TelegrafsApiAxiosParamCreator(configuration).telegrafsGet(org, options);
telegrafsGet(orgID: string, options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<Telegrafs> {
const localVarAxiosArgs = TelegrafsApiAxiosParamCreator(configuration).telegrafsGet(orgID, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = Object.assign(localVarAxiosArgs.options, {url: basePath + localVarAxiosArgs.url})
return axios.request(axiosRequestArgs);
@ -13243,12 +13243,12 @@ export const TelegrafsApiFactory = function (configuration?: Configuration, base
return {
/**
*
* @param {string} org specifies the organization of the resource
* @param {string} orgID specifies the organization of the resource
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
telegrafsGet(org: string, options?: any) {
return TelegrafsApiFp(configuration).telegrafsGet(org, options)(axios, basePath);
telegrafsGet(orgID: string, options?: any) {
return TelegrafsApiFp(configuration).telegrafsGet(orgID, options)(axios, basePath);
},
/**
*
@ -13358,13 +13358,13 @@ export const TelegrafsApiFactory = function (configuration?: Configuration, base
export class TelegrafsApi extends BaseAPI {
/**
*
* @param {string} org specifies the organization of the resource
* @param {string} orgID specifies the organization of the resource
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof TelegrafsApi
*/
public telegrafsGet(org: string, options?: any) {
return TelegrafsApiFp(this.configuration).telegrafsGet(org, options)(this.axios, this.basePath);
public telegrafsGet(orgID: string, options?: any) {
return TelegrafsApiFp(this.configuration).telegrafsGet(orgID, options)(this.axios, this.basePath);
}
/**

34
ui/src/onboarding/actions/dataLoaders.ts
View File

@ -5,6 +5,8 @@ import _ from 'lodash'
import {
writeLineProtocol,
createTelegrafConfig,
getTelegrafConfigs,
updateTelegrafConfig,
} from 'src/onboarding/apis/index'
// Utils
@ -240,7 +242,20 @@ export const createOrUpdateTelegrafConfigAsync = (authToken: string) => async (
},
} = getState()
let plugins = []
const telegrafConfigsFromServer = await getTelegrafConfigs(organizationID)
const influxDB2Out = {
name: TelegrafPluginOutputInfluxDBV2.NameEnum.InfluxdbV2,
type: TelegrafPluginOutputInfluxDBV2.TypeEnum.Output,
config: {
urls: ['http://127.0.0.1:9999'],
token: authToken,
organization: org,
bucket,
},
}
let plugins: Plugin[] = [influxDB2Out]
telegrafPlugins.forEach(tp => {
if (tp.configured === ConfigurationState.Configured) {
plugins = [...plugins, tp.plugin || createNewPlugin(tp.name)]
@ -254,18 +269,13 @@ export const createOrUpdateTelegrafConfigAsync = (authToken: string) => async (
organizationID,
}
const influxDB2Out = {
name: TelegrafPluginOutputInfluxDBV2.NameEnum.InfluxdbV2,
type: TelegrafPluginOutputInfluxDBV2.TypeEnum.Output,
config: {
urls: ['http://127.0.0.1:9999'],
token: authToken,
organization: org,
bucket,
},
}
if (telegrafConfigsFromServer.length) {
const id = _.get(telegrafConfigsFromServer, '0.id', '')
plugins = [...plugins, influxDB2Out]
await updateTelegrafConfig(id, body)
dispatch(setTelegrafConfigID(id))
return
}
body = {
...body,