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

2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/agentes/ver_agente.php
	 pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
	 creation when metaconsole is activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-06-06 16:22:37 +00:00
parent 0e33d1f857
commit 5afc1612a4
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php
pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
creation when metaconsole is activated.
Merged from branches.
2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php: Fixed bug:

2
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -180,6 +180,8 @@ $(document).ready (function () {
inputs.push ('filter=delete_pending = 0 AND id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_estado WHERE utimestamp = 0)');
inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente");
/* This will force to get local modules although metaconsole is active */
inputs.push ("force_local_modules=1");
jQuery.ajax ({
data: inputs.join ("&"),
type: 'GET',

4
pandora_console/operation/agentes/ver_agente.php
View File

@ -259,6 +259,8 @@ if (is_ajax ()) {
$indexed = (bool) get_parameter ('indexed', true);
$agentName = (string) get_parameter ('agent_name', null);
$server_name = (string) get_parameter ('server_name', null);
/* This will force to get local modules although metaconsole is active, by default get all modules from all nodes */
$force_local_modules = (int) get_parameter ('force_local_modules', 0);
if ($agentName != null) {
$search = array();
@ -267,7 +269,7 @@ if (is_ajax ()) {
else
$search = false;
if ($config ['metaconsole'] == 1) {
if ($config ['metaconsole'] == 1 and !$force_local_modules) {
if (enterprise_include_once ('include/functions_metaconsole.php') !== ENTERPRISE_NOT_HOOK) {
$connection = metaconsole_get_connection($server_name);
if (metaconsole_load_external_db($connection) == NOERR) {