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

1687 Commits

Author SHA1 Message Date
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +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
Daniel Cebrian a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
Alejandro Campos fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-04 11:50:03 +00:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Alejandro Campos ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-08-22 08:43:10 +00:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Jorge Rincon baa63eac77 Merge branch develop into ent-11595-tip-de-bienvenida-planned-stops 2023-08-18 09:02:14 +02:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
Jorge Rincon ec738436eb #11881 the lts_name token is set empty 2023-08-14 13:54:09 +02:00
Jorge Rincon 1669859f03 #11881 lts_name token has been cleaned. 2023-08-14 13:18:31 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
Daniel Cebrian 4c3432cf40 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-11 11:09:49 +02:00
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Jonathan 8aff02beb9 #11864 remove foreign key id_user tevent_comment 2023-08-11 08:11:35 +02:00
Daniel Cebrian 8a312ed2cf Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 14:28:22 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02:00
Daniel Cebrian f871f4e4d0 Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 08:19:03 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan 5964cdecc0 #10598 fix error sql on create web and check web 2023-08-09 11:55:37 +02:00
Daniel Cebrian 2035286f3a #11326 fixed mr session_max_time_expire conclict 2023-08-09 10:15:48 +02:00
Daniel Cebrian 0a23448259 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-09 09:29:19 +02:00
rafael 9d08261a2c 11850 adding files to delete to delete_file.txt 2023-08-08 15:17:13 +02:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
alejandro.campos@artica.es 9f76e7cc83 update mr 2023-08-03 09:09:13 +02:00
alejandro.campos@artica.es 27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
alejandro.campos@artica.es c8393ae210 fixed snmp traps time 2023-07-18 10:40:33 +02:00
Daniel Cebrian 092e1dfd62 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:46:19 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Daniel Rodriguez 5a52abab74 Merge branch 'ent-11539-eliminar-wizard-de-metaconsola' into 'develop' 
Ent 11539 Eliminar wizard de metaconsola

See merge request artica/pandorafms!6083
 2023-07-17 07:43:51 +00:00
Alejandro Sánchez c66c0484cb Merge branch 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' into 'develop' 
9735 adding inventory_solaris.pl to plugin path on unix agent and adding...

See merge request artica/pandorafms!5595
 2023-07-11 08:09:47 +00:00
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' 
# Conflicts:
#   pandora_console/extras/mr/65.sql
 2023-07-10 09:43:28 +00:00
daniel f97cf3a824 change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 13:02:00 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00