Commit Graph

6819 Commits

Author SHA1 Message Date
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
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01: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
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Jose Gonzalez 977c358fa0 Grouped somethings 2022-12-19 15:08:53 +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
Jose Gonzalez fd48f54f66 Minor fix 2022-12-19 11:06:21 +01:00
jose.gonzalez@pandorafms.com 2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +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
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01: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
jose.gonzalez@pandorafms.com 744a7b47fe Minor changes 2022-12-12 11:13:33 +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
jose.gonzalez@pandorafms.com caad626c39 Minor changes 2022-12-10 14:39:17 +01: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
jose.gonzalez@pandorafms.com 5a2e969b85 Module type changes 2022-12-07 18:17:11 +01:00
KANAYAMA Akihiro 63e649be85 Removed unnecessary escape of ampersand. 2022-12-07 19:25:27 +09:00
jose.gonzalez@pandorafms.com e57f9b8794 Some changes 2022-12-05 17:31:08 +01:00
alejandro.campos@artica.es 10d3b67bfa fix task summary 2022-12-05 14:09:12 +01:00
jose.gonzalez@pandorafms.com 912f1d0d7a Module manager upgrade 2022-12-05 13:39:51 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
jose.gonzalez@pandorafms.com 4278ffff26 Module editor improvements 2022-12-02 14:25:22 +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
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +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
jose.gonzalez@pandorafms.com 9d0f465874 Minor improvements 2022-11-24 10:00:42 +01:00
jose.gonzalez@pandorafms.com 6eb9319a7a Minor fixes 2022-11-23 17:42:53 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
jose.gonzalez@pandorafms.com df11d70f12 Fix custom columns events view 2022-11-23 13:41:38 +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
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com bf1a997498 Clean footer 2022-11-22 17:41:14 +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
jose.gonzalez@pandorafms.com 7dce208df9 Update breadcrumbs for Agents and other minor fixes 2022-11-21 23:45:07 +01: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
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01: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
jose.gonzalez@pandorafms.com 88766eb7cc Fixed action-buttons 2022-11-16 16:04:22 +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
jose.gonzalez@pandorafms.com 6e41c4d1bb Agent changes 2022-11-16 12:24:11 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
jose.gonzalez@pandorafms.com 03157caefe Redo agent edition-creation view 2022-11-15 16:02:40 +01:00
jose.gonzalez@pandorafms.com 325bbea8db Agent view fixed and other minor fixes 2022-11-15 08:05:04 +01:00
jose.gonzalez@pandorafms.com bf678b55dc Several views updated 2022-11-11 16:15:17 +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
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +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
jose.gonzalez@pandorafms.com 92dd21701f View changes 2022-11-04 13:00:00 +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
jose.gonzalez@pandorafms.com 32466c6906 Changes 2022-11-03 10:18:17 +01: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
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop'
Ent 4043 proyectos banco de credenciales contrasenas para modulos

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

See merge request artica/pandorafms!5172
2022-10-28 14:00:46 +00:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
jose.gonzalez@pandorafms.com 97b249d5a5 Improved color picker 2022-10-28 10:54:30 +02:00
edu.corral d76d46c1ab ent 9466 tip icon fix 2022-10-27 13:00:39 +02:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-27 09:50:24 +00:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
#   pandora_console/general/register.php
2022-10-27 09:47:49 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com edbf7ff249 Adapted views 2022-10-26 17:04:50 +02:00
jose.gonzalez@pandorafms.com 2cb72f532c Adapted views 2022-10-26 17:00:54 +02:00
jose.gonzalez@pandorafms.com 5e4bf4863c Adapted views 2022-10-26 12:02:56 +02:00
jose.gonzalez@pandorafms.com c7aa456d60 Adapt views 2022-10-26 10:51:12 +02:00
edu.corral c32da23dd0 ent 9501 user duplicated profiles 2022-10-26 10:46:20 +02:00
Daniel Rodriguez b4bf85064c Merge branch 'ent-9687-14398-ejecucion-de-codigo-en-barra-de-busqueda-de-modulos' into 'develop'
Fix vulnerabilies

See merge request artica/pandorafms!5209
2022-10-25 15:20:20 +00:00
alejandro.campos@artica.es 6dbc71713a add enable modules massive option 2022-10-25 15:52:30 +02:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com 70d0e38382 Adapt views 2022-10-25 11:46:28 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control

See merge request artica/pandorafms!5174
2022-10-25 09:07:08 +00:00
jose.gonzalez@pandorafms.com 6b1906d178 Added control for user creation 2022-10-25 09:37:49 +02:00
jose.gonzalez@pandorafms.com 15f2a6ae88 Testing with links 2022-10-25 09:08:34 +02:00
jose.gonzalez@pandorafms.com 00de0faac3 Adapted views 2022-10-24 19:55:22 +02:00
edu.corral 66a5c8f7eb ent 7914 status scaling based on time 2022-10-24 18:04:04 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
2022-10-24 15:19:21 +00:00
Calvo 183d1ae120 Fix vulnerabilies 2022-10-24 16:44:10 +02:00
jose.gonzalez@pandorafms.com 4cf92cc995 Adapted views 2022-10-24 13:13:56 +02:00
jose.gonzalez@pandorafms.com d0fa29d2de Adapted some buttons 2022-10-24 12:06:45 +02:00
Daniel Maya 06967ad5d9 #5584 added in metaconsole 2022-10-24 12:03:18 +02:00
jose.gonzalez@pandorafms.com 83de025bc9 Several adaptations 2022-10-21 13:47:41 +02:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop'
Added ldap timeout

