diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
index 1eebe0c075..0577f8e838 100644
--- a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
@@ -718,7 +718,14 @@ if (enterprise_installed()) {
$rows = get_proxy_servers(true);
foreach ($rows as $row) {
- $servers_to_exec[$row['id_server']] = $row['name'];
+ if ($row['server_type'] != 13) {
+ $s_type = " (Standard)";
+ }
+ else {
+ $s_type = " (Satellite)";
+ }
+
+ $servers_to_exec[$row['id_server']] = $row['name'] . $s_type;
}
}
$table->data[1][2] = '' . __('Server to execute command') . '';
diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
index 13dfd94ad2..ed3334e5dd 100644
--- a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
@@ -171,6 +171,7 @@ if ($create_modules) {
}
}
}
+
$modules = get_parameter('module', array());
$id_snmp = get_parameter('id_snmp');
@@ -207,7 +208,7 @@ if ($create_modules) {
$oid_array = explode('.', $module);
$oid_array[count($oid_array) - 1] = $id;
$oid = implode('.', $oid_array);
-
+
// Get the name
$name_array = explode('::', $oid_array[0]);
$name = $ifname . "_" . $name_array[1];
@@ -253,12 +254,14 @@ if ($create_modules) {
if (preg_match("/Octets/", $name_array[1])) {
$values['unit'] = "Bytes";
}
+
+ $module_server = 2;
if ($server_to_exec != 0) {
- $sql = sprintf("SELECT server_type FROM tserver WHERE id_server = %d", $server_to_exec);
+ $sql = sprintf("SELECT server_type, ip_address FROM tserver WHERE id_server = %d", $server_to_exec);
$row = db_get_row_sql ($sql);
- if ($row['server_type'] = 13) {
+ if ($row['server_type'] == 13) {
if (preg_match ("/Status/", $name_array[1])) {
$module_type = 2;
}
@@ -275,6 +278,13 @@ if ($create_modules) {
else {
$module_type = 4;
}
+
+ $module_server = 1;
+
+ exec("ssh pandora_exec_proxy@" . $row['ip_address'] . " snmptranslate -On " . $oid, $output_oid, $rc);
+
+ $conf_iod = $output_oid[0];
+ $oid = $conf_iod;
}
}
@@ -294,7 +304,7 @@ if ($create_modules) {
}
$values['snmp_oid'] = $oid;
- $values['id_modulo'] = 2;
+ $values['id_modulo'] = $module_server;
$result = modules_create_agent_module ($id_agent, io_safe_input($name), $values);
@@ -309,18 +319,10 @@ if ($create_modules) {
$sql = sprintf("SELECT server_type FROM tserver WHERE id_server = %d", $server_to_exec);
$row = db_get_row_sql ($sql);
- if ($row['server_type'] = 13) {
+ if ($row['server_type'] == 13) {
$module_type_name = db_get_value_filter("nombre", "ttipo_modulo", array("id_tipo" => $values['id_tipo_modulo']));
- $new_module_configuration_data = "
- module_begin
- module_name " . io_safe_input($name) . "
- module_description " . $values['descripcion'] . "
- module_type " . $module_type_name . "
- module_snmp
- module_oid " . $values['snmp_oid'] . "
- module_community " . $values['snmp_community'] . "
- module_end";
+ $new_module_configuration_data = "module_begin\nmodule_name " . io_safe_input($name) . "\nmodule_description " . $values['descripcion'] . "\nmodule_type " . $module_type_name . "\nmodule_snmp\nmodule_oid " . $conf_iod . "\nmodule_community " . $values['snmp_community'] . "\nmodule_end";
config_agents_add_module_in_conf($id_agent, $new_module_configuration_data);
}
@@ -400,7 +402,14 @@ if (enterprise_installed()) {
$rows = get_proxy_servers();
foreach ($rows as $row) {
- $servers_to_exec[$row['id_server']] = $row['name'];
+ if ($row['server_type'] != 13) {
+ $s_type = " (Standard)";
+ }
+ else {
+ $s_type = " (Satellite)";
+ }
+
+ $servers_to_exec[$row['id_server']] = $row['name'] . $s_type;
}
}
$table->data[1][2] = '' . __('Server to execute command') . '';
diff --git a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
index 135709c17b..4fdfa9e071 100644
--- a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
@@ -308,7 +308,14 @@ if (enterprise_installed()) {
$rows = get_proxy_servers();
foreach ($rows as $row) {
- $servers_to_exec[$row['id_server']] = $row['name'];
+ if ($row['server_type'] != 13) {
+ $s_type = " (Standard)";
+ }
+ else {
+ $s_type = " (Satellite)";
+ }
+
+ $servers_to_exec[$row['id_server']] = $row['name'] . $s_type;
}
}
$table->data[2][0] = '' . __('Server to execute command') . '';
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 124338d7ee..504377baf4 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -130,7 +130,14 @@ if (enterprise_installed()) {
$rows = get_proxy_servers();
foreach ($rows as $row) {
- $servers_to_exec[$row['id_server']] = $row['name'];
+ if ($row['server_type'] != 13) {
+ $s_type = " (Standard)";
+ }
+ else {
+ $s_type = " (Satellite)";
+ }
+
+ $servers_to_exec[$row['id_server']] = $row['name'] . $s_type;
}
}
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 417cd135fa..b98d66789b 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -239,7 +239,7 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
exec ($snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
}
}
-html_debug($output, true);
+
foreach ($output as $line) {
// Separate the OID from the value
@@ -571,9 +571,16 @@ function snmp_browser_print_container ($return = false, $width = '100%', $height
enterprise_include_once ('include/functions_satellite.php');
$rows = get_proxy_servers();
- foreach ($rows as $row) {
- $servers_to_exec[$row['id_server']] = $row['name'];
+ foreach ($rows as $row) {
+ if ($row['server_type'] != 13) {
+ $s_type = " (Standard)";
}
+ else {
+ $s_type = " (Satellite)";
+ }
+
+ $servers_to_exec[$row['id_server']] = $row['name'] . $s_type;
+ }
}
$table->data[0][4] = '' . __('Server to execute') . ' ';
$table->data[0][4] .= html_print_select($servers_to_exec, 'server_to_exec', '', '', '', '', true);
diff --git a/pandora_console/include/functions_wmi.php b/pandora_console/include/functions_wmi.php
index 685c81b17d..b694bf03cb 100644
--- a/pandora_console/include/functions_wmi.php
+++ b/pandora_console/include/functions_wmi.php
@@ -89,21 +89,8 @@ function wmi_create_wizard_modules($id_agent, $names, $wizard_mode, $values, $id
$sql = sprintf("SELECT server_type FROM tserver WHERE id_server = %d", $server_to_exec);
$row = db_get_row_sql ($sql);
- if ($row['server_type'] = 13) {
- $new_module_configuration_data = "
- module_begin
- module_name " . $name . "
- module_description
- module_type generic_proc
- module_snmp
- module_oid " . $values['snmp_oid'] . "
- module_community " . $values['snmp_community'] . "
- ip_target " . $nc['ip_target'] ."
- tcp_send " . $nc['tcp_send'] ."
- plugin_user " . $nc['plugin_user'] ."
- plugin_pass " . $nc['plugin_pass'] ."
- tcp_port " . $nc['tcp_port'] . "
- module_end";
+ if ($row['server_type'] == 13) {
+ $new_module_configuration_data = "module_begin\nmodule_name " . $name . "\nmodule_type generic_data_string\nmodule_wmi " . $values['ip_target'] . "\nmodule_wmiquery " . $wmi_query . "\nmodule_wmiauth " . $values['plugin_user'] . "%" . $values['plugin_pass'] . "\nmodule_end";
config_agents_add_module_in_conf($id_agent, $new_module_configuration_data);
}
@@ -186,19 +173,8 @@ function wmi_create_module_from_components($components, $values, $id_police=0, $
$sql = sprintf("SELECT server_type FROM tserver WHERE id_server = %d", $server_to_exec);
$row = db_get_row_sql ($sql);
- if ($row['server_type'] = 13) {
- $new_module_configuration_data = "
- module_begin
- module_name " . $nc["nombre"] . "
- module_description " . $nc['descripcion'] . "
- module_type generic_data
- ip_target " . $nc['ip_target'] ."
- tcp_send " . $nc['tcp_send'] ."
- plugin_user " . $nc['plugin_user'] ."
- plugin_pass " . $nc['plugin_pass'] ."
- unit Bytes
- tcp_port 1
- module_end";
+ if ($row['server_type'] == 13) {
+ $new_module_configuration_data = "module_begin\nmodule_name " . $nc['nombre'] . "\nmodule_type generic_data_string\nmodule_wmi " . $values['ip_target'] . "\nmodule_wmiquery " . $nc['snmp_oid'] . "\nmodule_wmiauth " . $values['plugin_user'] . "%" . $values['plugin_pass'] . "\nmodule_end";
config_agents_add_module_in_conf($nc["id_agente"], $new_module_configuration_data);
}