tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,342 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

6715 Commits

Author SHA1 Message Date
Daniel Rodriguez 7baed1dffd Merge branch 'ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves' into 'develop' 
Ent 9712 pandora db no se ejecuta cuando pasan politicas pero si al reves

See merge request artica/pandorafms!5234
 2022-10-31 11:56:42 +00:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop' 
implemented trap history

See merge request artica/pandorafms!5116
 2022-10-31 11:17:29 +00:00
Daniel Rodriguez 92b99d0154 Merge branch 'ent-9659-optimizacion-pandora_db' into 'develop' 
Query performance improvements in pandora_db.

See merge request artica/pandorafms!5211
 2022-10-31 10:54:31 +00:00
Ramon Novoa a7331c5603 Merge branch 'ent-test-pandoradb-lock' into ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves 2022-10-31 10:52:58 +01:00
Ramon Novoa 5cd601b999 Improve the locking mechanism of pandora_db. 2022-10-31 10:16:17 +01:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 4594fb17e2 Merge branch 'ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos' into 'develop' 
synch cli with nodes pandora_enterprise#9500

pandora_enterprise#9500

See merge request artica/pandorafms!5198
 2022-10-28 01:30:22 +00:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
Daniel Rodriguez c98c58c157 Merge branch 'ent-9377-14016-inestabilidad-y-borrado-incorrecto-netflow' into 'develop' 
Fix pandoradb deleting old netflow data

See merge request artica/pandorafms!5055
 2022-10-26 12:39:50 +00:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Ramon Novoa d493eaea12 Query performance improvements in pandora_db. 2022-10-25 12:35:22 +02:00
Diego Muñoz-Reja a8902fed18 Merge branch 'ent-9316-bug-relacionado-con-los-permisos-en-ruta-de-log-tentacle' into 'develop' 
Update copies of the Tentacle Server. Small fixes.

See merge request artica/pandorafms!5187
 2022-10-25 09:26:47 +00:00
artica ce4fc25209 Auto-updated build strings. 2022-10-25 01:00:22 +02:00
artica 204d711b30 Auto-updated build strings. 2022-10-24 01:00:19 +02:00
artica bd0f136dc0 Auto-updated build strings. 2022-10-23 01:00:17 +02:00
artica 4118f7656b Auto-updated build strings. 2022-10-22 01:00:24 +02:00
artica e31699eed7 Auto-updated build strings. 2022-10-21 01:00:25 +02:00
artica 61b3bc724a Auto-updated build strings. 2022-10-20 01:00:21 +02:00
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Daniel Barbero 82a3fc1063 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2022-10-18 16:22:53 +02:00
Daniel Barbero e79394c235 synch cli with nodes pandora_enterprise#9500 2022-10-18 16:14:35 +02:00
Jimmy Olano 9d912c2a6d Merge branch 'ent-8956-derivado-del-trabajo-q-a-762-lts-cli-perl-al-crear-usuario-inserta-entidades-html-en' into 'develop' 
Ent 8956 derivado del trabajo q a 762 lts cli perl al crear usuario inserta entidades html en

#8956

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8956

See merge request artica/pandorafms!5163
 2022-10-18 13:35:09 +00:00
Daniel Barbero 4b3376057c Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 13:41:25 +02:00
Jimmy Olano 0612bb05db Merge branch 'ent-9098-13503-creacion-llamada-insert_gis_data-cli' into 'develop' 
Ent 9098 13503 creacion llamada insert gis data cli

#9098

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9098

See merge request artica/pandorafms!5132
 2022-10-18 11:26:51 +00:00
Daniel Barbero 697abced4e synch cli with nodes pandora_enterprise#9500 2022-10-18 12:49:51 +02:00
Daniel Barbero 15b07a9a09 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 08:01:32 +02:00
artica ed8b6678cd Auto-updated build strings. 2022-10-18 01:00:21 +02:00
Daniel Barbero c6783f9a10 synch cli with nodes pandora_enterprise#9500 2022-10-17 16:04:45 +02:00
artica b79b7e5d57 Auto-updated build strings. 2022-10-17 01:00:17 +02:00
artica 92f0e4b709 Auto-updated build strings. 2022-10-16 01:00:17 +02:00
artica b31240a3cc Auto-updated build strings. 2022-10-15 01:00:23 +02:00
Jimmy Olano 9c413b355d Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop' 
remove tmetaconsole_history token pandora_enterprise#9579

pandora_enterprise#9579

See merge request artica/pandorafms!5161
 2022-10-14 08:33:26 +00:00
artica f871654e60 Auto-updated build strings. 2022-10-14 01:00:23 +02:00
Jimmy Olano 4c8f7745b6 Merge branch 'ent-9396-derivado-del-trabajo-q-a-764-fe-de-errata-en-la-ayuda-de-la-cli-pfms-agent_update_custom_fields' into 'develop' 
Ent 9396 derivado del trabajo q a 764 fe de errata en la ayuda de la cli pfms agent update custom fields

#9396

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9396

See merge request artica/pandorafms!5125
 2022-10-13 16:23:25 +00:00
artica b98b0f3ab3 Auto-updated build strings. 2022-10-13 01:00:17 +02:00
artica ccd578690b Auto-updated build strings. 2022-10-12 01:00:22 +02:00
Ramon Novoa 83a669b1bc Update copies of the Tentacle Server. Small fixes. 2022-10-11 11:48:02 +02:00
edu.corral 2262754eaf ent 9098 insert_gis_data 2022-10-11 11:46:02 +02:00
artica e5bdceee78 Auto-updated build strings. 2022-10-11 01:00:22 +02:00
artica 7a2f8fdef0 Auto-updated build strings. 2022-10-10 01:00:16 +02:00
artica 771fa9e099 Auto-updated build strings. 2022-10-09 01:00:17 +02:00
artica 92aa05ddb4 Auto-updated build strings. 2022-10-08 01:00:20 +02:00
artica 4e665b180f Auto-updated build strings. 2022-10-07 01:00:20 +02:00
artica fa3f224325 Auto-updated build strings. 2022-10-06 01:00:20 +02:00
Alejandro Sánchez 99e0aa3e36 Merge branch '9458-plugin-sybase-version-alternativa-al-actual' into 'develop' 
changed single quotes to double quotes in the  variable of the transfer_xml...

See merge request artica/pandorafms!5136
 2022-10-05 09:37:21 +00:00
artica 29e49f9ae0 Auto-updated build strings. 2022-10-05 01:00:20 +02:00
artica a313678dca Auto-updated build strings. 2022-10-04 01:00:17 +02:00