\n"
+#~ "\t\t\tProbablemente los valores de su BD, hostname, usuario o contraseña son "
+#~ "incorrectos o \n"
+#~ "\t\t\t la base de datos no se está ejecutando."
+
+#~ msgid ""
+#~ "For security reasons, config.php must have restrictive permissions, "
+#~ "and \"other\" users \n"
+#~ "\t\t\tshould not read it or write to it. It should be written only for owner "
+#~ "\n"
+#~ "\t\t\t(usually www-data or http daemon user), normal operation is not "
+#~ "possible until you change \n"
+#~ "\t\t\tpermissions for include/config.php file. Please do it, it is "
+#~ "for your security."
+#~ msgstr ""
+#~ "Por razones de reguridad, config.phpdebe tener permisos restrictivos, "
+#~ "y \"otros\" usuarios \n"
+#~ "\t\t\tno deberían poder leerlo o escribir sobre él. Este archivo debería ser "
+#~ "únicamente editado por el propietario \n"
+#~ "\t\t\t(usually www-data or http daemon user), las operaciones normales no se "
+#~ "podrán producer hasta que cambie \n"
+#~ "\t\t\tlos permisos del include/config.php archivo. Por favor, hágalo. "
+#~ "Es por su seguridad."
+
+#~ msgid "Auto Save"
+#~ msgstr "Auto-guardar"
+
+#~ msgid "For to view the list modules paginated, set in setup visuals."
+#~ msgstr ""
+#~ "Para ver el listado de módulos paginado, seleccionar esta opción en "
+#~ "Configuración de estilos."
+
+#~ msgid "Events info (1hr)"
+#~ msgstr "Información de Eventos (1hr.)"
+
+#~ msgid "# Failed"
+#~ msgstr "# Fallidos"
+
+#~ msgid "% Fail"
+#~ msgstr "% Fallo"
+
+#~ msgid "# Checks"
+#~ msgstr "# Chequeos"
+
+#~ msgid "Time unavailable"
+#~ msgstr "Tiempo indisponible"
+
+#~ msgid "Contact:"
+#~ msgstr "Contacto:"
+
+#~ msgid "E-mail:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Poling time"
+#~ msgstr "tiempo poling"
+
+#~ msgid "Display proc modules in binary format (OK/FAIL)"
+#~ msgstr "Visualizar los módulos proc en formato binario (OK/FALLO)"
+
+#~ msgid "This is defined in minutes"
+#~ msgstr "Esto se define en minutos"
+
+#~ msgid "The session may be expired"
+#~ msgstr "La sesión puede haber acabado"
+
+#~ msgid "None selected"
+#~ msgstr "Nada seleccionado"
+
+#~ msgid "There was an error loading the network map"
+#~ msgstr "Hubo un error cargando el mapa de red"
+
+#~ msgid "Store group"
+#~ msgstr "Grupo de almacenamiento"
+
+#~ msgid "This element should be deleted"
+#~ msgstr "Este elemento debería ser borrado"
+
+#~ msgid "Successful update the networkmap."
+#~ msgstr "Mapa de red actualizado correctamente"
+
+#~ msgid "Unsuccessful update the networkmap."
+#~ msgstr "El mapa de red no se ha podido actualizar"
+
+#~ msgid "Activate licence"
+#~ msgstr "Activar la licencia"
+
+#~ msgid "List of visual console"
+#~ msgstr "Lista de la consola visual"
+
+#~ msgid ""
+#~ "This item is affected by a malformed planned downtime. Go to the planned "
+#~ "downtimes section to solve this."
+#~ msgstr ""
+#~ "Este item se ve afectado por un tiempo de inactividad planificado con "
+#~ "formato incorrecto. Ir a la sección de los tiempos de parada planificada "
+#~ "para resolver esto."
+
+#~ msgid "Networkmap list"
+#~ msgstr "Lista de mapas de red"
+
+#~ msgid "No colections for this agent"
+#~ msgstr "El agente no tiene colecciones"
+
+#~ msgid "List of Services"
+#~ msgstr "Lista de servicios"
+
+#~ msgid "Filter by tag"
+#~ msgstr "Filtrar por tag"
+
+#~ msgid "Masive tags module policy edition"
+#~ msgstr "Edición masiva de etiquetas de módulo de política"
+
+#~ msgid "Masive modules policy tags edition"
+#~ msgstr "Edición masiva de módulos de política por etiquetas"
+
+#~ msgid "Main dashboard"
+#~ msgstr "Cuadro de mando principal"
+
+#~ msgid "Another collection with the same short name"
+#~ msgstr "Otra colección con el mismo nombre corto"
+
+#~ msgid "No colections"
+#~ msgstr "Sin colecciones"
+
+#~ msgid "List of networkmap Enterprise"
+#~ msgstr "Lista de mapas de red Enterprise"
+
+#~ msgid "Display proc modules in binary format (OK/FAIL)."
+#~ msgstr "Mostrar los módulos proc en formato binario (OK/FALLO)"
-#: ../../operation/netflow/nf_live_view.php:126
-msgid "Make sure nfdump version 1.6.8 or newer is installed!"
-msgstr ""
+#~ msgid "Generate a dinamic report"
+#~ msgstr "Generar un informe dinámico"
-#: ../../operation/netflow/nf_live_view.php:149
-msgid "Error creating filter"
-msgstr ""
+#~ msgid "Error enable/disable user. The user doesn't exists."
+#~ msgstr "Error habilitar/deshabilitar usuario. El usuario no existe."
-#: ../../operation/netflow/nf_live_view.php:152
-msgid "Filter created successfully"
-msgstr ""
+#~ msgid "Error enable/disable agent. The agent doesn't exists."
+#~ msgstr "Error habilitar/deshabilitar agente. El agente no existe."
-#: ../../operation/netflow/nf_live_view.php:167
-msgid "Filter updated successfully"
-msgstr ""
+#~ msgid ""
+#~ "There is a new update please go to menu Administration and into extensions "
+#~ "go to Update Manager for more details."
+#~ msgstr ""
+#~ "Hay una nueva actualización, por favor vaya al menú Administración y en las "
+#~ "extensiones Ir al Update Manager para más detalles."
-#: ../../operation/netflow/nf_live_view.php:168
-msgid "Error updating filter"
-msgstr ""
+#~ msgid "Show percentil 95º"
+#~ msgstr "Muestra porcentaje 95º"
-#: ../../operation/netflow/nf_live_view.php:190
-msgid "Draw live filter"
-msgstr ""
+#~ msgid "Error in creation synthetic module. Agent name doesn't exists."
+#~ msgstr "Error al crear un módulo sintético. El nombre del agente no existe."
-#: ../../operation/netflow/nf_live_view.php:222
-msgid "Connection"
-msgstr ""
+#~ msgid "Generate networkmap with parents relationships"
+#~ msgstr "Generar mapa de red con relaciones entre padres"
-#: ../../operation/netflow/nf_live_view.php:246
-msgid "The interval will be divided in chunks the length of the resolution."
-msgstr ""
+#~ msgid ""
+#~ "This feature is deprecated, be careful because in the next releases it will "
+#~ "be disappear."
+#~ msgstr ""
+#~ "Esta función está obsoleta, tenga cuidado porque en próximos parches "
+#~ "desaparecerá"
-#: ../../operation/netflow/nf_live_view.php:273
-msgid "IP address resolution"
-msgstr ""
+#~ msgid "Refresh network map state"
+#~ msgstr "Refrescar el estado del mapa de red"
-#: ../../operation/netflow/nf_live_view.php:323
-msgid "Select a filter"
-msgstr ""
+#~ msgid ""
+#~ "If you check this option, the lateral menus display with left click. "
+#~ "Otherwise it will show by placing the mouse over"
+#~ msgstr ""
+#~ "Si activas esta opción, los menús laterales se mostrarán al hacer click con "
+#~ "el botón izquierdo del ratón. En otro caso se mostrarán al pasar el ratón "
+#~ "por encima de ellos"
-#: ../../operation/netflow/nf_live_view.php:390
-msgid "Router ip"
-msgstr ""
+#~ msgid "Display lateral menus with click"
+#~ msgstr "Mostrar menús laterales al hacer click"
-#: ../../operation/netflow/nf_live_view.php:394
-msgid "Bytes per second"
-msgstr ""
+#~ msgid "New networkmap"
+#~ msgstr "Nuevo mapa de red"
-#: ../../operation/netflow/nf_live_view.php:405
-msgid "Draw"
-msgstr ""
+#~ msgid "Percentil 95"
+#~ msgstr "Porcentaje 95"
-#: ../../operation/netflow/nf_live_view.php:409
-msgid "Save as new filter"
-msgstr ""
+#~ msgid "Disable Pandora FMS on graphs"
+#~ msgstr "Desactivar Pandora FMS en gráficas"
-#: ../../operation/netflow/nf_live_view.php:410
-msgid "Update current filter"
-msgstr ""
+#~ msgid "Custom logo in login"
+#~ msgstr "Logo personalizado en la pantalla de bienvenida"
-#: ../../operation/netflow/nf_live_view.php:424
-msgid "No filter selected"
-msgstr ""
+#~ msgid "Allows only show the average in graphs"
+#~ msgstr "Permite mostrar sólo la media en las gráficas"
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index d20883b7e4..d438de4c86 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3805,4 +3805,41 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
}
.checkselected{
background-color: #eee;
+}
+.tag-wrapper{
+ padding: 0 10px 0 0;
+ overflow: auto;
+}
+
+.pandora-tag{
+ float:left;
+ margin-bottom:18px;
+ padding:1px 6px 1px 0;
+}
+
+.pandora-tag-title{
+ color: white;
+ background-color: #373737;
+ font-weight: bold;
+ padding: 6px 6px 6px 10px;
+ border: #373737;
+ border-width: 1px;
+ border-top-style: solid;
+ border-top-left-radius: 12px;
+ border-left-style: solid;
+ border-bottom-left-radius: 12px;
+ border-bottom-style: solid;
+}
+
+.pandora-tag-value{
+ color: #373737;
+ font-weight: bold;
+ padding: 6px 10px 6px 6px;
+ border: #373737;
+ border-width: 1px;
+ border-top-style: solid;
+ border-top-right-radius: 12px;
+ border-right-style: solid;
+ border-bottom-right-radius: 12px;
+ border-bottom-style: solid;
}
\ No newline at end of file
diff --git a/pandora_console/install.php b/pandora_console/install.php
index bfbe71050d..5189d2196b 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
0) {
+ $filter_resume['groups'] = $id_group;
if ($propagate) {
$childrens_ids = array($id_group);
@@ -66,18 +67,22 @@ switch ($status) {
case 0:
case 1:
case 2:
+ $filter_resume['status'] = $status;
$sql_post .= " AND estado = " . $status;
break;
case 3:
+ $filter_resume['status'] = $status;
$sql_post .= " AND (estado = 0 OR estado = 2)";
break;
}
if ($search != "") {
+ $filter_resume['free_search'] = $search;
$sql_post .= " AND (evento LIKE '%". io_safe_input($search) . "%' OR id_evento LIKE '%$search%')";
}
if ($event_type != "") {
+ $filter_resume['event_type'] = $event_type;
// If normal, warning, could be several (going_up_warning, going_down_warning... too complex
// for the user so for him is presented only "warning, critical and normal"
if ($event_type == "warning" || $event_type == "critical" || $event_type == "normal") {
@@ -93,6 +98,7 @@ if ($event_type != "") {
}
if ($severity != -1) {
+ $filter_resume['severity'] = $severity;
switch ($severity) {
case EVENT_CRIT_WARNING_OR_CRITICAL:
$sql_post .= "
@@ -115,7 +121,8 @@ if ($severity != -1) {
// In metaconsole mode the agent search is performed by name
if ($meta) {
- if ($text_agent != __('All')) {
+ if (($text_agent != __('All')) && ($text_agent !== '')) {
+ $filter_resume['agent'] = $text_agent;
$sql_post .= " AND agent_name LIKE '%$text_agent%'";
}
}
@@ -128,6 +135,7 @@ else {
$sql_post .= " AND 1 = 0";
break;
default:
+ $filter_resume['agent'] = $id_agent;
$sql_post .= " AND id_agente = " . $id_agent;
break;
}
@@ -140,6 +148,7 @@ if ($meta) {
}
else {
if (!empty($text_module)) {
+ $filter_resume['module'] = $text_module;
$sql_post .= " AND id_agentmodule IN (
SELECT id_agente_modulo
FROM tagente_modulo
@@ -148,8 +157,10 @@ else {
}
}
-if ($id_user_ack != "0")
+if ($id_user_ack != "0") {
+ $filter_resume['user_ack'] = $id_user_ack;
$sql_post .= " AND id_usuario = '" . $id_user_ack . "'";
+}
if (!isset($date_from)) {
$date_from = "";
@@ -160,6 +171,7 @@ if (!isset($date_to)) {
if (($date_from == '') && ($date_to == '')) {
if ($event_view_hr > 0) {
+ $filter_resume['hours_max'] = $event_view_hr;
$unixtime = get_system_time () - ($event_view_hr * SECONDS_1HOUR);
$sql_post .= " AND (utimestamp > " . $unixtime . ")";
}
@@ -167,18 +179,22 @@ if (($date_from == '') && ($date_to == '')) {
else {
if ($date_from != '') {
if($time_from != '') {
+ $filter_resume['time_from'] = $date_from . " " . $time_from;
$udate_from = strtotime($date_from . " " . $time_from);
$sql_post .= " AND (utimestamp >= " . $udate_from . ")";
} else {
+ $filter_resume['time_from'] = $date_from;
$udate_from = strtotime($date_from . " 00:00:00");
$sql_post .= " AND (utimestamp >= " . $udate_from . ")";
}
}
if ($date_to != '') {
if($time_to != '') {
+ $filter_resume['time_to'] = $date_to . " " . $time_to;
$udate_to = strtotime($date_to . " " . $time_to);
$sql_post .= " AND (utimestamp <= " . $udate_to . ")";
} else {
+ $filter_resume['time_to'] = $date_to;
$udate_to = strtotime($date_to . " 23:59:59");
$sql_post .= " AND (utimestamp <= " . $udate_to . ")";
}
@@ -189,6 +205,7 @@ else {
if (!empty($tag_with)) {
$sql_post .= ' AND ( ';
$first = true;
+ $filter_resume['tag_inc'] = $tag_with;
foreach ($tag_with as $id_tag) {
if ($first) $first = false;
else $sql_post .= " AND ";
@@ -205,6 +222,7 @@ if (!empty($tag_with)) {
if (!empty($tag_without)) {
$sql_post .= ' AND ( ';
$first = true;
+ $filter_resume['tag_no_inc'] = $tag_without;
foreach ($tag_without as $id_tag) {
if ($first) $first = false;
else $sql_post .= " AND ";
@@ -216,10 +234,14 @@ if (!empty($tag_without)) {
// Filter/Only alerts
if (isset($filter_only_alert)) {
- if ($filter_only_alert == 0)
+ if ($filter_only_alert == 0) {
+ $filter_resume['alerts'] = $filter_only_alert;
$sql_post .= " AND event_type NOT LIKE '%alert%'";
- else if ($filter_only_alert == 1)
+ }
+ else if ($filter_only_alert == 1) {
+ $filter_resume['alerts'] = $filter_only_alert;
$sql_post .= " AND event_type LIKE '%alert%'";
+ }
}
// Tags ACLS
@@ -247,6 +269,7 @@ if (($tags_acls_condition != ERR_WRONG_PARAMETERS) && ($tags_acls_condition != E
if ($meta) {
if ($server_id) {
+ $filter_resume['server'] = $server_id;
$sql_post .= " AND server_id = " . $server_id;
} else {
$enabled_nodes = db_get_all_rows_sql('
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index bb42903940..a41ab79e51 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -25,6 +25,7 @@ require_once ($config['homedir'] . "/include/functions_users.php"); //Users func
require_once ($config['homedir'] . "/include/functions_groups.php");
require_once ($config["homedir"] . "/include/functions_graph.php");
require_once ($config["homedir"] . "/include/functions_tags.php");
+enterprise_include_once('include/functions_events.php');
check_login ();
@@ -163,6 +164,7 @@ $sql_post = "";
$id_user = $config['id_user'];
+$filter_resume = array();
require('events.build_query.php');
// Now $sql_post have all the where condition
@@ -459,7 +461,12 @@ $table_advanced->rowclass[] = '';
$data = array();
$data[0] = __("Alert events") . $jump;
-$data[0] .= html_print_select (array('-1' => __('All'), '0' => __('Filter alert events'), '1' => __('Only alert events')), "filter_only_alert", $filter_only_alert, '', '', '', true);
+$alert_events_titles = array(
+ '-1' => __('All'),
+ '0' => __('Filter alert events'),
+ '1' => __('Only alert events')
+);
+$data[0] .= html_print_select ($alert_events_titles, "filter_only_alert", $filter_only_alert, '', '', '', true);
$data[1] = __('Block size for pagination') . $jump;
$lpagination[25] = 25;
$lpagination[50] = 50;
@@ -561,7 +568,8 @@ $types["not_normal"] = __("Not normal");
$data[1] .= html_print_select ($types, 'event_type', $event_type, '', __('All'), '', true);
$data[2] = __('Severity') . $jump;
-$data[2] .= html_print_select (get_priorities (), "severity", $severity, '', __('All'), '-1', true, false, false);
+$severities = get_priorities ();
+$data[2] .= html_print_select ($severities, "severity", $severity, '', __('All'), '-1', true, false, false);
$table->data[] = $data;
$table->rowclass[] = '';
@@ -605,19 +613,6 @@ $data[0] .= '
' .
html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . ' ';
$data[0] .= '
' .
html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . ' ';
-
-
-if (empty($id_name)) {
- $data[0] .= '
[' .
- __('No filter loaded') .
- ']
';
-}
-else {
- $data[0] .= '
[' .
- __('Filter loaded') . ': ' . $id_name .
- ']
';
-}
-
$data[0] .= '
';
@@ -641,7 +636,7 @@ $events_filter .= ""; //This is the filter div
if (is_metaconsole())
ui_toggle($events_filter, __("Show Options"));
else
- ui_toggle($events_filter, __('Event control filter'), '', !$open_filter);
+ ui_toggle($events_filter, __('Event control filter'));
// Error div for ajax messages
echo "";
@@ -696,6 +691,7 @@ if ($group_rep == 0) {
$result = db_get_all_rows_sql ($sql);
}
elseif ($group_rep == 1) {
+ $filter_resume['duplicate'] = $group_rep;
$result = events_get_events_grouped(
$sql_post,
$offset,
@@ -707,6 +703,7 @@ elseif ($group_rep == 1) {
'DESC');
}
elseif ($group_rep == 2) {
+ $filter_resume['duplicate'] = $group_rep;
$result = events_get_events_grouped_by_agent(
$sql_post,
$offset,
@@ -715,6 +712,23 @@ elseif ($group_rep == 2) {
$history);
}
+$filter_resume['title'] = empty($id_name)
+ ? __('No filter loaded')
+ : __('Filter loaded') . ': ' . $id_name;
+// Active filter tag view call (only enterprise version)
+// It is required to pass some references to enterprise function
+// to translate the active filters
+enterprise_hook('print_event_tags_active_filters',
+ array( $filter_resume, array(
+ 'status' => $fields,
+ 'event_type' => $types,
+ 'severity' => $severities,
+ 'duplicate' => $repeated_sel,
+ 'alerts' => $alert_events_titles,
+ 'groups' => users_get_groups_for_select($config["id_user"], $access, true, true, false))
+ )
+);
+
if (!empty($result)) {
if ($group_rep == 0) {
$sql = "SELECT COUNT(id_evento)
diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php
index bfaf8b3dcd..deed8688a4 100644
--- a/pandora_console/operation/gis_maps/ajax.php
+++ b/pandora_console/operation/gis_maps/ajax.php
@@ -117,7 +117,7 @@ switch ($opt) {
switch ($config["dbtype"]) {
case "mysql":
if (empty($idAgentsWithGIS)) {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
IFNULL(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
IFNULL(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -125,7 +125,7 @@ switch ($opt) {
WHERE 1 = 0');
}
else {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
IFNULL(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
IFNULL(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -135,7 +135,7 @@ switch ($opt) {
break;
case "postgresql":
if (empty($idAgentsWithGIS)) {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
COALESCE(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
COALESCE(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -143,7 +143,7 @@ switch ($opt) {
WHERE 1 = 0');
}
else {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
COALESCE(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
COALESCE(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -153,7 +153,7 @@ switch ($opt) {
break;
case "oracle":
if (empty($idAgentsWithGIS)) {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
COALESCE(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
COALESCE(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -161,7 +161,7 @@ switch ($opt) {
WHERE 1 = 0');
}
else {
- $agentsGISStatus = db_get_all_rows_sql('SELECT t1.nombre, id_parent, t1.id_agente AS tagente_id_agente,
+ $agentsGISStatus = db_get_all_rows_sql('SELECT t1.alias, id_parent, t1.id_agente AS tagente_id_agente,
COALESCE(t2.stored_longitude, ' . $defaultCoords['default_longitude'] . ') AS stored_longitude,
COALESCE(t2.stored_latitude, ' . $defaultCoords['default_latitude'] . ') AS stored_latitude
FROM tagente t1
@@ -180,7 +180,7 @@ switch ($opt) {
$status = agents_get_status($row['tagente_id_agente']);
if (!$config['gis_label'])
- $row['nombre'] = '';
+ $row['alias'] = '';
$icon = gis_get_agent_icon_map($row['tagente_id_agente'], true, $status);
if ($icon[0] !== '/') {
@@ -196,7 +196,7 @@ switch ($opt) {
'icon_path' => $config["homeurl"] . '/' . $icon,
'icon_width' => $icon_width,
'icon_height' => $icon_height,
- 'name' => $row['nombre'],
+ 'name' => io_safe_output($row['alias']),
'status' => $status,
'stored_longitude' => $row['stored_longitude'],
'stored_latitude' => $row['stored_latitude'],
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 5d3996dd53..dfd3cb8e03 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -183,10 +183,10 @@ if ($layers != false) {
$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer);
- foreach ($agentNames as $agentName) {
- $idAgent = agents_get_agent_id($agentName);
+ foreach ($agentNames as $key => $agentName) {
+ $idAgent = $key;
$coords = gis_get_data_last_position_agent($idAgent);
-
+
if ($coords === false) {
$coords['stored_latitude'] = $map['default_latitude'];
$coords['stored_longitude'] = $map['default_longitude'];
@@ -198,7 +198,6 @@ if ($layers != false) {
}
}
-
$icon = gis_get_agent_icon_map($idAgent, true);
$icon_size = getimagesize($icon);
$icon_width = $icon_size[0];
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index ed3b0128fc..03f40ef69e 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0dev
-%define release 170228
+%define release 170301
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index d524f49f14..756d34d2dc 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0dev
-%define release 170228
+%define release 170301
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql
index b860f797aa..32c2fdc77d 100644
--- a/pandora_console/pandoradb.data.oracle.sql
+++ b/pandora_console/pandoradb.data.oracle.sql
@@ -66,7 +66,7 @@ INSERT INTO tconfig (token, value) VALUES ('graph_res','5');
INSERT INTO tconfig (token, value) VALUES ('step_compact','1');
INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc');
INSERT INTO tconfig (token, value) VALUES('db_scheme_version','7.0dev');
-INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD170228');
+INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD170301');
INSERT INTO tconfig (token, value) VALUES ('show_unknown','0');
INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
INSERT INTO tconfig (token, value) VALUES ('style','pandora');
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a0c78e26f8..762e504e83 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0dev-170228
+Version: 7.0dev-170301
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 88b7f2a9ac..9170120e5e 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="7.0dev-170228"
+pandora_version="7.0dev-170301"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a201618e6b..94cdfc36cf 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0dev";
-my $pandora_build = "170228";
+my $pandora_build = "170301";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index ea785496e7..dc788306dd 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2896,6 +2896,7 @@ sub pandora_create_agent ($$$$$$$$$$;$$$$$$$$$) {
}
$agent_mode = 1 unless defined($agent_mode);
+ $alias = $agent_name unless defined($alias);
$description = "Created by $server_name" unless ($description ne '');
my ($columns, $values) = db_insert_get_values ({ 'nombre' => safe_input($agent_name),
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 00f518aab8..8b53a88eac 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0dev
-%define release 170228
+%define release 170301
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f0801be958..9e9a5139de 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0dev
-%define release 170228
+%define release 170301
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a724d2a9db..cce86a2bc4 100644
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0dev"
-PI_BUILD="170228"
+PI_BUILD="170301"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f4b2ea5c48..ea171bedd6 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0dev PS170228";
+my $version = "7.0dev PS170301";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index da70c008b5..f72fb5e357 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0dev PS170228";
+my $version = "7.0dev PS170301";
# save program name for logging
my $progname = basename($0);