Skip to content

Commit

Permalink
fix(ui): addressed failing tests, still need to work on PR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
asalem1 committed Dec 26, 2019
1 parent 8a7cd82 commit be3f661
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
17 changes: 9 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
4. [16262](https://github.com/influxdata/influxdb/pull/16262): Add support for check resource pkger dry run functionality
5. [16275](https://github.com/influxdata/influxdb/pull/16275): Add support for check resource pkger apply functionality
6. [16283](https://github.com/influxdata/influxdb/pull/16283): Add support for check resource pkger export functionality
1. [16212](https://github.com/influxdata/influxdb/pull/16212): Add new kv.ForwardCursor interface
1. [16297](https://github.com/influxdata/influxdb/pull/16297): Add support for notification rule to pkger parser
1. [16298](https://github.com/influxdata/influxdb/pull/16298): Add support for notification rule pkger dry run functionality
1. [16305](https://github.com/influxdata/influxdb/pull/16305): Add support for notification rule pkger apply functionality
1. [16312](https://github.com/influxdata/influxdb/pull/16312): Add support for notification rule pkger export functionality
1. [16320](https://github.com/influxdata/influxdb/pull/16320): Add support for tasks to pkger parser
1. [16322](https://github.com/influxdata/influxdb/pull/16322): Add support for tasks to pkger dry run functionality
1. [16323](https://github.com/influxdata/influxdb/pull/16323): Add support for tasks to pkger apply functionality
7. [16212](https://github.com/influxdata/influxdb/pull/16212): Add new kv.ForwardCursor interface
8. [16297](https://github.com/influxdata/influxdb/pull/16297): Add support for notification rule to pkger parser
9. [16298](https://github.com/influxdata/influxdb/pull/16298): Add support for notification rule pkger dry run functionality
10. [16305](https://github.com/influxdata/influxdb/pull/16305): Add support for notification rule pkger apply functionality
11. [16312](https://github.com/influxdata/influxdb/pull/16312): Add support for notification rule pkger export functionality
12. [16320](https://github.com/influxdata/influxdb/pull/16320): Add support for tasks to pkger parser
13. [16322](https://github.com/influxdata/influxdb/pull/16322): Add support for tasks to pkger dry run functionality
14. [16323](https://github.com/influxdata/influxdb/pull/16323): Add support for tasks to pkger apply functionality
15. [16325](https://github.com/influxdata/influxdb/pull/16325): Add support for last run status, last completed, last run scheduled, and last run error for checks and notification rules

### Bug Fixes

Expand Down
4 changes: 2 additions & 2 deletions ui/src/dataLoaders/actions/dataLoaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import {
TelegrafConfigCreationSuccess,
readWriteCardinalityLimitReached,
} from 'src/shared/copy/notifications'
import {Telegraf, TelegrafRequestPlugin} from 'src/client'
import {Telegraf} from 'src/client'

type GetState = () => AppState

Expand Down Expand Up @@ -381,7 +381,7 @@ export const createOrUpdateTelegrafConfigAsync = () => async (
data: {
name: telegrafConfigName,
description: telegrafConfigDescription,
plugins: plugins as TelegrafRequestPlugin[],
// plugins: plugins as TelegrafPlugin[], // TODO: figure out if still relevant
},
})

Expand Down
2 changes: 1 addition & 1 deletion ui/src/dataLoaders/reducers/telegrafEditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ logfile = ""
hostname = ""
## If set to true, do no set the "host" tag in the telegraf agent.
omit_hostname = false
`
`,
},
{
name: '__default__',
Expand Down
2 changes: 1 addition & 1 deletion ui/src/telegrafs/components/CollectorCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class CollectorRow extends PureComponent<Props & WithRouterProps> {
private get labels(): JSX.Element {
const {collector, labels, onFilterChange} = this.props
// todo(glinton): track down `Label` drift and remove `as Label[]`
const collectorLabels = viewableLabels(collector.labels as Label[])
const collectorLabels = viewableLabels(collector.labels)

return (
<InlineLabels
Expand Down

0 comments on commit be3f661

Please sign in to comment.