Added specs from MPulido

This commit is contained in:
Arturo Gonzalez 2017-09-05 11:46:44 +02:00
parent b4dc6f4fb0
commit 4d469426a5
2 changed files with 55 additions and 11 deletions

View File

@ -204,6 +204,7 @@ if ($create_modules) {
$ifPhysAddress = $interfaces[$id]['ifPhysAddress']['value']; $ifPhysAddress = $interfaces[$id]['ifPhysAddress']['value'];
$ifPhysAddress = strtoupper($ifPhysAddress); $ifPhysAddress = strtoupper($ifPhysAddress);
} }
foreach ($modules as $module) { foreach ($modules as $module) {
$oid_array = explode('.', $module); $oid_array = explode('.', $module);
$oid_array[count($oid_array) - 1] = $id; $oid_array[count($oid_array) - 1] = $id;
@ -262,29 +263,63 @@ if ($create_modules) {
$row = db_get_row_sql ($sql); $row = db_get_row_sql ($sql);
if ($row['server_type'] == 13) { if ($row['server_type'] == 13) {
if (preg_match ("/Status/", $name_array[1])) { if (preg_match ("/ifPhysAddress/", $name_array[1])) {
$module_type = 3;
}
elseif (preg_match ("/ifSpecific/", $name_array[1])) {
$module_type = 3;
}
elseif (preg_match("/ifType/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifSpeed/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifPromiscuousMode/", $name_array[1])) {
$module_type = 2; $module_type = 2;
} }
elseif (preg_match ("/Present/", $name_array[1])) { elseif (preg_match("/ifOutQLen/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifName/", $name_array[1])) {
$module_type = 3;
}
elseif (preg_match("/ifMtu/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifLinkUpDownTrapEnable/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifLastChange/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifIndex/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifDescr/", $name_array[1])) {
$module_type = 3;
}
elseif (preg_match("/ifCounterDiscontinuityTime/", $name_array[1])) {
$module_type = 1;
}
elseif (preg_match("/ifConnectorPresent/", $name_array[1])) {
$module_type = 2; $module_type = 2;
} }
elseif (preg_match("/PromiscuousMode/", $name_array[1])) { elseif (preg_match("/ifAdminStatus/", $name_array[1])) {
$module_type = 2; $module_type = 2;
} }
// Specific counters (ends in s)
elseif (preg_match("/s$/", $name_array[1])) {
$module_type = 4;
}
else { else {
$module_type = 4; $module_type = 4;
} }
$module_server = 1; $module_server = 1;
$output_oid = "";
exec("ssh pandora_exec_proxy@" . $row['ip_address'] . " snmptranslate -On " . $oid, $output_oid, $rc); exec("ssh pandora_exec_proxy@" . $row['ip_address'] . " snmptranslate -On " . $oid, $output_oid, $rc);
$conf_iod = $output_oid[0]; $conf_oid = $output_oid[0];
$oid = $conf_iod; $oid = $conf_oid;
} }
} }
@ -322,7 +357,7 @@ if ($create_modules) {
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'])); $module_type_name = db_get_value_filter("nombre", "ttipo_modulo", array("id_tipo" => $values['id_tipo_modulo']));
$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"; $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_oid . "\nmodule_community " . $values['snmp_community'] . "\nmodule_end";
config_agents_add_module_in_conf($id_agent, $new_module_configuration_data); config_agents_add_module_in_conf($id_agent, $new_module_configuration_data);
} }

View File

@ -196,6 +196,15 @@ if ($create_modules) {
'plugin_pass' => $plugin_pass, 'plugin_pass' => $plugin_pass,
'id_modulo' => MODULE_WMI); 'id_modulo' => MODULE_WMI);
if ($server_to_exec != 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) {
$values['id_modulo'] = 1;
}
}
// Create Service modules // Create Service modules
$services_values = $values; $services_values = $values;