Commit Graph

23198 Commits

Author SHA1 Message Date
Daniel Barbero d6ce54cddf fixed errors Alert correlation 2019-11-22 15:26:30 +01:00
Daniel Barbero e8812cba95 add img 2019-11-22 14:50:23 +01:00
Ramon Novoa 337e3357db Non-intensive modules do not need to check a timestamp.
Ref pandora_enterprise#4660.
2019-11-22 13:59:22 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
fbsanchez 5b5895a644 minor fix 2019-11-22 13:30:25 +01:00
fbsanchez 1565fee3f4 minor fix, errata 2019-11-22 11:59:24 +01:00
fbsanchez fd12c5a009 DB update, default values for Alert correlation 2019-11-22 11:57:20 +01:00
Daniel Barbero 35abd12499 WIP alert correlations 2019-11-22 11:06:55 +01:00
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
Daniel Barbero 4caf84da25 WIP alert correlations 2019-11-22 10:24:12 +01:00
artica 561e73d524 Updated version and build strings. 2019-11-22 10:03:53 +01:00
artica b386da7da6 Auto-updated build strings. 2019-11-22 00:01:10 +01:00
Daniel Rodriguez 563c103615 Merge branch 'ent-4772-omnishell' into 'develop'
Add menu omnishell

See merge request artica/pandorafms!2838
2019-11-21 18:21:47 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00
marcos 93c4793025 add id_source_event 33.sql 2019-11-21 17:36:01 +01:00
Tatiana Llorente d392978a70 Fixed bug when deleting nodes in network maps 2019-11-21 17:28:58 +01:00
Alejandro Fraguas e9bd9f1b58 Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop'
fixed secondary group in events

See merge request artica/pandorafms!2901
2019-11-21 16:09:01 +01:00
Daniel Barbero 66035a8b67 fixed errors css 2019-11-21 15:27:47 +01:00
alejandro-campos 8b9177c2e7 fix bug when selecting and unselecting feature in gis maps 2019-11-21 13:18:04 +01:00
fbsanchez 7af1841b8f moved alert.js to correlated_alerts.js 2019-11-21 13:12:17 +01:00
fbsanchez 5195d6a754 Allow single quotes hidden_extended 2019-11-21 12:42:06 +01:00
fbsanchez 0f2b8a55a5 wip alert correlation 2019-11-21 12:05:14 +01:00
Daniel Rodriguez 73a512a08b Merge branch 'ent-4954-urls-documentacion-soporte-al-fallar-base-datos' into 'develop'
Ent 4954 urls documentacion soporte al fallar base datos

See merge request artica/pandorafms!2874
2019-11-21 11:14:50 +01:00
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Daniel Maya 791454ee87 Added Group by in tree view 2019-11-21 10:22:51 +01:00
Daniel Rodriguez 775289fc20 Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop'
Changed definition of link in group icon

See merge request artica/pandorafms!2891
2019-11-21 10:21:07 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
Daniel Barbero 17e7710f45 add datepicker alert correlation 2019-11-21 09:05:34 +01:00
artica 23e64ab781 Auto-updated build strings. 2019-11-21 00:01:18 +01:00
fbsanchez 6996969995 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
	pandora_console/extras/mr/33.sql
2019-11-20 18:23:17 +01:00
fbsanchez b02e22c8f2 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-20 18:21:30 +01:00
fbsanchez 624a1e0086 WIP alert correlation 2019-11-20 18:17:43 +01:00
marcos 294c160622 semifinal sap sap view agent 2019-11-20 18:01:07 +01:00
Daniel Rodriguez 3a3cd5c1c5 Merge branch 'ent-4769-modulos-ssh-php-perl' into 'develop'
modulos ssh php perl

See merge request artica/pandorafms!2799
2019-11-20 17:26:15 +01:00
Daniel Maya fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Daniel Barbero Martin fb6013bd62 Wip alert correlation 2019-11-20 15:55:08 +01:00
fbsanchez 3b636a12ce Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-20 15:53:00 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-20 15:51:47 +01:00
Daniel Barbero Martin 61568ee3b7 Add button diagnostic 2019-11-20 13:26:02 +01:00
Daniel Barbero Martin 4d7f92e3f0 Add button diagnostic 2019-11-20 13:25:16 +01:00
Alejandro Fraguas 2469b65192 Merge branch 'ent-4841-8948-Errores-migrate_pandora-6-a-7' into 'develop'
fix migrate missing content

See merge request artica/pandorafms!2840
2019-11-20 13:17:45 +01:00
alejandro-campos 4d332f2bef fix duplicated operation in migrate file 2019-11-20 12:43:08 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
fbsanchez 79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00
alejandro-campos 33b11af3c1 fix missing line in migrate 2019-11-20 11:26:28 +01:00
alejandro-campos 8295f70ae0 Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7 2019-11-20 11:23:16 +01:00
fbsanchez 35bd29d222 Merge branch 'ent-4610-Alertas-de-logs' of brutus.artica.lan:artica/pandorafms into ent-4610-Alertas-de-logs 2019-11-20 10:40:57 +01:00
fbsanchez 43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +01:00