diff --git a/CHANGELOG.md b/CHANGELOG.md index 0580cb056..49517decd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ 1. [#3233](https://github.com/influxdata/chronograf/pull/3233): Add default retention policy field as option in source configuration for use in querying hosts from Host List page & Host pages 1. [#3290](https://github.com/influxdata/chronograf/pull/3290): Add support for PagerDuty v2 in UI 1. [#3369](https://github.com/influxdata/chronograf/pull/3369): Add support for OpsGenie v2 in UI +1. [#3416](https://github.com/influxdata/chronograf/pull/3416): Allow kapacitor services to be disabled ### UI Improvements diff --git a/ui/package.json b/ui/package.json index 0fa63f482..9cd976f7d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -119,7 +119,7 @@ "webpack-dev-server": "^2.11.1" }, "dependencies": { - "axios": "^0.13.1", + "axios": "^0.18.0", "bignumber.js": "^4.0.2", "calculate-size": "^1.1.1", "chroma-js": "^1.3.6", diff --git a/ui/src/kapacitor/components/AlertTabs.tsx b/ui/src/kapacitor/components/AlertTabs.tsx index 16c5f652c..687f644b0 100644 --- a/ui/src/kapacitor/components/AlertTabs.tsx +++ b/ui/src/kapacitor/components/AlertTabs.tsx @@ -430,7 +430,7 @@ class AlertTabs extends PureComponent { return _.get( sections, [section, 'elements', '0', 'options', 'enabled'], - null + false ) } @@ -475,7 +475,7 @@ class AlertTabs extends PureComponent { } private sanitizeProperties = (section: string, properties: Props): Props => { - const cleanProps = {...properties, enabled: true} + const cleanProps = {enabled: true, ...properties} const {redacted} = this.getSection(this.state.configSections, section) if (redacted && redacted.length) { redacted.forEach(badProp => { diff --git a/ui/src/kapacitor/components/HandlerEmpty.js b/ui/src/kapacitor/components/HandlerEmpty.js index 46b3aff68..cc3348494 100644 --- a/ui/src/kapacitor/components/HandlerEmpty.js +++ b/ui/src/kapacitor/components/HandlerEmpty.js @@ -5,7 +5,7 @@ const HandlerEmpty = ({onGoToConfig, validationError}) => (
-

This handler has not been configured

+

This handler is not enabled

+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+