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

22334 Commits

Author SHA1 Message Date
Alejandro Fraguas 970cbbb4be Merge branch 'ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker' into 'develop' 
module_interval in broker (linux agents)

See merge request artica/pandorafms!2709
 2019-09-25 15:34:48 +02:00
Daniel Rodriguez e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' 
fixed error percentil label

See merge request artica/pandorafms!2734
 2019-09-25 10:27:13 +02:00
artica 0a6c5352e6 Auto-updated build strings. 2019-09-25 00:01:10 +02:00
fbsanchez 3be05cf385 added module_interval feature to broker agents 2019-09-24 19:13:55 +02:00
fbsanchez afe730d4c4 Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker 2019-09-24 19:09:33 +02:00
Alejandro Fraguas 8cca9d5f64 Merge branch 'ent-4616-discovery-en-windows' into 'develop' 
Windows: Revisión general Pandora - Discovery

See merge request artica/pandorafms!2715
 2019-09-24 19:07:55 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Rodriguez 8e728eed6b Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop' 
changed style on tables pdf report

See merge request artica/pandorafms!2718
 2019-09-24 12:33:46 +02:00
fbsanchez ce19ac529f Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker 2019-09-24 12:27:38 +02:00
Daniel Rodriguez 2798512208 Merge branch 'ent-4680-fallos-en-los-reports-de-eventos' into 'develop' 
Fixed bug in report items

See merge request artica/pandorafms!2750
 2019-09-24 12:06:14 +02:00
Daniel Rodriguez 8327cbc794 Merge branch 'ent-4615-implementar-cifrado-en-los-contenedores-de-credenciales-usando-el-sistema-de-cifrado-interno-de-pandora' into 'develop' 
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora

See merge request artica/pandorafms!2744
 2019-09-24 11:25:53 +02:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
artica 1d58e25a88 Auto-updated build strings. 2019-09-24 00:01:11 +02:00
fbsanchez f122cf0997 Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker 2019-09-23 16:30:57 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
Alejandro Fraguas bf15240d7c Merge branch 'ent-2391-instalador-agente-tarball-integrar-con-systemd' into 'develop' 
Added pandora_agente_daemon service to systemd

See merge request artica/pandorafms!2702
 2019-09-23 13:13:22 +02:00
Daniel Rodriguez 596bd6a566 Merge branch 'ent-4667-aadcm-peta-la-ejecucion-de-tareas-programadas' into 'develop' 
web2image control phantomjs flow

See merge request artica/pandorafms!2739
 2019-09-23 11:40:08 +02:00
artica 2543f54413 Auto-updated build strings. 2019-09-23 00:01:17 +02:00
artica b763650177 Auto-updated build strings. 2019-09-22 00:01:06 +02:00
artica 27d8c5025e Auto-updated build strings. 2019-09-21 00:01:09 +02:00
Alejandro Fraguas 0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop' 
pandora HA review

See merge request artica/pandorafms!2654
 2019-09-20 13:57:03 +02:00
Daniel Rodriguez 409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop' 
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
 2019-09-20 11:57:58 +02:00
Ramon Novoa 0bdf967259 Temporarily disable cert verification for STARTTLS too. 2019-09-20 10:36:56 +02:00
artica d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Daniel Rodriguez 28559f4fcb Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop' 
Add new visual console Host Alive Keep Alive

See merge request artica/pandorafms!2701
 2019-09-19 16:10:33 +02:00
Ramon Novoa 274b6b9327 Disable certificate verification until it can be turned on/off from the console. 2019-09-19 15:27:46 +02:00
Ramon Novoa 0e281c7a0a Send sendmail errors to pandora_server.error. 2019-09-19 12:43:31 +02:00
Marcos Alconada 6107d141c0 Update pandoradb_data.sql 2019-09-19 12:40:53 +02:00
Daniel Rodriguez 91117e3d60 Merge branch 'ent-3878-report-sumation-no-funciona-bien' into 'develop' 
Fixed bug

See merge request artica/pandorafms!2741
 2019-09-19 12:17:35 +02:00
Luis Calvo 37fd876a22 Fixed bug 2019-09-19 10:31:54 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
artica 14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
Daniel Rodriguez d939bf9e93 Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop' 
Ent 3878 report type summation not working properly migratesql

See merge request artica/pandorafms!2738
 2019-09-18 17:54:17 +02:00
fbsanchez 42c0fa9a5a web2image control phantomjs flow 2019-09-18 16:58:02 +02:00
Alejandro Fraguas 4adf584827 Merge branch 'ent-4655-nomenclatura-licencia' into 'develop' 
Changed caption Expires

See merge request artica/pandorafms!2736
 2019-09-18 16:49:55 +02:00
Luis 0c72fe718c Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-09-18 16:42:09 +02:00
Luis Calvo 4628e41f69 Added missing changes to pandora_migratte 2019-09-18 16:39:05 +02:00
Jose Gonzalez be1cde5466 Deleted tests 2019-09-18 15:41:20 +02:00
Jose Gonzalez a4e22d325d Solved issue 2019-09-18 15:39:33 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Jose Gonzalez 73a341912f Changed caption Expires 2019-09-18 13:35:11 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Luis Calvo 43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
Daniel Rodriguez c20fcd6366 Merge branch 'ent-4419-error-sql-filtrar-instrucciones-de-evento' into 'develop' 
Event column instructions maked unsortabe

See merge request artica/pandorafms!2733
 2019-09-18 10:58:36 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
Luis Calvo 0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
Luis Calvo e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2669
 2019-09-17 11:36:07 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00