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

Problems: fix heart icons, fix #754

Browse Source
This commit is contained in:
Alexander Zobnin
2019-08-08 12:34:21 +03:00
parent e02b660dfd
commit 55ffe5eded
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/panel-triggers/components/AlertList/AlertIcon.tsx
View File

@@ -13,12 +13,8 @@ export default function AlertIcon(props: AlertIconProps) {
const { problem, color, blink, highlightBackground } = props; const { problem, color, blink, highlightBackground } = props;
const priority = Number(problem.priority); const priority = Number(problem.priority);
let iconClass = ''; let iconClass = '';
if (problem.value === '1') { if (problem.value === '1' && priority >= 2) {
if (priority >= 3) { iconClass = 'icon-gf-critical';
iconClass = 'icon-gf-critical';
} else {
iconClass = 'icon-gf-warning';
}
} else { } else {
iconClass = 'icon-gf-online'; iconClass = 'icon-gf-online';
} }

3
src/panel-triggers/components/GFHeartIcon.tsx
View File

@@ -9,8 +9,7 @@ interface GFHeartIconProps {
export default function GFHeartIcon(props: GFHeartIconProps) { export default function GFHeartIcon(props: GFHeartIconProps) {
const status = props.status; const status = props.status;
const className = classNames("icon-gf", props.className, const className = classNames("icon-gf", props.className,
{ "icon-gf-critical": status === 'critical' || status === 'problem' }, { "icon-gf-critical": status === 'critical' || status === 'problem' || status === 'warning'},
{ "icon-gf-warning": status === 'warning' },
{ "icon-gf-online": status === 'online' || status === 'ok' }, { "icon-gf-online": status === 'online' || status === 'ok' },
); );
return ( return (

12
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -557,12 +557,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
getAlertIconClass(trigger) { getAlertIconClass(trigger) {
let iconClass = ''; let iconClass = '';
if (trigger.value === '1') { if (trigger.value === '1' && trigger.priority >= 2) {
if (trigger.priority >= 3) { iconClass = 'icon-gf-critical';
iconClass = 'icon-gf-critical';
} else {
iconClass = 'icon-gf-warning';
}
} else { } else {
iconClass = 'icon-gf-online'; iconClass = 'icon-gf-online';
} }
@@ -574,8 +570,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
} }
getAlertIconClassBySeverity(triggerSeverity) { getAlertIconClassBySeverity(triggerSeverity) {
let iconClass = 'icon-gf-warning'; let iconClass = 'icon-gf-online';
if (triggerSeverity.priority >= 3) { if (triggerSeverity.priority >= 2) {
iconClass = 'icon-gf-critical'; iconClass = 'icon-gf-critical';
} }
return iconClass; return iconClass;