mirror of
https://github.com/moudsen/mailGraph
synced 2025-01-30 20:01:38 +01:00
v2.10 - Correction of incorrectly copied source file from different host
This commit is contained in:
parent
8bc476ed63
commit
3a4a7ab23e
@ -520,7 +520,7 @@
|
|||||||
$p_eventId = intval($problemData['eventId']);
|
$p_eventId = intval($problemData['eventId']);
|
||||||
|
|
||||||
if (!isset($problemData['recipient'])) { echo "Missing RECIPIENT?\n"; die; }
|
if (!isset($problemData['recipient'])) { echo "Missing RECIPIENT?\n"; die; }
|
||||||
$nt = $problemData['recipient'];
|
$p_recipient = $problemData['recipient'];
|
||||||
|
|
||||||
if (!isset($problemData['duration'])) { echo "Missing DURATION?\n"; die; }
|
if (!isset($problemData['duration'])) { echo "Missing DURATION?\n"; die; }
|
||||||
$p_duration = intval($problemData['duration']);
|
$p_duration = intval($problemData['duration']);
|
||||||
@ -595,6 +595,7 @@
|
|||||||
|
|
||||||
// Zabbix API user (requires Super Admin access rights)
|
// Zabbix API user (requires Super Admin access rights)
|
||||||
// --- Copy from Zabbix user and override when defined in configuration
|
// --- Copy from Zabbix user and override when defined in configuration
|
||||||
|
// TODO: Check if information retreival can be done with less rigths
|
||||||
$z_api_user = $z_user;
|
$z_api_user = $z_user;
|
||||||
$z_api_pass = $z_pass;
|
$z_api_pass = $z_pass;
|
||||||
|
|
||||||
@ -718,7 +719,7 @@
|
|||||||
'selectTags'=>'extend',
|
'selectTags'=>'extend',
|
||||||
'expandComment'=>1,
|
'expandComment'=>1,
|
||||||
'expandDescription'=>1,
|
'expandDescription'=>1,
|
||||||
'expandExpresion'=>1),
|
'expandExpression'=>1),
|
||||||
'auth'=>$token,
|
'auth'=>$token,
|
||||||
'id'=>nextRequestID());
|
'id'=>nextRequestID());
|
||||||
|
|
||||||
@ -1030,7 +1031,7 @@
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
$otherGraphs[] = $aGraph;
|
$otherGraphs[] = $aGraph;
|
||||||
_log('~ Graph #'.$aGraphItem['graphid'].' partial match found (item #'.$GraphItem['itemid'].')');
|
_log('~ Graph #'.$aGraphItem['graphid'].' partial match found (item #'.$aGraphItem['itemid'].')');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user