5224 Commits

Author SHA1 Message Date
Daniel Rodriguez
b09ff78a87 Merge branch 'ent-5723-control-de-sesiones-selenium' into 'develop'
Cleanup old SEL GRID sessions

See merge request artica/pandorafms!3181
2020-05-28 08:27:05 +02:00
artica
cc09361598 Auto-updated build strings. 2020-05-28 01:00:15 +02:00
artica
7c4e4bb7e1 Auto-updated build strings. 2020-05-27 01:00:18 +02:00
fbsanchez
2481bcc669 Update default value for use_xml_timestamp 2020-05-26 13:56:39 +02:00
artica
e3803ac934 Auto-updated build strings. 2020-05-26 01:00:17 +02:00
Daniel Rodriguez
bab85bcc5e Merge branch 'ent-5744-pandora_ux-pl-con-pandorafms-webdriver' into 'develop'
added missing function read_file

See merge request artica/pandorafms!3193
2020-05-25 18:18:28 +02:00
Luis
9541d3b56d Ent 5553 dangerous behaviour dataserver lifo enabled 2020-05-25 16:08:37 +02:00
artica
b595548eee Auto-updated build strings. 2020-05-25 01:00:14 +02:00
artica
980582968b Auto-updated build strings. 2020-05-24 01:00:15 +02:00
artica
4e4fe147d3 Auto-updated build strings. 2020-05-23 01:00:17 +02:00
artica
289e56d8df Auto-updated build strings. 2020-05-22 01:00:15 +02:00
fbsanchez
b0e8287c61 Wip cluster view 2020-05-21 19:28:24 +02:00
artica
44991d0b46 Auto-updated build strings. 2020-05-21 01:00:16 +02:00
artica
09ea6fdb97 Auto-updated build strings. 2020-05-20 01:00:16 +02:00
marcos
621e0ee9d9 fixed error mysqldump 2020-05-19 11:52:11 +02:00
marcos
13b78ae450 Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-19 09:33:17 +02:00
artica
d2c2ae7502 Auto-updated build strings. 2020-05-19 01:00:16 +02:00
marcos
fc5c5fd60d Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-18 10:28:32 +02:00
artica
e8dd2b13c7 Auto-updated build strings. 2020-05-18 01:00:13 +02:00
artica
eece9281e2 Auto-updated build strings. 2020-05-17 01:00:13 +02:00
artica
71cb3e0164 Auto-updated build strings. 2020-05-16 01:00:14 +02:00
artica
277a610709 Auto-updated build strings. 2020-05-15 01:00:15 +02:00
Alejandro Fraguas
5f598c2dcc Merge branch 'ent-5236-docker-centos-7' into 'develop'
Docker centos7

See merge request artica/pandorafms!3136
2020-05-14 16:07:18 +02:00
Alejandro Fraguas
aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
2020-05-14 10:32:43 +02:00
artica
44b5f2671e Auto-updated build strings. 2020-05-14 01:00:51 +02:00
fbsanchez
206970d143 fixes 2020-05-13 17:06:18 +02:00
fbsanchez
ee51814650 fixes 2020-05-13 17:02:07 +02:00
fbsanchez
bd6b57e8c3 Improvements in log details v10 2020-05-13 16:43:20 +02:00
fbsanchez
6bbb9d5d9b minor fix 2020-05-13 12:43:47 +02:00
fbsanchez
694d82e522 avoid div by 0 error while scanning networks with no hosts 2020-05-13 12:37:08 +02:00
artica
9fc993519b Auto-updated build strings. 2020-05-13 01:00:20 +02:00
marcos
7938bfcd3e Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-12 09:21:35 +02:00
artica
3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
marcos
7f282c668d Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-11 16:19:29 +02:00
Alejandro Fraguas
f2c0a62cec Merge branch 'ent-1096-integracion-cmdb' into 'develop'
CMDB integration needs

See merge request artica/pandorafms!3045
2020-05-11 13:58:50 +02:00
artica
8514cdc378 Auto-updated build strings. 2020-05-11 01:00:15 +02:00
artica
87445c28ef Auto-updated build strings. 2020-05-10 01:00:15 +02:00
artica
3c01526ea9 Auto-updated build strings. 2020-05-09 01:00:24 +02:00
artica
36d15f3de5 Auto-updated build strings. 2020-05-08 01:00:18 +02:00
artica
bc3e21af6d Auto-updated build strings. 2020-05-07 01:00:17 +02:00
artica
5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +02:00
artica
b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
fbsanchez
4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez
54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-05-04 09:52:15 +02:00
artica
12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica
7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica
f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica
848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
fbsanchez
55392bac47 weird json 2020-04-30 18:11:50 +02:00
fbsanchez
eaf10f7d6e weird json 2020-04-30 18:07:52 +02:00