tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-02-06 Vanessa Gil <vanessa.gil@artica.es>

Browse Source 
* pandoradb_data.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql: Added fields to display the event view.

	* godmode/menu.php
	  include/functions_config.php
	  operation/events/events_list.php: Configure the fields to be
	displayed in the event view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5490 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-06 10:51:05 +00:00
parent 2b173bedc5
commit 2f450f9add
7 changed files with 418 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql,
pandoradb.data.postgreSQL.sql,
pandoradb.data.oracle.sql: Added fields to display the event view.
* godmode/menu.php
include/functions_config.php
operation/events/events_list.php: Configure the fields to be
displayed in the event view.
* godmode/events/custom_events.php: Added file.
2012-02-06 Hirofumi Kosaka <kosaka@rworks.jp> 2012-02-06 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Merged from 4.0. Add a missing * include/functions_api.php: Merged from 4.0. Add a missing

2
pandora_console/godmode/menu.php
View File

@ -224,6 +224,8 @@ if (check_acl ($config['id_user'], 0, "PM")) {
enterprise_hook ('skins_submenu'); enterprise_hook ('skins_submenu');
$sub["extras/pandora_diag"]["text"] = __('Diagnostic info'); $sub["extras/pandora_diag"]["text"] = __('Diagnostic info');
$sub["godmode/events/custom_events"]["text"] = __('Custom events');
$menu["gsetup"]["sub"] = $sub; $menu["gsetup"]["sub"] = $sub;
} }

16
pandora_console/include/functions_config.php
View File

