From fd974fb6b6df14d83f91b6955ed5e7d5b809f531 Mon Sep 17 00:00:00 2001 From: Iris Scholten Date: Tue, 5 Feb 2019 10:06:24 -0800 Subject: [PATCH] fix(ui/dataLoaders): Add swap to system bundle --- CHANGELOG.md | 10 ++++++++++ ui/mocks/dummyData.ts | 7 +++++++ ui/src/dataLoaders/constants/pluginConfigs.ts | 1 + ui/src/dataLoaders/reducers/dataLoaders.test.ts | 2 ++ 4 files changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a5011cf517..690822bdd67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## v2.0.0-alpha.2 [unreleased] + +## Features + +## Bug Fixes +1. [11678](https://github.com/influxdata/influxdb/pull/11678): Update the System Telegraf Plugin bundle to include the swap plugin + +## UI Improvements + + ## v2.0.0-alpha.1 [2019-01-23] ### Release Notes diff --git a/ui/mocks/dummyData.ts b/ui/mocks/dummyData.ts index b534af907aa..6aa8f171628 100644 --- a/ui/mocks/dummyData.ts +++ b/ui/mocks/dummyData.ts @@ -17,6 +17,7 @@ import { TelegrafPluginInputNet, TelegrafPluginInputProcstat, TelegrafPluginInputDocker, + TelegrafPluginInputSwap, Task as TaskApi, Organization, } from 'src/api' @@ -400,6 +401,12 @@ export const redisTelegrafPlugin = { name: TelegrafPluginInputRedis.NameEnum.Redis, } +export const swapTelegrafPlugin = { + ...telegrafPlugin, + name: TelegrafPluginInputSwap.NameEnum.Swap, + configured: ConfigurationState.Configured, +} + export const redisPlugin = { name: TelegrafPluginInputRedis.NameEnum.Redis, type: TelegrafPluginInputRedis.TypeEnum.Input, diff --git a/ui/src/dataLoaders/constants/pluginConfigs.ts b/ui/src/dataLoaders/constants/pluginConfigs.ts index d26b49bf7f0..01f248b0f48 100644 --- a/ui/src/dataLoaders/constants/pluginConfigs.ts +++ b/ui/src/dataLoaders/constants/pluginConfigs.ts @@ -43,6 +43,7 @@ export const pluginsByBundle: PluginBundles = { TelegrafPluginInputMem.NameEnum.Mem, TelegrafPluginInputNet.NameEnum.Net, TelegrafPluginInputProcesses.NameEnum.Processes, + TelegrafPluginInputSwap.NameEnum.Swap, ], [BundleName.Docker]: [TelegrafPluginInputDocker.NameEnum.Docker], [BundleName.Kubernetes]: [TelegrafPluginInputKubernetes.NameEnum.Kubernetes], diff --git a/ui/src/dataLoaders/reducers/dataLoaders.test.ts b/ui/src/dataLoaders/reducers/dataLoaders.test.ts index d4859c2c1fa..abd070870f3 100644 --- a/ui/src/dataLoaders/reducers/dataLoaders.test.ts +++ b/ui/src/dataLoaders/reducers/dataLoaders.test.ts @@ -39,6 +39,7 @@ import { token, telegrafConfig, dockerTelegrafPlugin, + swapTelegrafPlugin, } from 'mocks/dummyData' import {QUICKSTART_SCRAPER_TARGET_URL} from 'src/dataLoaders/constants/pluginConfigs' @@ -506,6 +507,7 @@ describe('dataLoader reducer', () => { memTelegrafPlugin, netTelegrafPlugin, processesTelegrafPlugin, + swapTelegrafPlugin, ]) ) })