23299 Commits

Author SHA1 Message Date
Luis
01e3c8bcda Ent 5004 crete event cli no funciona bien 2019-12-10 11:31:45 +01:00
vgilc
1b2d4e233a Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop'
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento

See merge request artica/pandorafms!2907
2019-12-10 11:30:28 +01:00
vgilc
8ebb3a70f0 Merge branch 'ent-5020-barra-de-eventos-muestra-eventos-de-forma-aleatoria' into 'develop'
Fixed agent event graph bar and link to event list

See merge request artica/pandorafms!2923
2019-12-10 11:28:56 +01:00
Luis
2b03b00223 Fixed agent event graph bar and link to event list 2019-12-10 11:28:56 +01:00
vgilc
7d64eabd45 Merge branch 'add-support-perl5.3x' into 'develop'
Added support for perl5.3x to pandora_agent_installer.

See merge request artica/pandorafms!2941
2019-12-10 10:59:12 +01:00
vgilc
f8c4c1baba Merge branch 'ent-5040-network-tools-no-funcionan-con-agentes-con-mas-de-una-ip-secundaria' into 'develop'
Fixed bug in network tools

See merge request artica/pandorafms!2920
2019-12-10 10:57:07 +01:00
artica
7a858fbc25 Auto-updated build strings. 2019-12-10 00:01:07 +01:00
artica
180d5842ee Auto-updated build strings. 2019-12-09 00:01:08 +01:00
artica
8128f2605a Auto-updated build strings. 2019-12-08 00:01:07 +01:00
artica
8f31fc21f1 Auto-updated build strings. 2019-12-07 00:01:07 +01:00
artica
f477014a1b Auto-updated build strings. 2019-12-06 00:01:10 +01:00
Luis Calvo
a184b50eb2 Added margin to date selector elements in reporting viewer 2019-12-05 18:55:15 +01:00
Jose Gonzalez
3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
manuel
85f4301e4c Fixed bugs in alert actions 2019-12-05 16:43:26 +01:00
marcos
1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos
a89a64cc1b Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes 2019-12-05 15:05:54 +01:00
Junichi Satoh
27bc5f8757 Added support for perl5.3x to pandora_agent_installer. 2019-12-05 10:26:50 +09:00
artica
0263060639 Auto-updated build strings. 2019-12-05 00:01:09 +01:00
marcos
be3dcccc4d out entities 2019-12-04 17:45:58 +01:00
marcos
d6090771ef Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart 2019-12-04 17:32:38 +01:00
marcos
fbb1e53362 update orderinterpreter 2019-12-04 17:28:03 +01:00
artica
0ba2d86971 Auto-updated build strings. 2019-12-04 00:01:08 +01:00
fbsanchez
ee9694d968 Merge branch 'ent-fix-elk-alerts' into 'develop'
Fix ELK alerts

See merge request artica/pandorafms!2936
2019-12-03 20:19:24 +01:00
fbsanchez
a8a1b2bcc8 Fix ELK alerts 2019-12-03 19:54:09 +01:00
marcos
1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos
7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
vgilc
516fa8569b Merge branch 'revert-80962856' into 'develop'
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"

See merge request artica/pandorafms!2935
2019-12-03 16:01:56 +01:00
vgilc
810fe8f860 Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
This reverts merge request !2886
2019-12-03 15:59:08 +01:00
vgilc
809628560b Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
Ent 4968 comandos de alerta con saltos de linea

See merge request artica/pandorafms!2886
2019-12-03 15:53:23 +01:00
marcos
14b8379ccb ajax call, controller, class, match result, return array inputs(example to return) 2019-12-03 15:11:16 +01:00
marcos
631170bfe9 resolv blank page 2019-12-03 14:26:31 +01:00
marcos
90f17ebd46 Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes 2019-12-03 14:15:47 +01:00
marcos
d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Luis Calvo
22cd129f71 Fixed netflow command injection vulnerability 2019-12-03 13:58:14 +01:00
Jose Gonzalez
35ca0bc247 Possible solution to avoid issues with JS and apostrophe of other languages strings 2019-12-03 13:05:33 +01:00
Tatiana Llorente
fecd2c74b5 Added button to refresh graph in container graphs 2019-12-03 13:00:59 +01:00
artica
60aaf4363e Auto-updated build strings. 2019-12-03 00:01:07 +01:00
marcos
d7288114ad fixed minnor error 2019-12-02 18:17:54 +01:00
Tatiana Llorente
2d62955020 Changed filters styles in netflow live view 2019-12-02 16:11:17 +01:00
artica
80d5eea467 Auto-updated build strings. 2019-12-02 00:01:08 +01:00
artica
882198798a Auto-updated build strings. 2019-12-01 00:01:06 +01:00
artica
a6f881c6fa Auto-updated build strings. 2019-11-30 00:01:08 +01:00
artica
14999b7b84 Auto-updated build strings. 2019-11-29 00:01:08 +01:00
Tatiana Llorente
0420a439d1 Send params to copy and delete action alert by post 2019-11-28 11:51:32 +01:00
artica
ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
daniel
f4b347c632 Merge branch 'ent-4989-Revision-final-EDFi-741-PDF' into 'develop'
Fixed pdf

See merge request artica/pandorafms!2922
2019-11-27 15:24:49 +01:00
Daniel Barbero Martin
e6afe84940 Fixed pdf 2019-11-27 15:22:39 +01:00
manuel
a799b22a5c Fixed bug in network tools 2019-11-27 14:06:52 +01:00
Daniel Rodriguez
50b4812476 Merge branch 'ent-4571-expresiones-regulares-en-plantillas-de-informe' into 'develop'
Added report template regex to MR

See merge request artica/pandorafms!2820
2019-11-27 13:21:05 +01:00
Luis
b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00