@ -250,6 +250,22 @@ function config_update_config () {
config_update_value ('refr', get_parameter('refr', $config['refr'])); config_update_value ('refr', get_parameter('refr', $config['refr']));
config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr'])); config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr']));
config_update_value ('show_id_evento', get_parameter('show_id_evento', $config['show_id_evento']));
config_update_value ('show_evento', get_parameter('show_evento', $config['show_evento']));
config_update_value ('show_id_agente', get_parameter('show_id_agente', $config['show_id_agente']));
config_update_value ('show_id_usuario', get_parameter('show_id_usuario', $config['show_id_usuario']));
config_update_value ('show_id_grupo', get_parameter('show_id_grupo', $config['show_id_grupo']));
config_update_value ('show_estado', get_parameter('show_estado', $config['show_estado']));
config_update_value ('show_timestamp', get_parameter('show_timestamp', $config['show_timestamp']));
config_update_value ('show_event_type', get_parameter('show_event_type', $config['show_event_type']));
config_update_value ('show_id_agentmodule', get_parameter('show_id_agentmodule', $config['show_id_agentmodule']));
config_update_value ('show_id_alert_am', get_parameter('show_id_alert_am', $config['show_id_alert_am']));
config_update_value ('show_criticity', get_parameter('show_criticity', $config['show_criticity']));
config_update_value ('show_user_comment', get_parameter('show_user_comment', $config['show_user_comment']));
config_update_value ('show_tags', get_parameter('show_tags', $config['show_tags']));
config_update_value ('show_source', get_parameter('show_source', $config['show_source']));
config_update_value ('show_id_extra', get_parameter('show_id_extra', $config['show_id_extra']));
enterprise_include_once('include/functions_policies.php'); enterprise_include_once('include/functions_policies.php');
$enterprise = enterprise_include_once ('include/functions_skins.php'); $enterprise = enterprise_include_once ('include/functions_skins.php');
if ($enterprise !== ENTERPRISE_NOT_HOOK) { if ($enterprise !== ENTERPRISE_NOT_HOOK) {

259
pandora_console/operation/events/events_list.php
View File

@ -386,32 +386,118 @@ $table->class = "databox";
$table->head = array (); $table->head = array ();
$table->data = array (); $table->data = array ();
$table->head[0] = __('Status'); //fields that the user has selected to show
$table->align[0] = 'center'; //headers
$i = 0;
$show_fields = array();
if ($config['show_estado']) {
$show_fields[$i] = 'estado';
$table->head[$i] = __('Status');
$table->align[$i] = 'center';
$table->head[1] = __('Event name'); $i++;
}
$table->head[2] = __('Agent name'); if ($config['show_id_evento']) {
$table->align[2] = 'center'; $show_fields[$i] = 'id_evento';
$table->head[$i] = __('Event ID');
$table->head[3] = __('Timestamp'); $table->align[$i] = 'center';
$table->align[3] = 'center'; $i++;
}
$table->head[4] = __('Action'); if ($config['show_evento']) {
$table->align[4] = 'center'; $show_fields[$i] = 'evento';
$table->size[4] = '80px'; $table->head[$i] = __('Event Name');
$table->align[$i] = 'center';
$table->head[5] = html_print_checkbox ("allbox", "1", false, true); $i++;
$table->align[5] = 'center'; }
if ($config['show_id_agente']) {
$show_fields[$i] = 'id_agente';
$table->head[$i] = __('Agent name');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_timestamp']) {
$show_fields[$i] = 'timestamp';
$table->head[$i] = __('Timestamp');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_id_usuario']) {
$show_fields[$i] = 'id_usuario';
$table->head[$i] = __('User');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_id_grupo']) {
$show_fields[$i] = 'id_grupo';
$table->head[$i] = __('Group');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_event_type']) {
$show_fields[$i] = 'event_type';
$table->head[$i] = __('Event type');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_id_agentmodule']) {
$show_fields[$i] = 'id_agentmodule';
$table->head[$i] = __('Agent Module');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_id_alert_am']) {
$show_fields[$i] = 'id_alert_am';
$table->head[$i] = __('Alert');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_criticity']) {
$show_fields[$i] = 'criticity';
$table->head[$i] = __('Criticity');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_user_comment']) {
$show_fields[$i] = 'user_comment';
$table->head[$i] = __('Comment');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_tags']) {
$show_fields[$i] = 'tags';
$table->head[$i] = __('Tags');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_source']) {
$show_fields[$i] = 'source';
$table->head[$i] = __('Source');
$table->align[$i] = 'center';
$i++;
}
if ($config['show_id_extra']) {
$show_fields[$i] = 'id_extra';
$table->head[$i] = __('Extra ID');
$table->align[$i] = 'center';
$i++;
}
if ($i != 0) {
$table->head[$i] = __('Action');
$table->align[$i] = 'center';
$table->size[$i] = '80px';
$i++;
$table->head[$i] = html_print_checkbox ("allbox", "1", false, true);
$table->align[$i] = 'center';
}
$idx = 0; $idx = 0;
//Arrange data. We already did ACL's in the query //Arrange data. We already did ACL's in the query
foreach ($result as $event) { foreach ($result as $event) {
$data = array (); $data = array ();
//First pass along the class of this row //First pass along the class of this row
$table->rowclass[] = get_priority_class ($event["criticity"]); $table->rowclass[] = get_priority_class ($event["criticity"]);
//print status
// Grouped events // Grouped events
if ($group_rep != 0) { if ($group_rep != 0) {
if ($event["max_estado"] == 2) { if ($event["max_estado"] == 2) {
@ -426,7 +512,6 @@ foreach ($result as $event) {
else { else {
$estado = $event["estado"]; $estado = $event["estado"];
} }
// Colored box // Colored box
switch($estado) { switch($estado) {
case 0: case 0:
@ -443,12 +528,21 @@ foreach ($result as $event) {
break; break;
} }
$data[0] = html_print_image ($img_st, true, $i = 0;
if (in_array('estado',$show_fields)) {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status", array ("class" => "image_status",
"width" => 16, "width" => 16,
"height" => 16, "height" => 16,
"title" => $title_st, "title" => $title_st,
"id" => 'status_img_'.$event["id_evento"])); "id" => 'status_img_'.$event["id_evento"]));
$i++;
}
if (in_array('id_evento',$show_fields)) {
$data[$i] = $event["id_evento"];
$i++;
}
switch ($event["criticity"]) { switch ($event["criticity"]) {
default: default:
@ -469,67 +563,133 @@ foreach ($result as $event) {
break; break;
} }
if (in_array('evento', $show_fields)) {
// Event description // Event description
$data[1] = '<span title="'.$event["evento"].'" class="f9">'; $data[$i] = '<span title="'.$event["evento"].'" class="f9">';
$data[1] .= '<a href="'.$url.'&amp;group_rep=0&amp;offset=0&amp;pure='.$config["pure"].'&amp;search='.rawurlencode(io_safe_input($event["evento"])).'">'; $data[$i] .= '<a href="'.$url.'&amp;group_rep=0&amp;offset=0&amp;pure='.$config["pure"].'&amp;search='.rawurlencode(io_safe_input($event["evento"])).'">';
$data[1] .= '<span style="font-size: 7.5pt; color: #000000">' . io_safe_output($event["evento"]) . '</span>'; $data[$i] .= '<span style="font-size: 7.5pt; color: #000000">' . io_safe_output($event["evento"]) . '</span>';
$data[1] .= '</a></span>'; $data[$i] .= '</a></span>';
$i++;
$data[2] = '<span style="color: #000000">'; }
if (in_array('id_agente', $show_fields)) {
$data[$i] = '<span style="color: #000000">';
if ($event["event_type"] == "system") { if ($event["event_type"] == "system") {
$data[2] .= __('System'); $data[$i] .= __('System');
} }
elseif ($event["id_agente"] > 0) { elseif ($event["id_agente"] > 0) {
// Agent name // Agent name
$data[2] .= ui_print_agent_name ($event["id_agente"], true); $data[$i] .= ui_print_agent_name ($event["id_agente"], true);
} }
else { else {
$data[2] .= ''; $data[$i] .= '';
}
$data[$i] .= '</span>';
$i++;
} }
$data[2] .= '</span>';
if (in_array('timestamp', $show_fields)) {
//Time //Time
$data[3] = '<span style="color: #000000">'; $data[$i] = '<span style="color: #000000">';
if ($group_rep == 1) { if ($group_rep == 1) {
$data[3] .= ui_print_timestamp ($event['timestamp_rep'], true); $data[$i] .= ui_print_timestamp ($event['timestamp_rep'], true);
} }
else { else {
$data[3] .= ui_print_timestamp ($event["timestamp"], true); $data[$i] .= ui_print_timestamp ($event["timestamp"], true);
}
$data[$i] .= '</span>';
$i++;
} }
$data[3] .= '</span>';
if (in_array('id_usuario',$show_fields)) {
$id_user = $event["id_usuario"];
$user_name = db_get_value('fullname', 'tusuario', 'id_user', $id_user);
$data[$i] = $user_name;
$i++;
}
if (in_array('id_grupo',$show_fields)) {
$id_group = $event["id_grupo"];
$group_name = db_get_value('nombre', 'tgrupo', 'id_grupo', $id_group);
$data[$i] = $group_name;
$i++;
}
if (in_array('event_type',$show_fields)) {
$data[$i] = $event["event_type"];
$i++;
}
if (in_array('id_agentmodule',$show_fields)) {
$data[$i] = $event["id_agentmodule"];
$i++;
}
if (in_array('id_alert_am',$show_fields)) {
$data[$i] = $event["id_alert_am"];
$i++;
}
if (in_array('criticity',$show_fields)) {
$data[$i] = $event["criticity"];
$i++;
}
if (in_array('user_comment',$show_fields)) {
$data[$i] = $event["user_comment"];
$i++;
}
if (in_array('tags',$show_fields)) {
$data[$i] = $event["tags"];
$i++;
}
if (in_array('source',$show_fields)) {
$data[$i] = $event["source"];
$i++;
}
if (in_array('id_extra',$show_fields)) {
$data[$i] = $event["id_extra"];
$i++;
}
if ($i != 0) {
//Actions //Actions
$data[4] = ''; $data[$i] = '';
// Validate event // Validate event
if (($event["estado"] != 1) and (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1)) { if (($event["estado"] != 1) and (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1)) {
$data[4] .= '<a href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">'; $data[$i] .= '<a href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
$data[4] .= html_print_image ("images/ok.png", true, $data[$i] .= html_print_image ("images/ok.png", true,
array ("title" => __('Validate event'))); array ("title" => __('Validate event')));
$data[4] .= '</a>&nbsp;'; $data[$i] .= '</a>&nbsp;';
} }
else { else {
/* $data[4] .= html_print_image ("images/tick.png", true, /* $data[4] .= html_print_image ("images/tick.png", true,
array ("title" => __('Event validated'))).'&nbsp;'; */ array ("title" => __('Event validated'))).'&nbsp;'; */
$data[4] .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; $data[$i] .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
} }
// Delete event // Delete event
if (check_acl ($config["id_user"], $event["id_grupo"], "IM") == 1) { if (check_acl ($config["id_user"], $event["id_grupo"], "IM") == 1) {
if($event['estado'] != 2) { if($event['estado'] != 2) {
$data[4] .= '<a class="delete_event" href="#" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;" id="delete-'.$event['id_evento'].'">'; $data[$i] .= '<a class="delete_event" href="#" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;" id="delete-'.$event['id_evento'].'">';
$data[4] .= html_print_image ("images/cross.png", true, $data[$i] .= html_print_image ("images/cross.png", true,
array ("title" => __('Delete event'))); array ("title" => __('Delete event')));
$data[4] .= '</a>&nbsp;'; $data[$i] .= '</a>&nbsp;';
} }
else { else {
$data[4] .= html_print_image ("images/cross.disabled.png", true, $data[$i] .= html_print_image ("images/cross.disabled.png", true,
array ("title" => __('Is not allowed delete events in process'))).'&nbsp;'; array ("title" => __('Is not allowed delete events in process'))).'&nbsp;';
} }
} }
$data[4] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $event["id_evento"] . ');">'; $data[$i] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $event["id_evento"] . ');">';
$data[4] .= html_print_image ("images/eye.png", true, $data[$i] .= html_print_image ("images/eye.png", true,
array ("title" => __('Show more'))); array ("title" => __('Show more')));
$data[4] .= '</a>&nbsp;'; $data[$i] .= '</a>&nbsp;';
// Create incident from this event // Create incident from this event
if (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1) { if (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1) {
@ -539,16 +699,17 @@ foreach ($result as $event) {
else { else {
$incidents_path = 'incidents/incident_detail&amp;insert_form'; $incidents_path = 'incidents/incident_detail&amp;insert_form';
} }
$data[4] .= '<a href="index.php?sec=incidencias&amp;sec2=operation/'.$incidents_path.'&amp;from_event='.$event["id_evento"].'">'; $data[$i] .= '<a href="index.php?sec=incidencias&amp;sec2=operation/'.$incidents_path.'&amp;from_event='.$event["id_evento"].'">';
$data[4] .= html_print_image ("images/page_lightning.png", true, $data[$i] .= html_print_image ("images/page_lightning.png", true,
array ("title" => __('Create incident from event'))); array ("title" => __('Create incident from event')));
$data[4] .= '</a>'; $data[$i] .= '</a>';
} }
$i++;
//Checkbox //Checkbox
$data[5] = html_print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true); $data[$i] = html_print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true);
array_push ($table->data, $data); array_push ($table->data, $data);
}
//Hiden row with description form //Hiden row with description form
$string = '';//$string = '<form method="post" action="'.$url.'&amp;section=list">'; $string = '';//$string = '<form method="post" action="'.$url.'&amp;section=list">';
$string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">'; $string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">';

15
pandora_console/pandoradb.data.oracle.sql
View File

@ -88,6 +88,21 @@ INSERT INTO tconfig (token, value) VALUES ('integria_url', ' ');
INSERT INTO tconfig (token, value) VALUES ('netflow_path', '/var/spool/pandora/data_in/netflow'); INSERT INTO tconfig (token, value) VALUES ('netflow_path', '/var/spool/pandora/data_in/netflow');
INSERT INTO tconfig (token, value) VALUES ('netflow_interval', '300'); INSERT INTO tconfig (token, value) VALUES ('netflow_interval', '300');
INSERT INTO tconfig (token, value) VALUES ('netflow_daemon', '/usr/bin/nfcapd'); INSERT INTO tconfig (token, value) VALUES ('netflow_daemon', '/usr/bin/nfcapd');
INSERT INTO tconfig (token, value) VALUES ('show_id_evento', '0');
INSERT INTO tconfig (token, value) VALUES ('show_evento', '1');
INSERT INTO tconfig (token, value) VALUES ('show_id_agente', '1');
INSERT INTO tconfig (token, value) VALUES ('show_id_usuario', '0');
INSERT INTO tconfig (token, value) VALUES ('show_id_grupo', '0');
INSERT INTO tconfig (token, value) VALUES ('show_estado', '1');
INSERT INTO tconfig (token, value) VALUES ('show_timestamp', '1');
INSERT INTO tconfig (token, value) VALUES ('show_event_type', '0');
INSERT INTO tconfig (token, value) VALUES ('show_id_agentmodule', '0');
INSERT INTO tconfig (token, value) VALUES ('show_id_alert_am', '0');
INSERT INTO tconfig (token, value) VALUES ('show_criticity', '0');
INSERT INTO tconfig (token, value) VALUES ('show_user_comment', '0');
INSERT INTO tconfig (token, value) VALUES ('show_tags', '0');
INSERT INTO tconfig (token, value) VALUES ('show_source', '0');
INSERT INTO tconfig (token, value) VALUES ('show_id_extra', '0');
COMMIT; COMMIT;
END;; END;;

15
pandora_console/pandoradb.data.postgreSQL.sql
View File

@ -85,6 +85,21 @@ INSERT INTO "tconfig" ("token", "value") VALUES
('netflow_path', '/var/spool/pandora/data_in/netflow'), ('netflow_path', '/var/spool/pandora/data_in/netflow'),
('netflow_interval', '300'), ('netflow_interval', '300'),
('netflow_daemon', '/usr/bin/nfcapd'); ('netflow_daemon', '/usr/bin/nfcapd');
('show_id_evento', '0'),
('show_evento', '1'),
('show_id_agente', '1'),
('show_id_usuario', '0'),
('show_id_grupo', '0'),
('show_estado', '1'),
('show_timestamp', '1'),
('show_event_type', '0'),
('show_id_agentmodule', '0'),
('show_id_alert_am', '0'),
('show_criticity', '0'),
('show_user_comment', '0'),
('show_tags', '0'),
('show_source', '0'),
('show_id_extra', '0');
COMMIT WORK; COMMIT WORK;

17
pandora_console/pandoradb_data.sql
View File

@ -83,7 +83,22 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('integria_url', ''), ('integria_url', ''),
('netflow_path', '/var/spool/pandora/data_in/netflow'), ('netflow_path', '/var/spool/pandora/data_in/netflow'),
('netflow_interval', '300'), ('netflow_interval', '300'),
('netflow_daemon', '/usr/bin/nfcapd'); ('netflow_daemon', '/usr/bin/nfcapd'),
('show_id_evento', '0'),
('show_evento', '1'),
('show_id_agente', '1'),
('show_id_usuario', '0'),
('show_id_grupo', '0'),
('show_estado', '1'),
('show_timestamp', '1'),
('show_event_type', '0'),
('show_id_agentmodule', '0'),
('show_id_alert_am', '0'),
('show_criticity', '0'),
('show_user_comment', '0'),
('show_tags', '0'),
('show_source', '0'),
('show_id_extra', '0');
UNLOCK TABLES; UNLOCK TABLES;