tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-12-27 Hirofumi Kosaka <kosaka@rworks.jp> 

* include/functions_api.php: Added 'plugin_macros' and
	'module_macros' to the return column of tree_agents API.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9266 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-12-27 09:44:57 +00:00
parent 71c7271707
commit 2c47ecec58
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-12-27 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added 'plugin_macros' and
'module_macros' to the return column of tree_agents API.
2013-12-27 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added 'module_macros' parameter

11
pandora_console/include/functions_api.php
View File

@ -429,6 +429,8 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
'module_last_execution_try',
'module_status_changes',
'module_last_status',
'module_plugin_macros',
'module_macros',
'alert_id_agent_module',
'alert_id_alert_template',
@ -546,7 +548,9 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
'module_max_critical' => 'max_critical as module_max_critical',
'module_str_critical' => 'str_critical as module_str_critical',
'module_min_ff_event' => 'min_ff_event as module_min_ff_event',
'module_delete_pending' => 'delete_pending as module_delete_pending');
'module_delete_pending' => 'delete_pending as module_delete_pending',
'module_plugin_macros' => 'macros as module_plugin_macros',
'module_macros' => 'module_macros as module_macros');
/* module related field mappings 2/2 (output field => column for 'tagente_estado') */
@ -696,6 +700,11 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
foreach ($modules as &$module) {
$module['type_row'] = 'module';
if( $module['module_macros'] ) {
$module['module_macros'] = base64_decode( $module['module_macros']);
}
$returnVar[] = $module;
if ( strlen($alert_additional_columns) <= 0 ) {