Cr names from rules.alertNodes
parent
851149b397
commit
23cd81b2cb
|
@ -2,6 +2,7 @@ import React, {PropTypes} from 'react'
|
|||
import {Link} from 'react-router'
|
||||
import _ from 'lodash'
|
||||
|
||||
import {getAlertNodeList} from 'src/shared/parsing/parseHandlersFromRule'
|
||||
import {KAPACITOR_RULES_TABLE} from 'src/kapacitor/constants/tableSizing'
|
||||
const {
|
||||
colName,
|
||||
|
@ -62,7 +63,7 @@ const RuleRow = ({rule, source, onDelete, onChangeRuleStatus}) =>
|
|||
</span>
|
||||
</td>
|
||||
<td style={{width: colAlerts}} className="monotype">
|
||||
{rule.alerts.join(', ')}
|
||||
{getAlertNodeList(rule)}
|
||||
</td>
|
||||
<td style={{width: colEnabled}} className="monotype text-center">
|
||||
<div className="dark-checkbox">
|
||||
|
|
|
@ -4,7 +4,7 @@ import _ from 'lodash'
|
|||
import HandlerOptions from 'src/kapacitor/components/HandlerOptions'
|
||||
import HandlerTabs from 'src/kapacitor/components/HandlerTabs'
|
||||
import Dropdown from 'shared/components/Dropdown'
|
||||
// import getHandlersFromRule from 'src/shared/parsing/getHandlersFromRule'
|
||||
// import {getHandlersFromRule} from 'src/shared/parsing/parseHandlersFromRule'
|
||||
|
||||
import {DEFAULT_HANDLERS} from 'src/kapacitor/constants'
|
||||
|
||||
|
|
|
@ -70,7 +70,6 @@ KapacitorRulesPage.propTypes = {
|
|||
name: string.isRequired,
|
||||
trigger: string.isRequired,
|
||||
message: string.isRequired,
|
||||
alerts: arrayOf(string.isRequired).isRequired,
|
||||
})
|
||||
).isRequired,
|
||||
actions: shape({
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
import _ from 'lodash'
|
||||
import {ALERTS_TO_RULE} from 'src/kapacitor/constants'
|
||||
|
||||
const getHandlersFromRule = rule => {
|
||||
export const getHandlersFromRule = rule => {
|
||||
const handlersOfKind = {}
|
||||
const handlersOnThisAlert = []
|
||||
|
||||
|
@ -20,4 +21,15 @@ const getHandlersFromRule = rule => {
|
|||
return {handlersOnThisAlert, selectedHandler, handlersOfKind}
|
||||
}
|
||||
|
||||
export default getHandlersFromRule
|
||||
export const getAlertNodeList = rule => {
|
||||
const nodeList = _.transform(
|
||||
rule.alertNodes,
|
||||
(acc, v, k) => {
|
||||
if (k in ALERTS_TO_RULE && v.length > 0) {
|
||||
acc.push(k)
|
||||
}
|
||||
},
|
||||
[]
|
||||
)
|
||||
return _.join(nodeList, ', ')
|
||||
}
|
Loading…
Reference in New Issue