fbsanchez
|
d3b5e7a2b0
|
minor style fix rulebuilder
|
2019-11-23 13:13:24 +01:00 |
|
fbsanchez
|
2f0b2c1766
|
minor fix css
|
2019-11-23 13:06:58 +01:00 |
|
fbsanchez
|
64e481187f
|
RuleBuilder Style updates
|
2019-11-23 12:48:47 +01:00 |
|
fbsanchez
|
4e2bd7ed55
|
minor fixes
|
2019-11-22 20:49:46 +01:00 |
|
fbsanchez
|
5423e78d62
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
|
2019-11-22 15:49:07 +01:00 |
|
fbsanchez
|
8001ba0d41
|
minor fix
|
2019-11-22 15:37:32 +01:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 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 |
|
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
|
624a1e0086
|
WIP alert correlation
|
2019-11-20 18:17:43 +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
|
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 |
|
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 |
|
Daniel Barbero Martin
|
6bf9ceac3e
|
fixed minor error
|
2019-11-20 10:00:57 +01:00 |
|
Daniel Barbero Martin
|
67fb2216d4
|
Fix
|
2019-11-20 09:48:35 +01:00 |
|
Daniel Barbero Martin
|
cd8f52fd92
|
WIP alert correlations
|
2019-11-20 09:11:03 +01:00 |
|
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
fbsanchez
|
9cea131378
|
WIP CorrelatedAlerts
|
2019-11-19 23:35:29 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
Daniel Barbero Martin
|
1b5dcc3e28
|
Fixed errors in remote command
|
2019-11-19 12:35:52 +01:00 |
|
Alejandro Fraguas
|
aa4ae996d2
|
Merge branch 'ent-4986-La-vista-Module-Groups-se-ve-con-cualquier-grupo-asignado-al-usuario' into 'develop'
Ent 4986 la vista module groups se ve con cualquier grupo asignado al usuario
See merge request artica/pandorafms!2894
|
2019-11-19 12:22:01 +01:00 |
|
fbsanchez
|
be1e4324d2
|
missed port
|
2019-11-19 12:02:10 +01:00 |
|