Bernhard.Linz/mailGraph
1
0
Fork 0
mirror of https://github.com/moudsen/mailGraph synced 2025-04-19 19:44:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2.22 - Fixed #60 incorrect JSON request while reading latest problems

Browse Source
This commit is contained in:
Mark Oudsen 2025-03-19 11:09:16 +01:00
parent 36fd2b1d23
commit e40342cd94
1 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mailGraph.php
View File

@ -46,6 +46,7 @@
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
// 2.20 Tested in Zabbix 7.0.7 LTS and Zabbix 7.2.2 // 2.20 Tested in Zabbix 7.0.7 LTS and Zabbix 7.2.2
// 2.21 2025/02/20 - Mark Oudsen - Added #57 enhancement for manipulation of data value truncing // 2.21 2025/02/20 - Mark Oudsen - Added #57 enhancement for manipulation of data value truncing
// 2.22 2025/03/19 - Mark Oudsen - Fixed #60 incorrect JSON request (boolean as text instead of bool)
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
// //
// (C) M.J.Oudsen, mark.oudsen@puzzl.nl // (C) M.J.Oudsen, mark.oudsen@puzzl.nl
@ -110,7 +111,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////
// CONSTANTS // CONSTANTS
$cVersion = 'v2.21'; $cVersion = 'v2.22';
$cCRLF = chr(10).chr(13); $cCRLF = chr(10).chr(13);
$maskDateTime = 'Y-m-d H:i:s'; $maskDateTime = 'Y-m-d H:i:s';
$maxGraphs = 8; $maxGraphs = 8;
@ -418,52 +419,27 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////
// Check the array for information we do not want to share in any logging // Check the array if it contains information that should not be logged
function maskOutputFields($info) function maskKey(&$theValue, $theKey)
{ {
foreach($info as $aKey=>$aValue) switch($theKey)
{
switch($aKey)
{ {
case 'zabbix_user': case 'zabbix_user':
case 'zabbix_user_pwd': case 'zabbix_user_pwd':
case 'zabbix_api_user': case 'zabbix_api_user':
case 'zabbix_api_pwd': case 'zabbix_api_pwd':
case 'zabbix_api_token': case 'zabbix_api_token':
$info[$aKey] = '<masked>'; case 'username':
case 'password':
$theValue = '<masked>';
break; break;
} }
} }
return($info);
}
// Check the array if it contains information that should not be logged
function maskOutputContent($info) function maskOutputContent($info)
{ {
global $config; array_walk_recursive($info,'maskKey');
foreach($info as $infoKey=>$infoValue)
{
if (is_array($infoValue)) { $info[$infoKey] = maskOutputContent($infoValue); }
foreach($config as $aKey=>$aValue)
{
switch($aKey)
{
case 'zabbix_user':
case 'zabbix_user_pwd':
case 'zabbix_api_user':
case 'zabbix_api_pwd':
case 'zabbix_api_token':
if ($aValue==$infoValue) { $info[$infoKey] = '<masked>'; };
break;
}
}
}
return($info); return($info);
} }
@ -555,7 +531,7 @@
$config = readConfig(getcwd().'/config/config.json'); $config = readConfig(getcwd().'/config/config.json');
_log('# Configuration taken from config.json'.$cCRLF. _log('# Configuration taken from config.json'.$cCRLF.
json_encode(maskOutputFields($config),JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK)); json_encode(maskOutputContent($config),JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
// --- MAIL DATA --- // --- MAIL DATA ---
@ -871,7 +847,7 @@
$request = array('jsonrpc'=>'2.0', $request = array('jsonrpc'=>'2.0',
'method'=>'problem.get', 'method'=>'problem.get',
'params'=>array('output'=>'extend', 'params'=>array('output'=>'extend',
'recent'=>'true', 'recent'=>TRUE,
'limit'=>1), 'limit'=>1),
'auth'=>$token, 'auth'=>$token,
'id'=>nextRequestID()); 'id'=>nextRequestID());
@ -890,7 +866,7 @@
$request = array('jsonrpc'=>'2.0', $request = array('jsonrpc'=>'2.0',
'method'=>'problem.get', 'method'=>'problem.get',
'params'=>array('output'=>'extend', 'params'=>array('output'=>'extend',
'recent'=>'false', 'recent'=>FALSE,
'limit'=>1), 'limit'=>1),
'auth'=>$token, 'auth'=>$token,
'id'=>nextRequestID()); 'id'=>nextRequestID());