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

996 Commits

Author SHA1 Message Date
Jonathan b327c824da #8365 NCM new special templates 2023-10-31 13:45:26 +01:00
Jonathan 307fd7b8cb #8365 remove fk tncm_queue 2023-10-30 10:52:13 +01:00
Jonathan 63c74e2aa9 #8365 recovery after vscode revert error 2023-10-30 08:55:21 +01:00
Jonathan c01af3e9b6 Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 08:37:37 +01:00
Calvo aaea2e59c4 Fix MADE minor bugs 2023-10-26 16:23:07 +02:00
Calvo 763f656822 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-26 14:31:22 +02:00
Jonathan 90249d4631 #8365 NCM add backup id to ncm queue 2023-10-26 12:49:30 +02:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Daniel Cebrian 0baeee66e0 Merge branch 'develop' into ent-12288-varios-bugs-en-netflow 2023-10-24 13:50:14 +02:00
Daniel Rodriguez 3c59c40b4c Merge branch 'ent-10268-pandora_db-refactorizacion-del-sistema-de-compactacion-de-datos' into 'develop' 
Changes on compact db

Closes pandora_enterprise#10268

See merge request artica/pandorafms!6343
 2023-10-24 11:04:33 +00:00
Daniel Cebrian f419f0931d #12288 fixed filters in netflow explorer 2023-10-23 16:20:32 +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
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
felix.suarez ef2950ff56 Fix conflict 2023-10-19 14:02:32 -06:00
felix.suarez 4080f92316 Add alter to MR 2023-10-19 14:02:32 -06: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 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
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +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
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 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
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
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-25 14:08:43 +00: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
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +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
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00