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

27088 Commits

Author SHA1 Message Date
José González dbb7fe364f Added standard headers 2021-04-30 14:35:54 +02:00
José González ab984b8c32 Added standard headers 2021-04-30 13:50:58 +02:00
José González cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González 46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González 71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
José González c54ad46f33 Added standard header 2021-04-29 15:35:33 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Rafael Ameijeiras d87c9e0cc1 Merge branch 'ent-7463-adding-deploy-improves' into 'develop' 
adding ipam dependencies, wmic new binary and lxc support

See merge request artica/pandorafms!4087
 2021-04-29 09:13:00 +00:00
rafael.ameijeiras 70e64eb85f adding ipam dependencies, wmic new binary and lxc support 2021-04-29 11:09:06 +02:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
Daniel Rodriguez 2930306767 Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop' 
Improved business logic for cron

See merge request artica/pandorafms!4080
 2021-04-28 15:24:47 +00:00
Daniel Rodriguez 9b90039fe2 Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop' 
fixed error with meta create vent cli

See merge request artica/pandorafms!4079
 2021-04-28 14:19:21 +00:00
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop' 
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
 2021-04-28 14:18:35 +00:00
Daniel Rodriguez e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' 
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
 2021-04-28 11:24:45 +00:00
Daniel Rodriguez c71733385d Merge branch 'ent-7374-Actualizacion-cadenas-de-traduccion' into 'develop' 
update translate strings

See merge request artica/pandorafms!4063
 2021-04-28 10:53:05 +00:00
Daniel Rodriguez 7eb94fca42 Merge branch 'ent-7395-Filtro-de-eventos-en-Metaconsola-Server' into 'develop' 
Ent 7395 filtro de eventos en metaconsola server

See merge request artica/pandorafms!4071
 2021-04-28 10:50:04 +00:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Daniel Rodriguez 87eed29f1f Merge branch 'ent-7446-tamano-desplegable-module-component' into 'develop' 
fixed size with select2 in module component

See merge request artica/pandorafms!4083
 2021-04-28 10:48:32 +00:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
Daniel Rodriguez 9790be4f90 Merge branch '7248-11618-r-works-rendimiento-module_plugin-en-agente-windows' into 'develop' 
Add support for module_wait_timeout.

See merge request artica/pandorafms!4073
 2021-04-28 09:30:03 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop' 
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
 2021-04-28 08:44:26 +00:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
Daniel Rodriguez 3d3e1acef4 Merge branch 'ent-7382-fallo-visualizacion-ha' into 'develop' 
fixed visual error HA

See merge request artica/pandorafms!4067
 2021-04-27 14:33:17 +00:00
Daniel Rodriguez 2787a1f64c Merge branch 'ent-7385-no-se-actualizan-los-hilos-del-servidor-transaccional' into 'develop' 
Removed token trasnsactional_threads as manager only runs 1 thread

See merge request artica/pandorafms!4075
 2021-04-27 14:25:36 +00:00
Daniel Rodriguez 28984aa414 Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop' 
fixed error with rr and rw in report list - acls

See merge request artica/pandorafms!4068
 2021-04-27 14:07:48 +00:00
Daniel Rodriguez 443b43d743 Merge branch 'ent-7380-fallo-visualizacion-edicion-intervalo' into 'develop' 
fixed error time interval editor

See merge request artica/pandorafms!4065
 2021-04-27 14:06:13 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop' 
fixed count in several views

See merge request artica/pandorafms!4052
 2021-04-27 11:47:43 +00:00
Daniel Rodriguez 00b1596c4f Merge branch 'ent-7368-filtro-de-comentarios-de-eventos' into 'develop' 
fixed error with special charact filter in user commens

See merge request artica/pandorafms!4056
 2021-04-27 11:46:16 +00:00
Marcos Alconada 177be1f1a4 fixed error with special charact filter in user commens 2021-04-27 11:46:16 +00:00
Daniel Rodriguez 425dc74123 Merge branch 'ent-7378-create-workunit-alerts-action-form' into 'develop' 
Controlled if Integria IMS is selected for show Create workunit switch

Closes pandora_enterprise#7378

See merge request artica/pandorafms!4066
 2021-04-27 11:45:30 +00:00
Daniel Rodriguez 55c38dfc03 Merge branch 'ent-7377-fallos-en-gis-maps' into 'develop' 
fixed error with creation and updating gis maps

See merge request artica/pandorafms!4072
 2021-04-27 11:44:55 +00:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
Daniel Rodriguez 5aea0d17f0 Merge branch 'ent-7347-no-funciona-envio-de-mails-desde-servidor-con-sendgrid' into 'develop' 
Make sure encode_base64 does not break auth strings.

See merge request artica/pandorafms!4059
 2021-04-27 11:43:06 +00:00
Daniel Rodriguez bf70c342ff Merge branch 'ent-7324-notificaciones-no-llegan-en-v754' into 'develop' 
Fixed notifications when not fully configured

See merge request artica/pandorafms!4042
 2021-04-27 11:42:32 +00:00
Daniel Rodriguez 06db949689 Merge branch 'ent-7375-bug-en-creacion-de-politicas' into 'develop' 
fixed error with icon groups policies

See merge request artica/pandorafms!4060
 2021-04-27 10:39:57 +00:00
Daniel Rodriguez 4589e77bc8 Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' 
fixed error with modal cluster view

See merge request artica/pandorafms!4057
 2021-04-27 10:39:23 +00:00
Daniel Rodriguez d9a63c4682 Merge branch 'ent-7333-fallos-vista-setup' into 'develop' 
Added path check to config attachment store

See merge request artica/pandorafms!4049
 2021-04-27 10:34:09 +00:00
Luis bec8085ca5 Added path check to config attachment store 2021-04-27 10:34:08 +00:00
Daniel Rodriguez e0c7fc8c1e Merge branch 'ent-7323-Bug-visuales-y-funcionamiento-parametros-de-filtros-de-eventos' into 'develop' 
fixed filter load in events view

See merge request artica/pandorafms!4048
 2021-04-27 10:33:15 +00:00
José González d0c3174d8c Improved business logic for cron 2021-04-27 12:19:20 +02:00
marcos 9edfe43cb7 fixed error with meta create vent cli 2021-04-27 12:14:32 +02:00
Daniel Barbero Martin d3f3364830 Fixed errors display tab ehorus 2021-04-27 11:06:17 +02:00
Daniel Maya 49d2e9a437 #7404 fixed acl in event response 2021-04-27 10:19:05 +02:00
Daniel Barbero Martin 8324655aab Fixed errors SQL metaconsole events 2021-04-27 10:03:34 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
fbsanchez 5bfd86d944 Removed token trasnsactional_threads as manager only runs 1 thread 2021-04-26 21:21:01 +02:00