From 2df4309ab03dc28aac0bff1be57897086beacf44 Mon Sep 17 00:00:00 2001 From: Will Piers Date: Thu, 10 Nov 2016 11:13:00 -0800 Subject: [PATCH 1/3] Renamed a couple of alert headings --- ui/src/kapacitor/components/AlertOutputs.js | 12 ++++++------ ui/src/kapacitor/components/HipchatConfig.js | 2 +- ui/src/kapacitor/components/PagerdutyConfig.js | 4 ++-- ui/src/kapacitor/components/SensuConfig.js | 2 +- ui/src/kapacitor/components/VictoropsConfig.js | 13 +++---------- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ui/src/kapacitor/components/AlertOutputs.js b/ui/src/kapacitor/components/AlertOutputs.js index 1ab90576d1..9197fd41bc 100644 --- a/ui/src/kapacitor/components/AlertOutputs.js +++ b/ui/src/kapacitor/components/AlertOutputs.js @@ -2,13 +2,13 @@ import React, {PropTypes} from 'react'; import _ from 'lodash'; import {getKapacitorConfig, updateKapacitorConfigSection, testAlertOutput} from 'shared/apis'; import AlertaConfig from './AlertaConfig'; -import HipchatConfig from './HipchatConfig'; -import PagerdutyConfig from './PagerdutyConfig'; +import HipChatConfig from './HipChatConfig'; +import PagerDutyConfig from './PagerDutyConfig'; import SensuConfig from './SensuConfig'; import SlackConfig from './SlackConfig'; import SMTPConfig from './SMTPConfig'; import TelegramConfig from './TelegramConfig'; -import VictoropsConfig from './VictoropsConfig'; +import VictorOpsConfig from './VictorOpsConfig'; const AlertOutputs = React.createClass({ propTypes: { @@ -138,16 +138,16 @@ const AlertOutputs = React.createClass({ return ; } case 'victorops': { - return ; + return ; } case 'telegram': { return ; } case 'pagerduty': { - return ; + return ; } case 'hipchat': { - return ; + return ; } case 'sensu': { return ; diff --git a/ui/src/kapacitor/components/HipchatConfig.js b/ui/src/kapacitor/components/HipchatConfig.js index 4fce7e23ce..0d48537f96 100644 --- a/ui/src/kapacitor/components/HipchatConfig.js +++ b/ui/src/kapacitor/components/HipchatConfig.js @@ -35,7 +35,7 @@ const HipchatConfig = React.createClass({ return (
-

VictorOps Alert

+

HipChat Alert


diff --git a/ui/src/kapacitor/components/PagerdutyConfig.js b/ui/src/kapacitor/components/PagerdutyConfig.js index 1ee39cbc5a..77a36c03f7 100644 --- a/ui/src/kapacitor/components/PagerdutyConfig.js +++ b/ui/src/kapacitor/components/PagerdutyConfig.js @@ -1,6 +1,6 @@ import React, {PropTypes} from 'react'; -const PagerdutyConfig = React.createClass({ +const PagerDutyConfig = React.createClass({ propTypes: { config: PropTypes.shape({ options: PropTypes.shape({ @@ -75,4 +75,4 @@ const PagerdutyConfig = React.createClass({ }, }); -export default PagerdutyConfig; +export default PagerDutyConfig; diff --git a/ui/src/kapacitor/components/SensuConfig.js b/ui/src/kapacitor/components/SensuConfig.js index e637d8d0fa..b5aa377650 100644 --- a/ui/src/kapacitor/components/SensuConfig.js +++ b/ui/src/kapacitor/components/SensuConfig.js @@ -27,7 +27,7 @@ const SensuConfig = React.createClass({ return (
-

Alerta Alert

+

Sensu Alert


diff --git a/ui/src/kapacitor/components/VictoropsConfig.js b/ui/src/kapacitor/components/VictoropsConfig.js index 1cceb93d8f..8dff8272cb 100644 --- a/ui/src/kapacitor/components/VictoropsConfig.js +++ b/ui/src/kapacitor/components/VictoropsConfig.js @@ -1,12 +1,11 @@ import React, {PropTypes} from 'react'; -const VictoropsConfig = React.createClass({ +const VictorOpsConfig = React.createClass({ propTypes: { config: PropTypes.shape({ options: PropTypes.shape({ 'api-key': PropTypes.bool, 'routing-key': PropTypes.string, - global: PropTypes.bool, url: PropTypes.string, }).isRequired, }).isRequired, @@ -20,7 +19,6 @@ const VictoropsConfig = React.createClass({ 'api-key': this.apiKey.value, 'routing-key': this.routingKey.value, url: this.url.value, - global: this.global.checked, }; this.props.onSave(properties); @@ -30,7 +28,7 @@ const VictoropsConfig = React.createClass({ const {options} = this.props.config; const apiKey = options['api-key']; const routingKey = options['routing-key']; - const {url, global} = options; + const {url} = options; return (
@@ -58,11 +56,6 @@ const VictoropsConfig = React.createClass({ this.url = r} defaultValue={url || ''}>
- -
- this.global = r} defaultChecked={global}/> - -
@@ -78,4 +71,4 @@ const VictoropsConfig = React.createClass({ }, }); -export default VictoropsConfig; +export default VictorOpsConfig; From c00d69ac03b2e7a74366ffa36c3a5c045dbd411c Mon Sep 17 00:00:00 2001 From: Will Piers Date: Thu, 10 Nov 2016 12:45:47 -0800 Subject: [PATCH 2/3] Rename things because Macs are dumb --- ui/src/kapacitor/components/{HipchatConfig.js => hipchat.js} | 0 ui/src/kapacitor/components/{PagerdutyConfig.js => pagerduty.js} | 0 ui/src/kapacitor/components/{VictoropsConfig.js => victorops.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename ui/src/kapacitor/components/{HipchatConfig.js => hipchat.js} (100%) rename ui/src/kapacitor/components/{PagerdutyConfig.js => pagerduty.js} (100%) rename ui/src/kapacitor/components/{VictoropsConfig.js => victorops.js} (100%) diff --git a/ui/src/kapacitor/components/HipchatConfig.js b/ui/src/kapacitor/components/hipchat.js similarity index 100% rename from ui/src/kapacitor/components/HipchatConfig.js rename to ui/src/kapacitor/components/hipchat.js diff --git a/ui/src/kapacitor/components/PagerdutyConfig.js b/ui/src/kapacitor/components/pagerduty.js similarity index 100% rename from ui/src/kapacitor/components/PagerdutyConfig.js rename to ui/src/kapacitor/components/pagerduty.js diff --git a/ui/src/kapacitor/components/VictoropsConfig.js b/ui/src/kapacitor/components/victorops.js similarity index 100% rename from ui/src/kapacitor/components/VictoropsConfig.js rename to ui/src/kapacitor/components/victorops.js From 86aafcf2a91e63a7e3f397b5e58c85afc8c4f6ef Mon Sep 17 00:00:00 2001 From: Will Piers Date: Thu, 10 Nov 2016 12:46:52 -0800 Subject: [PATCH 3/3] Rename things with correct capitalization --- ui/src/kapacitor/components/{hipchat.js => HipChatConfig.js} | 0 ui/src/kapacitor/components/{pagerduty.js => PagerDutyConfig.js} | 0 ui/src/kapacitor/components/{victorops.js => VictorOpsConfig.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename ui/src/kapacitor/components/{hipchat.js => HipChatConfig.js} (100%) rename ui/src/kapacitor/components/{pagerduty.js => PagerDutyConfig.js} (100%) rename ui/src/kapacitor/components/{victorops.js => VictorOpsConfig.js} (100%) diff --git a/ui/src/kapacitor/components/hipchat.js b/ui/src/kapacitor/components/HipChatConfig.js similarity index 100% rename from ui/src/kapacitor/components/hipchat.js rename to ui/src/kapacitor/components/HipChatConfig.js diff --git a/ui/src/kapacitor/components/pagerduty.js b/ui/src/kapacitor/components/PagerDutyConfig.js similarity index 100% rename from ui/src/kapacitor/components/pagerduty.js rename to ui/src/kapacitor/components/PagerDutyConfig.js diff --git a/ui/src/kapacitor/components/victorops.js b/ui/src/kapacitor/components/VictorOpsConfig.js similarity index 100% rename from ui/src/kapacitor/components/victorops.js rename to ui/src/kapacitor/components/VictorOpsConfig.js