tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-30 14:18:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,286 Commits 34 Branches 30 Tags
Commit Graph

1371 Commits

Author SHA1 Message Date
Jorge Rincon
faffada931 Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo 2023-11-28 15:10:02 +01:00
Jonathan
837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
daniel
5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
alejandro
bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
Matias Didier
c532bfc4c7 Merge branch 'ent-11832-Cambiar-artica.es-por-pandorafms.com-en-fichero-pandoradb_data.sql' into 'develop' 
Ent 11832 cambiar artica.es por pandorafms.com en fichero pandoradb data.sql

See merge request artica/pandorafms!6433
 2023-11-28 08:23:46 +00:00
Jonathan
def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
Daniel Cebrian
3f593976cd Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-11-22 12:55:24 +01:00
vgilc
bdd4628d24 Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'" 
This reverts merge request !6674
 2023-11-21 16:00:27 +00:00
Alejandro Sánchez
06dff1e3a5 Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop' 
mr changes

See merge request artica/pandorafms!6674
 2023-11-21 15:32:32 +00:00
Enrique Martin
d84937e6c9 Added snippet script to MR and pandoradb_data.sql 2023-11-17 12:24:07 +01:00
Enrique Martin
58aeb59b2c Updated MR 2023-11-17 10:22:52 +01:00
alejandro
de7fc79d95 mr changes 2023-11-15 16:46:12 +01:00
alejandro
4579fe21d9 update version in mr 2023-11-15 14:24:42 +01:00
daniel
23f0ac8a90 add demo data pandora_enterprise#12457 2023-11-14 17:25:53 +01:00
Jorge Rincon
db91fe3127 #12451 fixed default alert action for Telegram and Vonage. 2023-11-14 15:34:14 +01:00
Daniel Cebrian
aafdf32793 #11126 refactored 2023-11-08 09:55:33 +01:00
Enrique Martin
8700d11461 Fixed agent data scripts on pandoradb_data.sql 2023-11-07 13:13:45 +01:00
Enrique Martin
86804398fe Fixed SQL issue 2023-11-06 16:50:54 +01:00
Enrique Martin
26ed76b821 Fixed SQL issue 2023-11-06 16:41:37 +01:00
Daniel Cebrian
ba64bfb882 #11126 refactored 2023-11-06 15:49:19 +01:00
Enrique Martin
c266640f39 Fixed syntax error in SQL 2023-11-06 15:07:43 +01:00
Enrique Martin
3506ba1b5a Added default NCM templates 2023-11-06 15:06:16 +01:00
Daniel Cebrian
f9f526e78e #11126 test pipeline v2 2023-10-31 12:46:16 +01:00
Daniel Cebrian
30b1aa453c #11126 test pipeline v1 2023-10-31 12:25:56 +01:00
Daniel Cebrian
0699759b60 #11126 fixed table cve 2023-10-31 11:24:45 +01:00
Daniel Cebrian
34da2f838d #1126 test for check pipe 2023-10-31 11:15:50 +01:00
Daniel Cebrian
5088149d5c Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-31 10:08:58 +01:00
Daniel Cebrian
e6ca7ce476 #11126 added binary 2023-10-31 10:04:39 +01:00
Rafael Ameijeiras
c48414ac8a Merge branch 'ent-12278-meter-por-defecto-las-integraciones-de-alertas-en-el-paquete-de-pandora-y-generar-comando-y' into 'develop' 
Added messaging alerts to pandoradb_data.sql and 66.sql

See merge request artica/pandorafms!6599
 2023-10-30 12:45:02 +00:00
Enrique Martin
f8c56c5c5c Fixed misstype in pandoradb_data.sql 2023-10-30 13:40:11 +01:00
Daniel Cebrian
200f63b516 #11126 added .disco by default 2023-10-30 10:02:11 +01:00
Daniel Cebrian
7d485c7c26 #11126 update pandora_cve 2023-10-26 11:55:19 +02:00
Enrique Martin
0d0ea46f7d Added messaging alerts to pandoradb_data.sql and 66.sql 2023-10-24 15:50:37 +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
490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02: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
Jonathan
33d20a0dae #12264 update translates and MR upload 2023-10-17 17:14:36 +02:00
Daniel Cebrian
2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +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 Cebrian
533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +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
8557c68ecd Fix pandoradb bug 2023-10-10 20:01:51 +02:00
Calvo
71c4016d63 Case insensitive option for get module id 2023-10-10 17:58:29 +02:00
Daniel Cebrian
2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +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
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