Commit Graph

29741 Commits

Author SHA1 Message Date
Calvo 176a94ce99 Fix tactical view user count when user is in group 2022-03-10 08:26:22 +01:00
Calvo 78ab628c8b Fix tactical view user count when user is in group 2022-03-10 08:22:45 +01:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
Daniel Rodriguez 99ba42a2c1 Merge branch 'ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes' into 'develop'
new item report agent/modules status pandora_enterprise#7653

See merge request artica/pandorafms!4691
2022-03-09 17:23:04 +00:00
Daniel Barbero Martin 2d2d10c489 fixed server name selector agent in metaconsole #7653 2022-03-09 17:05:03 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Rodriguez 1c347fa3ca Merge branch 'ent-8594-permisos-errorlog-file' into 'develop'
Set min permissions to errorlog_file

See merge request artica/pandorafms!4705
2022-03-09 15:06:10 +00:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop'
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
2022-03-09 13:20:12 +00:00
Daniel Rodriguez ebdc7e4fce Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop'
Ent 8689 error 500 en wizard de agente

See merge request artica/pandorafms!4751
2022-03-09 12:57:20 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 9f7dd951e5 Merge branch 'ent-8386-usuario-sin-acceso-a-servidores-ve-icono-con-info-de-servidores' into 'develop'
Do not show servers header icon if user has no permission node

See merge request artica/pandorafms!4723
2022-03-09 12:55:31 +00:00
Daniel Rodriguez 671dc5e923 Merge branch 'ent-8610-vulnerabilidad-en-gestion-de-usuarios-perfiles' into 'develop'
Fix credential store ACL, only accces to PM or UM

See merge request artica/pandorafms!4719
2022-03-09 12:54:41 +00:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop'
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
2022-03-09 12:54:04 +00:00
Daniel Rodriguez d73bd92157 Merge branch 'ent-8112-icono-collapse-recortado' into 'develop'
Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
2022-03-09 12:50:17 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop'
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
2022-03-09 12:48:47 +00:00
Daniel Rodriguez b6ffab0f43 Merge branch 'ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas' into 'develop'
external alerts new filters pandora_enterprise#7933

See merge request artica/pandorafms!4687
2022-03-09 12:48:04 +00:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Daniel Maya 0e70bc9f67 #8689 Fixed wizard 2022-03-08 18:00:09 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop'
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop'
Event response creation name required

See merge request artica/pandorafms!4685
2022-03-08 15:33:57 +00:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Ramon Novoa 9f03db37c1 Fix module precedence for pandora_ha. 2022-03-08 12:10:39 +01:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado'
# Conflicts:
#   pandora_console/general/main_menu.php
2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
Daniel Rodriguez c130bc8a35 Merge branch 'ent-fix-docker-timeouts' into 'develop'
adjusted sleep before try to use mysql socket, due slow runners

See merge request artica/pandorafms!4739
2022-03-04 13:26:54 +00:00
fbsanchez d9deb8e8d2 adjusted sleep before try to use mysql socket, due slow runners 2022-03-04 10:15:34 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
vgilc 16c5202987 Merge branch 'ent-fix-pandoradbdata-invalid-components' into 'develop'
removed invalid components from pandoradb_data

See merge request artica/pandorafms!4737
2022-03-03 17:51:37 +00:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
vgilc 69540c2e64 Merge branch 'ent-fix-docker-public-open' into 'develop'
removed stranger things from community dockerfile

See merge request artica/pandorafms!4735
2022-03-03 16:04:17 +00:00
fbsanchez 1e76626573 removed stranger things from community dockerfile 2022-03-03 16:42:05 +01:00
vgilc 94ab35dd7e Merge branch 'ent-fix-docker-image-from' into 'develop'
Ent fix docker image from

See merge request artica/pandorafms!4733
2022-03-03 13:40:12 +00:00
fbsanchez 73052974a3 force fallback to develop if desired branch does not exist 2022-03-03 14:28:55 +01:00
fbsanchez 4ed2d65f21 force fallback to develop if desired branch does not exist 2022-03-03 14:28:38 +01:00
vgilc a4d7653cf9 Merge branch 'ent-fix-docker-image-from' into 'develop'
Adapted to centos7

See merge request artica/pandorafms!4732
2022-03-03 10:01:43 +00:00
fbsanchez a8d669989f Adapted to centos7 2022-03-03 10:40:42 +01:00
vgilc b53b1e8a02 Merge branch 'ent-fix-docker-image-from' into 'develop'
fix-docker-image-from

See merge request artica/pandorafms!4731
2022-03-03 08:50:35 +00:00
fbsanchez d80582eead fix-docker-image-from 2022-03-03 09:39:10 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
Daniel Rodriguez 991893fa8f Merge branch 'ent-8666-error-repetitivo-en-el-pandora_server-error-llena-el-log' into 'develop'
errata fix0

See merge request artica/pandorafms!4730
2022-03-02 12:39:51 +00:00
fbsanchez 690de69aea agentmodule status str is N/A If is not defined 2022-03-02 12:20:47 +01:00
fbsanchez 9c3a6665eb str comparation 2022-03-02 12:13:20 +01:00
fbsanchez 3aaa868155 errata fix0 2022-03-02 12:09:13 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00