Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Problems: highlight resolved events with OK color

Browse Source
This commit is contained in:
Alexander Zobnin
2020-05-15 19:21:24 +03:00
parent 5034c2ca90
commit a61816dc1c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/panel-triggers/components/Problems/Problems.tsx
View File

@@ -86,7 +86,7 @@ export default class ProblemList extends PureComponent<ProblemListProps, Problem
const result = []; const result = [];
const options = this.props.panelOptions; const options = this.props.panelOptions;
const highlightNewerThan = options.highlightNewEvents && options.highlightNewerThan; const highlightNewerThan = options.highlightNewEvents && options.highlightNewerThan;
const statusCell = props => StatusCell(props, options.okEventColor, DEFAULT_PROBLEM_COLOR, highlightNewerThan); const statusCell = props => StatusCell(props, highlightNewerThan);
const statusIconCell = props => StatusIconCell(props, highlightNewerThan); const statusIconCell = props => StatusIconCell(props, highlightNewerThan);
const columns = [ const columns = [
@@ -98,7 +98,7 @@ export default class ProblemList extends PureComponent<ProblemListProps, Problem
Header: 'Severity', show: options.severityField, className: 'problem-severity', width: 120, Header: 'Severity', show: options.severityField, className: 'problem-severity', width: 120,
accessor: problem => problem.priority, accessor: problem => problem.priority,
id: 'severity', id: 'severity',
Cell: props => SeverityCell(props, options.triggerSeverity, options.markAckEvents, options.ackEventColor), Cell: props => SeverityCell(props, options.triggerSeverity, options.markAckEvents, options.ackEventColor, options.okEventColor),
}, },
{ {
Header: '', id: 'statusIcon', show: options.statusIcon, className: 'problem-status-icon', width: 50, Header: '', id: 'statusIcon', show: options.statusIcon, className: 'problem-status-icon', width: 50,
@@ -178,7 +178,13 @@ export default class ProblemList extends PureComponent<ProblemListProps, Problem
} }
} }
function SeverityCell(props: RTCell<ProblemDTO>, problemSeverityDesc: TriggerSeverity[], markAckEvents?: boolean, ackEventColor?: string) { function SeverityCell(
props: RTCell<ProblemDTO>,
problemSeverityDesc: TriggerSeverity[],
markAckEvents?: boolean,
ackEventColor?: string,
okColor = DEFAULT_OK_COLOR
) {
const problem = props.original; const problem = props.original;
let color: string; let color: string;
@@ -189,7 +195,7 @@ function SeverityCell(props: RTCell<ProblemDTO>, problemSeverityDesc: TriggerSev
severityDesc = _.find(problemSeverityDesc, s => s.priority === severity); severityDesc = _.find(problemSeverityDesc, s => s.priority === severity);
} }
color = severityDesc.color; color = problem.value === '0' ? okColor : severityDesc.color;
// Mark acknowledged triggers with different color // Mark acknowledged triggers with different color
if (markAckEvents && problem.acknowledged === "1") { if (markAckEvents && problem.acknowledged === "1") {
@@ -206,9 +212,9 @@ function SeverityCell(props: RTCell<ProblemDTO>, problemSeverityDesc: TriggerSev
const DEFAULT_OK_COLOR = 'rgb(56, 189, 113)'; const DEFAULT_OK_COLOR = 'rgb(56, 189, 113)';
const DEFAULT_PROBLEM_COLOR = 'rgb(215, 0, 0)'; const DEFAULT_PROBLEM_COLOR = 'rgb(215, 0, 0)';
function StatusCell(props: RTCell<ProblemDTO>, okColor = DEFAULT_OK_COLOR, problemColor = DEFAULT_PROBLEM_COLOR, highlightNewerThan?: string) { function StatusCell(props: RTCell<ProblemDTO>, highlightNewerThan?: string) {
const status = props.value === '0' ? 'RESOLVED' : 'PROBLEM'; const status = props.value === '0' ? 'RESOLVED' : 'PROBLEM';
const color = props.value === '0' ? okColor : problemColor; const color = props.value === '0' ? DEFAULT_OK_COLOR : DEFAULT_PROBLEM_COLOR;
let newProblem = false; let newProblem = false;
if (highlightNewerThan) { if (highlightNewerThan) {
newProblem = isNewProblem(props.original, highlightNewerThan); newProblem = isNewProblem(props.original, highlightNewerThan);