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

1756 Commits

Author SHA1 Message Date
Enrique Martin 3807baa8ef Added GIS random data to agents 2023-11-30 17:41:01 +01:00
Enrique Martin 76327c6d73 Fixed demo graphs generation 2023-11-30 08:54:21 +01:00
Enrique Martin 50ab2841e7 Removed some elements from network map PRD 2023-11-29 18:02:33 +01:00
Enrique Martin 93e79b51eb Changed traps chance 2023-11-29 17:30:57 +01:00
Enrique Martin 8e1d30adfe Fixed reports PRD 2023-11-29 13:31:39 +01:00
Enrique Martin 9bb47fc12f Fixed custom report PRD file 2023-11-29 11:57:34 +01:00
Enrique Martin 02e8c1b2d5 Fixed quotes in PRD file 2023-11-29 10:19:24 +01:00
Enrique Martin e56b0ee37e Added all widgets by defult 2023-11-28 16:46:42 +01:00
Enrique Martin 4cf2b3427e Added peridicity to reports prd format 2023-11-28 16:00:01 +01:00
Enrique Martin 8849e80406 Added demodata PRD files 2023-11-28 12:59:11 +01:00
alejandro.campos@artica.es 1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
Daniel Rodriguez 1f8554e8d1 Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop' 
Ent 11914 editor de alertas de logs

See merge request artica/pandorafms!6505
 2023-10-23 12:34:32 +00:00
Jonathan ac0f89b24f #12256 remove id and check duplicate before insert 2023-10-18 09:15:46 +02:00
Jonathan a3ce979b39 Revert "#12256 remove id and check duplicate before insert" 
This reverts commit 75b035261f.
 2023-10-18 09:13:00 +02:00
Jonathan 75b035261f #12256 remove id and check duplicate before insert 2023-10-17 12:52:40 +02:00
Matias Didier f0a3b3af63 Merge branch 'ent-11848-meter-modulos-de-seguridad-hardening-y-auditoria-con-el-grupo-de-modulos-security' into 'develop' 
Case insensitive option for get module id

See merge request artica/pandorafms!6551
 2023-10-16 10:36:23 +00:00
Daniel Maya dbc4d35a64 #11914 Added alert_correlation in delete_file 2023-10-13 10:27:43 +02:00
Daniel Maya f5535a1fc8 #11914 Added update 2023-10-11 17:10:14 +02:00
Rafael Ameijeiras f8c99c6ada Merge branch 'ent-11213-plugin-sap-para-discovery-2-0' into 'develop' 
Added SAP plugin to MR

See merge request artica/pandorafms!6511
 2023-10-11 10:15:20 +00:00
Calvo a333e3bbd8 Add grop security MR 2023-10-11 10:46:36 +02:00
alejandro.campos@artica.es 10d94daf30 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-10 11:09:53 +02:00
Enrique Martin 62b52b901a Fixed SQL migration scripts 2023-10-09 14:37:31 +02:00
alejandro.campos@artica.es 0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Calvo d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
Calvo db291c77f5 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-10-04 16:21:29 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Calvo 7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Enrique Martin 22769342b8 Merge remote-tracking branch 'origin/develop' into ent-11213-plugin-sap-para-discovery-2-0 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/pandoradb_data.sql
 2023-10-02 10:24:31 +02:00
Enrique Martin c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop' 
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
 2023-10-02 07:54:54 +00:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
alejandro fd6757dbde added discovery cloud plugins in MR 2023-09-28 11:08:38 +02:00
Enrique Martin 59024fa846 Added SAP plugin to MR 2023-09-28 09:18:36 +02:00
Daniel Maya d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Daniel Maya 05320f7ad4 #11990 Fixed enable_horizontal_tree 2023-09-20 12:42:01 +02:00
Daniel Cebrian cba3e39f6c Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-19 17:32:06 +02:00
Enrique Martin 7a725d0c16 Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco' 
Conflicts:
   pandora_console/extras/mr/66.sql
 2023-09-19 08:42:38 +00:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Rafael Ameijeiras ce38970c38 Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop' 
Changed version for VMware discovery plugin

See merge request artica/pandorafms!6439
 2023-09-18 13:19:33 +00:00
alejandro.campos@artica.es f410f09745 change mr 2023-09-14 10:43:35 +02:00
Enrique Martin 64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Enrique Martin 6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00