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

Fix host maintenance label

Browse Source
This commit is contained in:
Alexander Zobnin
2022-12-29 16:48:03 +01:00
parent 89d33a868e
commit 445b46a6aa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/datasource/problemsHandler.ts
View File

@@ -99,6 +99,7 @@ export function joinTriggersWithEvents(
export function setMaintenanceStatus(triggers) { export function setMaintenanceStatus(triggers) {
_.each(triggers, (trigger) => { _.each(triggers, (trigger) => {
trigger.hostInMaintenance = _.some(trigger.hosts, (host) => host.maintenance_status === '1');
trigger.maintenance = false; trigger.maintenance = false;
if (trigger.suppressed === '1') { if (trigger.suppressed === '1') {
trigger.maintenance = true; trigger.maintenance = true;

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

@@ -135,9 +135,11 @@ export default class ProblemList extends PureComponent<ProblemListProps, Problem
const highlightNewerThan = options.highlightNewEvents && options.highlightNewerThan; const highlightNewerThan = options.highlightNewEvents && options.highlightNewerThan;
const statusCell = (props) => StatusCell(props, highlightNewerThan); const statusCell = (props) => StatusCell(props, highlightNewerThan);
const statusIconCell = (props) => StatusIconCell(props, highlightNewerThan); const statusIconCell = (props) => StatusIconCell(props, highlightNewerThan);
const hostNameCell = (props) => <HostCell name={props.original.host} maintenance={props.original.maintenance} />; const hostNameCell = (props) => (
<HostCell name={props.original.host} maintenance={props.original.hostInMaintenance} />
);
const hostTechNameCell = (props) => ( const hostTechNameCell = (props) => (
<HostCell name={props.original.hostTechName} maintenance={props.original.maintenance} /> <HostCell name={props.original.hostTechName} maintenance={props.original.hostInMaintenance} />
); );
const columns = [ const columns = [