Commit Graph

6687 Commits

Author SHA1 Message Date
Daniel Rodriguez 05687a9ef2 Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop'
SO filter on policy

See merge request artica/pandorafms!5331
2022-12-23 09:38:29 +00:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00
Calvo 8f53ec448f Fix button delete inventory modules 2022-12-22 17:48:37 +01:00
Calvo fd59061800 Fix wrong link to inventory modules form 2022-12-22 17:43:49 +01:00
Calvo b46f9c9319 Move inventory to open 2022-12-22 12:47:03 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
Rafael Ameijeiras 925749dc5f Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop'
Ent 9052 lista de modulos de un agente ordenar filtros y controles

See merge request artica/pandorafms!5327
2022-12-22 09:35:41 +00:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +01:00
Rafael Ameijeiras 64510a6e31 Merge branch 'ent-9059-vista-de-grupos-de-agentes-acortar-y-ordenar-filtro' into 'develop'
Ent 9059 vista de grupos de agentes acortar y ordenar filtro

See merge request artica/pandorafms!5322
2022-12-21 13:41:31 +00:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Rafael Ameijeiras 9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop'
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
2022-12-21 11:49:39 +00:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop'
implement cluster in open project

See merge request artica/pandorafms!5204
2022-12-21 09:05:01 +00:00
Jonathan f62116bf92 #1270 deleche children modules on checked 2022-12-21 08:44:11 +01:00
Rafael Ameijeiras 5934b02738 Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop'
fixed csrf

See merge request artica/pandorafms!5336
2022-12-20 17:50:21 +00:00
Rafael Ameijeiras 7091654e65 Merge branch 'ent-9844-bug-en-el-filtro-de-alertas' into 'develop'
Fix alert list view search bug

See merge request artica/pandorafms!5319
2022-12-20 17:49:07 +00:00
Rafael Ameijeiras e0b5abba31 Merge branch 'ent-9738-14457-Cambio-de-nodo-en-Informe-SQL-no-funciona-tras-edicion-META' into 'develop'
fixed report update

See merge request artica/pandorafms!5334
2022-12-20 13:38:54 +00:00
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Rafael Ameijeiras 96d08a3c7a Merge branch 'ent-9978-permission-for-massive-operation-in-enterpriseacl-does-not-work' into 'develop'
Ent 9978 permission for massive operation in enterpriseacl does not work

See merge request artica/pandorafms!5316
2022-12-20 11:49:08 +00:00
Rafael Ameijeiras 9e0cff685a Merge branch 'ent-9953-No-se-puede-añadir-informacion-GIS-de-los-agentes-manualmente-desde-a-consola-php8' into 'develop'
minor fix

See merge request artica/pandorafms!5333
2022-12-20 11:47:43 +00:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
alejandro.campos@artica.es 8f3f8679d5 Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open 2022-12-16 11:29:00 +01:00
Jonathan 97c967ede8 Disable enter on profiles create/edit for duplicate profile name check 2022-12-16 09:53:10 +01:00
Jonathan 14b884b53d Trim duplicate profile before post to save 2022-12-15 15:37:46 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2022-12-15 14:05:27 +00:00
Rafael Ameijeiras bd509ea4f0 Merge branch 'ent-9780-14458-No-se-ve-informacion-en-tareas-Discovery' into 'develop'
fix task summary

See merge request artica/pandorafms!5313
2022-12-15 13:35:58 +00:00
alejandro.campos@artica.es 26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
alejandro.campos@artica.es b9c49fed84 fixed report update 2022-12-14 12:16:48 +01:00
alejandro.campos@artica.es 2106cac36a minor fix 2022-12-14 11:23:32 +01:00
Luis 897bca7807 SO filter on policy 2022-12-14 09:11:29 +01:00
Rafael Ameijeiras e510460399 Merge branch 'ent-9983-500-en-operaciones-masivas-767-y-error-php-8' into 'develop'
Fix alerts bulk operations error 500

See merge request artica/pandorafms!5326
2022-12-13 10:52:02 +00:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
	pandora_console/extras/mr/59.sql
2022-12-13 09:17:39 +01:00
Pablo Aragon 030c50e533 9052 Edit styles of Manage agents / Modules 2022-12-12 18:53:11 +01:00
Calvo af53d63457 Fix alerts bulk operations error 500 2022-12-12 16:51:37 +01:00
Rafael Ameijeiras 44655d7ae3 Merge branch 'ent-9152-Opcion-de-habilitar-modulos-en-grupos-en-la-vista-de-agente' into 'develop'
add enable modules massive option

See merge request artica/pandorafms!5215
2022-12-12 11:57:27 +00:00
Rafael Ameijeiras bb22bf87a9 Merge branch 'ent-8755-Poder-editar-plugins-de-servidor' into 'develop'
change update constraints for server plugins

See merge request artica/pandorafms!5261
2022-12-12 11:49:39 +00:00
Pablo Aragon 33c10f3c1a #9059 Change sizes search 2022-12-12 11:22:28 +01:00
Jonathan b11f047332 Change "safe" for "save" on profile duplicate 2022-12-12 10:50:59 +01:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
Rafael Ameijeiras cedee1a3fa Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop'
Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado

See merge request artica/pandorafms!5258
2022-12-12 08:21:16 +00:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop'
implemented custom field