See merge request artica/pandorafms!5134
2022-10-21 10:28:04 +00:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Daniel Rodriguez ee0d9d92b6 Merge branch 'ent-9665-usuario-con-perfil-pandora-administrator-no-debe-poder-crear-comandos-de-alertas' into 'develop'
Ent 9665 usuario con perfil pandora administrator no debe poder crear comandos de alertas

See merge request artica/pandorafms!5200
2022-10-20 13:42:15 +00:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Daniel Maya 89bd5ec22c #9665 Fixed button 2 2022-10-20 10:42:27 +02:00
jose.gonzalez@pandorafms.com f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop'
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
2022-10-19 11:46:38 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop'
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
2022-10-19 11:00:04 +00:00
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
2022-10-18 09:25:17 +00:00
Daniel Maya fcb1cd24b5 #9665 Fixed button 2022-10-18 11:02:06 +02:00
Calvo 3f8e0f765a Fix adding agnents planned downtime 2022-10-18 09:52:08 +02:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-18 07:59:26 +02:00
Jimmy Olano ff4cff6f7a Merge branch 'ent-9208-Codigo-depuracion-expuesto-a-clientes' into 'develop'
Fix javascript injection in agent names

pandora_enterprise#9208

See merge request artica/pandorafms!5193
2022-10-17 17:28:39 +00:00
alejandro.campos@artica.es 08ab924160 fix performance issue 2022-10-17 18:08:48 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop'
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
2022-10-17 11:27:16 +00:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Rodriguez a36666f1fd Merge branch 'ent-9506-cambios-en-vista-de-usuarios-perfiles' into 'develop'
Ent 9506 cambios en vista de usuarios perfiles

See merge request artica/pandorafms!5124
2022-10-14 10:31:41 +00:00
Daniel Rodriguez af9084a4ef Merge branch 'ent-9322-token-unique-ip-da-problemas-a-la-hora-de-modificar-un-agente' into 'develop'
Fix agent edtion unique ip issues

See merge request artica/pandorafms!5145
2022-10-14 09:48:05 +00:00
Daniel Maya c63c5e9e3f #5584 Added status 2022-10-14 10:56:45 +02:00
Daniel Rodriguez 095732eab5 Merge branch 'ent-9467-no-se-pueden-cambiar-umbrales-warning-y-critical-en-ciertos-modulos' into 'develop'
Ent 9467 no se pueden cambiar umbrales warning y critical en ciertos modulos

See merge request artica/pandorafms!5148
2022-10-14 08:17:34 +00:00
Daniel Barbero 4dd311063e fixed errors view events sort and save filters pandora_enterprise#9425 2022-10-14 09:31:45 +02:00
Daniel Maya 3e9e04642d resolved conflict 2022-10-14 09:10:25 +02:00
Daniel Maya f3bc5427ba #9506 Fixed meta ajax 2022-10-13 13:22:36 +02:00
Daniel Maya fbc222155e Merge branch 'develop' into ent-9506-cambios-en-vista-de-usuarios-perfiles 2022-10-13 12:31:15 +02:00
jose.gonzalez@pandorafms.com fc37d9919c Fix javascript injection in agent names 2022-10-13 12:06:04 +02:00
alejandro.campos@artica.es 2c57873898 fix alert deletion from agent alerts 2022-10-13 12:03:15 +02:00
Daniel Rodriguez d833c7ba39 Merge branch 'ent-9485-14165-filtrado-alertas-metaconsola' into 'develop'
Ent 9485 14165 filtrado alertas metaconsola

See merge request artica/pandorafms!5128
2022-10-13 09:24:11 +00:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Calvo 1c157ba2e4 Fix reset user creation form on error 2022-10-07 13:15:44 +02:00
Daniel Maya 83ac81ab23 #9506 Fixed meta 2022-10-07 10:56:12 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
Daniel Maya 1059694685 #5584 Fixed width 2022-10-03 11:23:28 +02:00
Daniel Maya 4e68ae62ef #5584 Added edit users 2 2022-10-03 09:07:35 +02:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
Daniel Maya 87d4c03467 #5584 Added edit users 2022-09-30 14:12:18 +02:00
Daniel Rodriguez 74e291696a Merge branch 'ent-9334-mejorar-seccion-de-administrar-host-para-la-configuracion-remota-del-satellite' into 'develop'
Ent 9334 mejorar seccion de administrar host para la configuracion remota del satellite

See merge request artica/pandorafms!5117
2022-09-30 09:41:57 +00:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
2022-09-29 12:36:37 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Daniel Rodriguez 1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop'
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
2022-09-29 09:58:45 +00:00
Daniel Maya c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
alejandro.campos@artica.es 042362991d implemented option to skip inoperative interfaces on demand 2022-09-28 15:34:45 +02:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop'
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
2022-09-27 12:26:24 +00:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop'
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
2022-09-26 11:03:52 +00:00
Calvo bf5a5e16dc Fix agent edtion unique ip issues 2022-09-26 12:49:00 +02:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Daniel Rodriguez 30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop'
Added new macros

See merge request artica/pandorafms!5103
2022-09-23 13:03:48 +00:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes'
# Conflicts:
#   pandora_console/extras/mr/57.sql
2022-09-23 06:41:57 +00:00
Calvo eed28bc668 Fix user form reset if profile fails 2022-09-22 17:07:43 +02:00
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00