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

changed agent name by alias in visual console,custom reports,view events and csv files.

This commit is contained in:
Daniel Maya 2016-09-29 13:09:50 +02:00
parent 65792e6abc
commit 54dcadfe33
7 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -87,6 +87,12 @@ echo "<div id='background_grid'
//Print the layout datas from the DB.
foreach ($layoutDatas as $layoutData) {
//change agent name by alias
if(!empty($layoutData['label'])){
$alias = db_get_value ("alias","tagente","id_agente",$layoutData['id_agent']);
$aux = explode('-',$layoutData['label']);
$layoutData['label'] = '<p>'. $alias .' -' . $aux[1];
}
$layoutData['status_calculated'] =
visual_map_get_status_element($layoutData);

7
pandora_console/include/functions_events.php
View File

@ -2015,10 +2015,13 @@ function events_page_details ($event, $server = "") {
$data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Name').'</div>';
if (can_user_access_node ()) {
$data[1] = ui_print_agent_name ($event["id_agente"], true, 'agent_medium', '', false, $serverstring, $hashstring, $agent['nombre']);
//$data[1] = ui_print_agent_name ($event["id_agente"], true, 'agent_medium', '', false, $serverstring, $hashstring, $agent['nombre']);
$alias = db_get_row ("tagente","id_agente",$event["id_agente"]);
$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . '" title='.$alias['nombre']. '>';
$data[1] .= '<b>' . $alias['alias'] . '</a></b>';
}
else {
$data[1] = ui_print_truncate_text($agent['nombre'], 'agent_medium', true, true, true);
$data[1] = ui_print_truncate_text($agent['alias'], 'agent_medium', true, true, true);
}
$table_details->data[] = $data;

4
pandora_console/include/functions_graph.php
View File

@ -2935,7 +2935,9 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
$name = mb_substr (io_safe_output($row['agent_name']), 0, 14)." (".$row["count"].")";
}
else {
$name = mb_substr (agents_get_name ($row["id_agente"], "lower"), 0, 14)." (".$row["count"].")";
$alias = db_get_value ("alias","tagente","id_agente",$row["id_agente"]);
//$name = mb_substr (agents_get_name ($row["id_agente"], "lower"), 0, 14)." (".$row["count"].")";
$name = mb_substr ($alias, 0, 14)." (".$row["count"].")";
}
$data[$name] = $row["count"];
}

6
pandora_console/include/functions_visual_map.php
View File

@ -2048,6 +2048,12 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
foreach ($layout_datas as $layout_data) {
//change agent name by alias
if(!empty($layout_data['label'])){
$alias = db_get_value ("alias","tagente","id_agente",$layout_data['id_agent']);
$aux = explode('-',$layout_data['label']);
$layout_data['label'] = '<p>'. $alias .' -' . $aux[1];
}
//Check the items are from disabled or pending delete modules
if ($layout_data['id_agente_modulo'] != 0 &&
(($layout_data['type'] != LABEL)

5
pandora_console/operation/agentes/stat_win.php
View File

@ -59,6 +59,9 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
$label = get_parameter('label');
$label = base64_decode($label);
$id = get_parameter('id');
$id_agent = db_get_value ("id_agente","tagente_modulo","id_agente_modulo",$id);
$alias = db_get_value ("alias","tagente","id_agente",$id_agent);
//$agent = agents_get_agent_with_ip ("192.168.50.31");
//$label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -74,7 +77,7 @@ $id = get_parameter('id');
}
?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Pandora FMS Graph (<?php echo modules_get_agentmodule_agent_name ($id) . ' - ' . $label; ?>)</title>
<title>Pandora FMS Graph (<?php echo $alias . ' - ' . $label; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>

4
pandora_console/operation/events/events.build_table.php
View File

@ -436,7 +436,9 @@ else {
}
}
else {
$data[$i] .= ui_print_agent_name ($event["id_agente"], true);
$alias = db_get_row ("tagente","id_agente",$event["id_agente"]);
$data[$i] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . '" title='.$alias['nombre']. '>';
$data[$i] .= '<b>' . $alias['alias'] . '</a></b>';
}
}
else {

3
pandora_console/operation/events/export_csv.php
View File

@ -105,6 +105,7 @@ echo chr (13);
$new = true;
while ($event = db_get_all_row_by_steps_sql($new, $result, $sql)) {
$new = false;
$alias = db_get_value ("alias","tagente","id_agente",$event["id_agente"]);
if ((!check_acl($config["id_user"], $event["id_grupo"], "ER") &&
!check_acl($config["id_user"], $event["id_grupo"], "EW") && !check_acl($config["id_user"], $event["id_grupo"], "EM") ) ||
(!check_acl($config["id_user"], 0, "PM") && $event["event_type"] == 'system'))
@ -112,7 +113,7 @@ while ($event = db_get_all_row_by_steps_sql($new, $result, $sql)) {
echo $event["timestamp"];
echo ",";
echo io_safe_output(agents_get_name($event["id_agente"]));
echo io_safe_output($alias);
echo ",";
echo io_safe_output(groups_get_name($event["id_grupo"]));
echo ",";