25299 Commits

Author SHA1 Message Date
alejandro-campos
8791dce76a fix module types in module creation from hash 2020-08-26 13:59:33 +02:00
alejandro-campos
a92c3c7ca3 fix bug in combined graphs 2020-08-26 11:47:54 +02:00
Alejandro Fraguas
01f9c87fb9 Merge branch 'ent-6093-error-fields-en-alertas-snmp' into 'develop'
Changed action-alert setting

Closes pandora_enterprise#6093

See merge request artica/pandorafms!3406
2020-08-26 10:02:58 +02:00
Jose Gonzalez
5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
artica
24eeebd6be Auto-updated build strings. 2020-08-26 01:00:18 +02:00
Jose Gonzalez
516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez
1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
Kevin Rojas
32094b1b09 Added sudo to clarify usage 2020-08-25 09:21:57 +02:00
artica
223774875c Auto-updated build strings. 2020-08-25 01:00:17 +02:00
Alejandro Fraguas
da1db7cb98 Merge branch 'ent-4434-audit-log-acl-enterprise' into 'develop'
Fixed acl enterprise acl gextensions

See merge request artica/pandorafms!3397
2020-08-24 10:16:25 +02:00
Luis
0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +02:00
artica
022167fa9c Auto-updated build strings. 2020-08-24 01:00:14 +02:00
artica
07c7d917c8 Auto-updated build strings. 2020-08-23 01:00:14 +02:00
artica
b5752f1b2d Auto-updated build strings. 2020-08-22 01:00:41 +02:00
Alejandro Fraguas
f3e63ea9ec Merge branch 'ent-6236-llamada-delete_agent-api-no-funciona-en-metaconsola' into 'develop'
fixed error on delete agent api

See merge request artica/pandorafms!3409
2020-08-21 09:59:00 +02:00
marcos
195f09a7cf fixed error on delete agent api 2020-08-21 09:40:24 +02:00
artica
f0a91cce56 Auto-updated build strings. 2020-08-21 01:00:18 +02:00
Daniel Rodriguez
0512149ee4 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
Ent 6102 edicion nombre sincronizacion alertas metaconsola

See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
artica
06f17b5d0b Auto-updated build strings. 2020-08-20 01:00:18 +02:00
Daniel Rodriguez
37c8cb74ce Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop'
Implemented log source status info box in agent view

See merge request artica/pandorafms!3379
2020-08-19 10:36:00 +02:00
alejandro-campos
29026ef3be changed tooltip 2020-08-19 09:10:17 +02:00
alejandro-campos
97280db5df fixed agents not being generated by recon 2020-08-19 08:28:26 +02:00
artica
2231fcab72 Auto-updated build strings. 2020-08-19 01:00:14 +02:00
Jose Gonzalez
37f7eb9429 Changed action-alert setting 2020-08-18 10:29:28 +02:00
artica
c1c2fb3b57 Auto-updated build strings. 2020-08-18 01:00:16 +02:00
Daniel Rodriguez
55986ede39 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
fix parameter macros in event responses

See merge request artica/pandorafms!3405
2020-08-17 09:38:47 +02:00
artica
b4b3fc5866 Auto-updated build strings. 2020-08-17 01:00:14 +02:00
artica
fbb0699bf7 Auto-updated build strings. 2020-08-16 01:00:14 +02:00
artica
c4dd6d2395 Auto-updated build strings. 2020-08-15 01:00:20 +02:00
alejandro-campos
0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
Daniel Rodriguez
a17fb4997f Merge branch 'ent-6193-Omnishell-ejecuciones-y-timeout' into 'develop'
Solve issue with timeout executions

Closes pandora_enterprise#6193

See merge request artica/pandorafms!3404
2020-08-14 14:41:51 +02:00
Daniel Rodriguez
42c6989d5e Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop'
fix event pagination when events history is activated

See merge request artica/pandorafms!3401
2020-08-14 11:47:19 +02:00
Daniel Rodriguez
4ada69a804 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
Ent 6201 10495 macro en event response no funciona

See merge request artica/pandorafms!3403
2020-08-14 11:47:11 +02:00
Daniel Rodriguez
b7968305cc Merge branch 'ent-6171-xss-name' into 'develop'
fixed vulnerability

See merge request artica/pandorafms!3395
2020-08-14 11:42:49 +02:00
Marcos Alconada
77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +02:00
Daniel Rodriguez
e5d4208ac9 Merge branch 'ent-5355-9422-9700-actualizacion-de-umbrales-mediante-xml' into 'develop'
Forced thresholds ENT

See merge request artica/pandorafms!3314
2020-08-14 09:22:47 +02:00
Jose Gonzalez
dedfe518af Solve issue with timeout executions 2020-08-14 08:51:02 +02:00
artica
177341e6af Auto-updated build strings. 2020-08-14 01:00:18 +02:00
Kevin
3a878ccc4f a bit of order 2020-08-13 15:38:01 +02:00
Kevin
fb407b9b14 Changes to auto-update build strings 2020-08-13 15:36:58 +02:00
alejandro-campos
8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos
90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Kevin
e9baab9d82 dmg installer for MacOS 2020-08-13 14:01:00 +02:00
Kevin
09859ab6fb Changes to avoid installation issues in MacOS 2020-08-13 13:04:30 +02:00
Kevin
29468da8a4 Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-5873-agente-para-macos-con-instalador-grafico 2020-08-13 12:49:52 +02:00
Kevin
910a5cef1f modified installer to fix Darwin issues 2020-08-13 12:49:45 +02:00
Kevin
2380925e8e Modified build build_src file to omit dmg folder in tarball creation 2020-08-13 12:47:41 +02:00
Ramon Novoa
dff74b63e2 Merge remote-tracking branch 'github/develop' into develop 2020-08-13 10:54:22 +02:00
alejandro-campos
6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
artica
e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00