Alert Parameters:
@@ -27,9 +27,9 @@ const HttpConfig = ({selectedEndpoint, handleModifyEndpoint}) => {
const {func, shape} = PropTypes
-HttpConfig.propTypes = {
+TelegramConfig.propTypes = {
selectedEndpoint: shape({}).isRequired,
handleModifyEndpoint: func.isRequired,
}
-export default HttpConfig
+export default TelegramConfig
diff --git a/ui/src/kapacitor/components/configEP/VictorOpsConfig.js b/ui/src/kapacitor/components/configEP/VictorOpsConfig.js
index 84443e5fca..5fcbb89db5 100644
--- a/ui/src/kapacitor/components/configEP/VictorOpsConfig.js
+++ b/ui/src/kapacitor/components/configEP/VictorOpsConfig.js
@@ -10,8 +10,8 @@ const VictoropsConfig = ({selectedEndpoint, handleModifyEndpoint}) => {
selectedEndpoint={selectedEndpoint}
handleModifyEndpoint={handleModifyEndpoint}
fieldName="routingKey"
- fieldDisplay="Channel:"
- placeholder="Ex: team_rocket"
+ fieldDisplay="Routing Key:"
+ placeholder="Ex: routing_key"
/>
diff --git a/ui/src/kapacitor/components/configEP/index.js b/ui/src/kapacitor/components/configEP/index.js
index b17c621044..211b7bcb96 100644
--- a/ui/src/kapacitor/components/configEP/index.js
+++ b/ui/src/kapacitor/components/configEP/index.js
@@ -1,4 +1,4 @@
-import HttpConfig from './HttpConfig'
+import PostConfig from './PostConfig'
import TcpConfig from './TcpConfig'
import ExecConfig from './ExecConfig'
import LogConfig from './LogConfig'
@@ -15,7 +15,7 @@ import TelegramConfig from './TelegramConfig'
import VictoropsConfig from './VictoropsConfig'
export {
- HttpConfig,
+ PostConfig,
TcpConfig,
ExecConfig,
LogConfig,
diff --git a/ui/src/kapacitor/constants/index.js b/ui/src/kapacitor/constants/index.js
index 1b86417610..47c204711c 100644
--- a/ui/src/kapacitor/constants/index.js
+++ b/ui/src/kapacitor/constants/index.js
@@ -87,14 +87,84 @@ export const RULE_MESSAGE_TEMPLATES = {
text: 'The time of the point that triggered the event',
},
}
-
+// DEFAULT_ALERTS provides a template for alerts that don't exist in the kapacitor config
export const DEFAULT_ALERTS = [
- {type: 'http', options: {url: ''}},
- {type: 'tcp', options: {address: ''}},
- {type: 'exec', options: {command: ''}},
- {type: 'log', options: {file: ''}},
+ {type: 'post', url: '', headers: '', captureResponse: '', timeout: ''}, // is actually called 'post'??
+ {type: 'tcp', address: ''},
+ {type: 'exec', command: ''},
+ {type: 'log', filePath: ''},
]
+// ALERT_FIELDS_FROM_CONFIG returns an array of fields to accept from the Kapacitor Config
+// I WILL NEED TO ADD MORE TO DISPLAY FIELDS WHICH COME FROM THE CONFIG WHICH WILL JUST BE DISPLAYED NOT EDITABLE>
+// I need to check what happens when one of these fields does not exist- the value in the input will fail at first. ?? add a default val?
+export const ALERT_FIELDS_FROM_CONFIG = {
+ alerta: [
+ 'token',
+ 'resource',
+ 'event',
+ 'environment',
+ 'group',
+ 'value',
+ 'origin',
+ 'service',
+ 'timeout',
+ ],
+ hipchat: ['room', 'token'],
+ opsgenie: ['teams', 'recipients'],
+ pagerduty: ['serviceKey'],
+ pushover: ['userKey', 'device', 'title', 'url', 'urlTitle', 'sound'],
+ sensu: ['source', 'handlers'],
+ slack: ['channel', 'username', 'iconEmoji'],
+ smtp: ['to'],
+ snmpTrap: ['trapOid', 'data'], // [oid/type/value]
+ talk: [],
+ telegram: [
+ 'chatId',
+ 'parseMode',
+ 'disableWebPagePreview',
+ 'disableNotification',
+ ],
+ victorOps: ['routingKey'],
+ influxdb: [],
+}
+
+// ALERTS_TO_RULE returns array of fields that may be updated for each alert on rule.
+export const ALERT_FIELDS_TO_RULE = {
+ alerta: [
+ 'token',
+ 'resource',
+ 'event',
+ 'environment',
+ 'group',
+ 'value',
+ 'origin',
+ 'service',
+ 'timeout',
+ ],
+ hipchat: ['room', 'token'],
+ opsgenie: ['teams', 'recipients'],
+ pagerduty: ['serviceKey'],
+ pushover: ['userKey', 'device', 'title', 'url', 'urlTitle', 'sound'],
+ sensu: ['source', 'handlers'],
+ slack: ['channel', 'username', 'iconEmoji'],
+ email: ['to'],
+ snmpTrap: ['trapOid', 'data'], // [oid/type/value]
+ talk: [],
+ telegram: [
+ 'chatId',
+ 'parseMode',
+ 'disableWebPagePreview',
+ 'disableNotification',
+ ],
+ victorOps: ['routingKey'],
+ influxdb: [], // ?????
+ post: ['url', 'headers', 'captureResponse', 'timeout'],
+ tcp: ['address'],
+ exec: ['command'],
+ log: ['filePath'],
+}
+
export const RULE_ALERT_OPTIONS = {
http: {
args: {
diff --git a/ui/src/kapacitor/containers/KapacitorRulePage.js b/ui/src/kapacitor/containers/KapacitorRulePage.js
index d32ac81617..f7d826953d 100644
--- a/ui/src/kapacitor/containers/KapacitorRulePage.js
+++ b/ui/src/kapacitor/containers/KapacitorRulePage.js
@@ -7,18 +7,24 @@ import * as kapacitorQueryConfigActionCreators from 'src/kapacitor/actions/query
import {bindActionCreators} from 'redux'
import {getActiveKapacitor, getKapacitorConfig} from 'shared/apis/index'
-import {DEFAULT_RULE_ID} from 'src/kapacitor/constants'
+import {
+ DEFAULT_RULE_ID,
+ ALERT_FIELDS_FROM_CONFIG,
+} from 'src/kapacitor/constants'
import KapacitorRule from 'src/kapacitor/components/KapacitorRule'
const getEnabled = config => {
const {data: {sections}} = config
const allAlerts = _.map(sections, (v, k) => {
- return {type: k, options: _.get(v, ['elements', '0', 'options'], {})}
+ const fromConfig = _.get(v, ['elements', '0', 'options'], {})
+ const pickedFromConfig = _.pick(fromConfig, [
+ ALERT_FIELDS_FROM_CONFIG[k],
+ 'enabled',
+ ])
+ return {type: k, ...pickedFromConfig}
})
- let enabledAlerts = _.filter(allAlerts, v =>
- _.get(v, ['options', 'enabled'], false)
- )
- enabledAlerts = _.reject(enabledAlerts, v => v.type === 'influxdb') // TODO: should I be whitelisting here??
+ let enabledAlerts = _.filter(allAlerts, v => _.get(v, ['enabled'], false))
+ enabledAlerts = _.reject(enabledAlerts, v => v.type === 'influxdb') // TODO: remove this.
return enabledAlerts
}
diff --git a/ui/src/kapacitor/reducers/rules.js b/ui/src/kapacitor/reducers/rules.js
index 5b0f7d2253..2f25b46ac9 100644
--- a/ui/src/kapacitor/reducers/rules.js
+++ b/ui/src/kapacitor/reducers/rules.js
@@ -1,6 +1,9 @@
-import {defaultRuleConfigs, DEFAULT_RULE_ID} from 'src/kapacitor/constants'
+import {
+ defaultRuleConfigs,
+ DEFAULT_RULE_ID,
+ ALERT_FIELDS_TO_RULE,
+} from 'src/kapacitor/constants'
import _ from 'lodash'
-import {parseAlerta} from 'shared/parsing/parseAlerta'
export default function rules(state = {}, action) {
switch (action.type) {
@@ -86,46 +89,13 @@ export default function rules(state = {}, action) {
case 'UPDATE_RULE_ALERT_NODES': {
const {ruleID, alerts} = action.payload
- const alertNodesByType = alerts.map(alert => {
- const {type, alias} = alert
- switch (type) {
- case 'http':
- case 'tcp':
- case 'log':
- return {
- name: type,
- args: [alias],
- properties: [],
- }
- case 'exec':
- case 'smtp':
- return [
- {
- name: type,
- args: alias.split(' '),
- properties: [],
- },
- ]
- case 'alerta':
- return {
- name: type,
- args: [],
- properties: parseAlerta(alias),
- }
- case 'hipchat':
- case 'opsgenie':
- case 'pagerduty':
- case 'slack':
- case 'telegram':
- case 'victorops':
- case 'pushover':
- default:
- return {
- name: type,
- args: [],
- properties: [],
- }
- }
+ const alertNodesByType = {}
+ _.forEach(alerts, ep => {
+ const existing = _.get(alertNodesByType, ep.type, [])
+ alertNodesByType[ep.type] = [
+ ...existing,
+ _.pick(ep, ALERT_FIELDS_TO_RULE[ep.type]),
+ ]
})
return Object.assign({}, state, {
[ruleID]: Object.assign({}, state[ruleID], {
diff --git a/ui/src/style/unsorted.scss b/ui/src/style/unsorted.scss
index 3a601d6754..781fd65024 100644
--- a/ui/src/style/unsorted.scss
+++ b/ui/src/style/unsorted.scss
@@ -451,7 +451,7 @@ $dash-editable-header-padding: 7px;
}
}
}
-
+}
/* Add borders between items in .nav-tablist
-----------------------------------------------------------------------------
TODO: Add these styles into the theme