See merge request artica/pandorafms!5271
2022-12-12 08:20:08 +00:00
Jonathan 0b6d1a7840 #9903 Duplicate control profile 2022-12-09 11:37:08 +01:00
Luis Calvo cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
Luis Calvo aa85c73a3c Fix alert list view search bug 2022-12-09 08:59:03 +01:00
KANAYAMA Akihiro 63e649be85 Removed unnecessary escape of ampersand. 2022-12-07 19:25:27 +09:00
alejandro.campos@artica.es 10d3b67bfa fix task summary 2022-12-05 14:09:12 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
Daniel Maya 755b9ec2a3 #9960 Fixed array_unique and array_reverse in pandora open 2022-12-01 09:40:46 +01:00
Daniel Maya 5bca791021 #9954 Fixed table 2022-11-30 15:57:49 +01:00
alejandro.campos@artica.es 2925df80e9 changed wrong count 2022-11-29 12:04:03 +01:00
alejandro.campos@artica.es 6243229345 changed wrong count 2022-11-29 11:54:25 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
Jimmy Olano 38a6e59e6b Merge branch 'ent-9865-en-metaconsola-actualizar-la-notificacion-del-warp-update-para-php-8-a-partir-de-la-version-767' into 'develop'
Ent 9865 en metaconsola actualizar la notificacion del warp update para php 8 a partir de la version 767

Ref: pandora_enterprise#9865

See merge request artica/pandorafms!5285
2022-11-23 11:15:04 +00:00
Rafael Ameijeiras ce18775ac0 Merge branch 'ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea' into 'develop'
Ent 9501 tenencia de mismos permisos de manera simultanea

See merge request artica/pandorafms!5218
2022-11-23 10:03:19 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
alejandro.campos@artica.es 743fef7d58 Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea 2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es 5accae9d47 minor changes 2022-11-23 10:30:53 +01:00
alejandro.campos@artica.es f03cd5ec8c implemented link type custom field 2022-11-22 20:40:22 +01:00
alejandro.campos@artica.es b097046fc4 constraint when creating existing profiles 2022-11-22 17:09:13 +01:00
Calvo 4e9bc2d6ef Update messages to php8 2022-11-22 16:31:09 +01:00
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Rodriguez 49d0f336fd Merge branch 'ent-9514-14202-Problemas-ACL-Enterprise-no-deja-borrar-alertas' into 'develop'
fix alert deletion from agent alerts

See merge request artica/pandorafms!5192
2022-11-22 14:04:08 +00:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
Diego Muñoz-Reja ad812e1643 Merge branch 'ent-9620-borrado-masivo-de-elementos-en-cv-no-funciona' into 'develop'
Ent 9620 borrado masivo de elementos en cv no funciona

See merge request artica/pandorafms!5252
2022-11-22 09:16:07 +00:00
Jimmy Olano 0363e94e34 Merge branch 'ent-9466-minimizar-ventana-en-configuracion-de-agente-superpone-iconos' into 'develop'
Ent 9466 minimizar ventana en configuracion de agente superpone iconos

#9466

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9466

See merge request artica/pandorafms!5222
2022-11-21 15:22:38 +00:00
Daniel Rodriguez e8c9683add Merge branch 'ent-9849-14554-Fallo-en-creacion-de-Custom-Graphs' into 'develop'
minor fix

See merge request artica/pandorafms!5274
2022-11-21 13:40:51 +00:00
alejandro.campos@artica.es c56787c459 visual fix 2022-11-21 09:55:35 +01:00
alejandro.campos@artica.es 1eb8b7d19e minor fix 2022-11-18 14:21:31 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
Calvo ef7ea84beb Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:26:25 +01:00
Calvo b537fd042c Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:20:52 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es 4425825908 change update constraints for server plugins 2022-11-10 14:19:01 +01:00
edu.corral 47596dd300 ent 9557 delete private dashboards when deleting user 2022-11-10 12:14:44 +01:00
Daniel Rodriguez 3417ec9421 Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop'
fix performance issue

See merge request artica/pandorafms!5199
2022-11-07 16:05:58 +00:00
Diego Muñoz-Reja f637bc12b8 Merge branch 'ent-9762-14476-reporte-de-eventos-de-todos-los-nodos-desde-metaconsola' into 'develop'
fix report agent groups pandora_enterprise#9762

See merge request artica/pandorafms!5250
2022-11-07 15:55:54 +00:00
edu.corral c092b0d941 ent 9620 massive removal of visual console items 2022-11-07 16:41:12 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop'
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
2022-11-07 12:44:23 +00:00
Daniel Barbero 0b3b1c4ec0 fix report agent groups pandora_enterprise#9762 2022-11-07 11:37:26 +01:00
edu.corral 341fe37def ent 7914 status scaling based on time 2022-11-04 12:13:38 +01:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop'
Ent 9722 cartel de licencia expirada

#9722

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722

See merge request artica/pandorafms!5237
2022-11-04 10:07:56 +00:00
edu.corral 1ff9b8c420 ent 7914 time based status scaling components 2022-11-04 09:45:06 +01:00
alejandro.campos@artica.es 514b350e14 fixed performance problems 2022-11-03 18:20:39 +01:00
edu.corral ced830b52b ent 9722 exp license warning pm 2022-11-03 16:01:30 +01:00
edu.corral 1994db7f5c ent 9722 expired license warning PM 2022-11-03 15:42:13 +01:00
Daniel Rodriguez c678207f5d Merge branch 'ent-9746-error-500-en-la-edicion-de-module-groups' into 'develop'
fix error 500 in module groups pandora_enterprise#9746

See merge request artica/pandorafms!5242
2022-11-03 12:07:47 +00:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
Daniel Barbero ea0274b63f fix error 500 in module groups pandora_enterprise#9746 2022-11-03 10:02:05 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Rodriguez 65048966bf Merge branch 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' into 'develop'
implemented option to skip inoperative interfaces on demand

See merge request artica/pandorafms!5149
2022-10-31 15:55:29 +00:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-31 10:46:44 +00:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
2022-10-28 15:18:15 +00:00