tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4388-Nuevos-eventos' into 'develop'

Browse Source 
Ent 4388 nuevos eventos

See merge request artica/pandorafms!2628
This commit is contained in:
Daniel Rodriguez 2019-08-09 09:00:57 +02:00
commit ff3134c55a
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/mr/31.sql
View File

@ -1,5 +1,7 @@
START TRANSACTION; START TRANSACTION;
UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
DELETE FROM `talert_commands` WHERE `id` = 11; DELETE FROM `talert_commands` WHERE `id` = 11;
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled';

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1251,6 +1251,7 @@ UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.ph
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '737'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '737');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled';
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_inventory'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_inventory';

14
pandora_console/include/functions_events.php
View File

@ -217,7 +217,7 @@ function events_get_all_fields()
* *
* @return string Traduction. * @return string Traduction.
*/ */
function events_get_column_name($field) function events_get_column_name($field, $table_alias=false)
{ {
switch ($field) { switch ($field) {
case 'id_evento': case 'id_evento':
@ -293,7 +293,11 @@ function events_get_column_name($field)
return __('Options'); return __('Options');
case 'mini_severity': case 'mini_severity':
return 'S'; if ($table_alias === true) {
return 'S';
} else {
return __('Severity mini');
}
default: default:
return __($field); return __($field);
@ -308,7 +312,7 @@ function events_get_column_name($field)
* *
* @return array Names array. * @return array Names array.
*/ */
function events_get_column_names($fields) function events_get_column_names($fields, $table_alias=false)
{ {
if (!isset($fields) || !is_array($fields)) { if (!isset($fields) || !is_array($fields)) {
return []; return [];
@ -318,14 +322,14 @@ function events_get_column_names($fields)
foreach ($fields as $f) { foreach ($fields as $f) {
if (is_array($f)) { if (is_array($f)) {
$name = []; $name = [];
$name['text'] = events_get_column_name($f['text']); $name['text'] = events_get_column_name($f['text'], $table_alias);
$name['class'] = $f['class']; $name['class'] = $f['class'];
$name['style'] = $f['style']; $name['style'] = $f['style'];
$name['extra'] = $f['extra']; $name['extra'] = $f['extra'];
$name['id'] = $f['id']; $name['id'] = $f['id'];
$names[] = $name; $names[] = $name;
} else { } else {
$names[] = events_get_column_name($f); $names[] = events_get_column_name($f, $table_alias);
} }
} }

8
pandora_console/include/styles/events.css
View File

@ -118,14 +118,6 @@ table.dataTable tbody td {
border-bottom: 2px solid #dedede; border-bottom: 2px solid #dedede;
} }
.info_table.events tr > td:first-child {
padding-left: 5px;
padding-top: 0;
vertical-align: middle;
width: 40%;
padding-bottom: 0;
}
.filter_input { .filter_input {
align-items: center; align-items: center;
} }

8
pandora_console/operation/events/events.php
View File

@ -1258,7 +1258,13 @@ try {
); );
// Get column names. // Get column names.
$column_names = events_get_column_names($fields); $column_names = events_get_column_names($fields, true);
foreach ($column_names as $key => $column) {
if (is_array($column) && $column['text'] == 'S') {
$column_names[$key]['style'] = 'padding-left: 1em !important;';
}
}
// Open current filter quick reference. // Open current filter quick reference.
$active_filters_div = '<div class="filter_summary">'; $active_filters_div = '<div class="filter_summary">';

2
pandora_console/pandoradb_data.sql
View File

@ -83,7 +83,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('netflow_daemon', '/usr/bin/nfcapd'), ('netflow_daemon', '/usr/bin/nfcapd'),
('netflow_nfdump', '/usr/bin/nfdump'), ('netflow_nfdump', '/usr/bin/nfdump'),
('netflow_max_resolution', '50'), ('netflow_max_resolution', '50'),
('event_fields', 'evento,id_agente,estado,timestamp'), ('event_fields', 'mini_severity,evento,id_agente,estado,timestamp'),
('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'), ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'),
('list_ACL_IPs_for_API', '127.0.0.1'), ('list_ACL_IPs_for_API', '127.0.0.1'),
('enable_pass_policy', 0), ('enable_pass_policy', 0),