Commit Graph

25590 Commits

Author SHA1 Message Date
Rafael Ameijeiras 6b4bc8b9b0 Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop'
Ent 9903 no permitir nombres de perfiles duplicados

See merge request artica/pandorafms!5321
2022-12-28 10:01:46 +00:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras b9d33a6315 Merge branch 'ent-10044-bugs-vista-snmp-traps' into 'develop'
Ent 10044 bugs vista snmp traps

See merge request artica/pandorafms!5353
2022-12-28 09:58:38 +00:00
Rafael Ameijeiras 1cb7149db3 Merge branch 'ent-10048-bug-mail-to-admin-en-monitoring-alert-details' into 'develop'
Ent 10048 bug mail to admin en monitoring alert details

See merge request artica/pandorafms!5355
2022-12-28 09:58:08 +00:00
Rafael Ameijeiras 19b74922a8 Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop'
Ent 9587 busqueda doble en vista de agentes

See merge request artica/pandorafms!5360
2022-12-28 09:56:34 +00:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop'
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
2022-12-28 09:49:42 +00:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop'
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
2022-12-28 09:42:23 +00:00
Rafael Ameijeiras 171fb5ed46 Merge branch 'ent-9825-no-se-suben-imagenes-por-file-manager-en-meta' into 'develop'
Ent 9825 no se suben imagenes por file manager en meta

See merge request artica/pandorafms!5358
2022-12-28 09:41:37 +00:00
Rafael Ameijeiras 46c59c3880 Merge branch 'ent-9827-bug-external-link-vacio-pantalla-de-inicio-de-usuario' into 'develop'
Ent 9827 bug external link vacio pantalla de inicio de usuario

See merge request artica/pandorafms!5356
2022-12-28 09:40:33 +00:00
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop'
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
2022-12-28 09:37:04 +00:00
Jonathan 3caaf3a2a5 #9587 agent view - filter alerts when filter on list of modules 2022-12-28 10:03:31 +01:00
artica ffb5172509 Auto-updated build strings. 2022-12-28 01:00:58 +01:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
Calvo f8b3183ad3 Moved inventory blacklist to open 2022-12-27 13:02:03 +01:00
daniel 8273450332 phpchartjs pandora_enterprise#9554 2022-12-27 12:48:09 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Pablo Aragon 6a528496cd 9825 Add function get file via POST 2022-12-27 08:41:15 +01:00
artica 46a924c4f4 Auto-updated build strings. 2022-12-27 01:00:48 +01:00
artica e613ed0d1b Auto-updated build strings. 2022-12-26 01:00:52 +01:00
artica 73de629e73 Auto-updated build strings. 2022-12-25 01:00:31 +01:00
artica d5c8ba741f Auto-updated build strings. 2022-12-24 01:00:27 +01:00
Jonathan 1536b8dbf8 #9827 no redirection on login when url empty on config user 2022-12-23 12:07:27 +01:00
daniel c32483a38a phpchartjs pandora_enterprise#9554 2022-12-23 11:34:35 +01:00
Pablo Aragon 9073349e94 10048 Exclude id_alert_action from query 2022-12-23 11:10:36 +01:00
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
Pablo Aragon fe548936a0 10048 Exclude id_alert_action from query 2022-12-23 10:29:18 +01:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00
Rafael Ameijeiras c25ad3d4ea Merge branch 'ent-9932-errores-en-consola-del-navegador-de-filtro-del-snmp-browser' into 'develop'
Fi browser console reporting errors

See merge request artica/pandorafms!5330
2022-12-23 07:43:21 +00:00
artica b32c8d43ea Auto-updated build strings. 2022-12-23 01:00:49 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Calvo 617c044a92 Fix js snmp browser errors 2022-12-22 20:10:02 +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
Daniel Rodriguez b64ce98241 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' into 'develop'
Ent 8297 mejoras en gestion de acceso a pandora md5 sha256 y salt opcional

See merge request artica/pandorafms!5343
2022-12-22 15:38:45 +00:00
Jonathan b666a3c308 #10044 Fix limit on rows showing on monitoring snmp console traps 2022-12-22 16:32:17 +01:00
Rafael Ameijeiras 87984e2358 Merge branch 'ent-9720-widget-module-histogram-no-muestra-cambios-de-estado' into 'develop'
convert histogram in SLA + warning pandora_enterprise#9720

See merge request artica/pandorafms!5350
2022-12-22 12:39:10 +00:00
daniel 2b104ca905 phpchartjs pandora_enterprise#9554 2022-12-22 13:13:10 +01:00
Calvo b46f9c9319 Move inventory to open 2022-12-22 12:47:03 +01:00
daniel baea5c36b4 fix histogram pandora_enterprise#9720 2022-12-22 12:08:03 +01:00
Daniel Rodriguez 1ed35a8769 Merge branch 'ent-10050-actualizacion-traducciones' into 'develop'
translates pandora_enterprise#10050

See merge request artica/pandorafms!5347
2022-12-22 10:40:40 +00: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
Pablo Aragon b4dfc5993f 9991 Change Skin label to Theme 2022-12-22 11:01:21 +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
artica 71544593e7 Auto-updated build strings. 2022-12-22 01:00:18 +01:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +01:00
Jonathan 8a68018c64 #10049 fix error500 edit cluster metaconsole 2022-12-21 15:38:34 +01:00
daniel 9cfdcc765c convert histogram in SLA + warning pandora_enterprise#9720 2022-12-21 15:33:39 +01:00
Rafael Ameijeiras 9881cd82fc Merge branch 'ent-9994-no-selecciona-module-group-correctamente-al-crear-un-modulo' into 'develop'
Ent 9994 no selecciona module group correctamente al crear un modulo

See merge request artica/pandorafms!5346
2022-12-21 13:43:10 +00: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
alejandro.campos@artica.es 4ee89b5b3e fixed count query for admin user 2022-12-21 13:39:03 +01:00
daniel b2f82807f1 translates pandora_enterprise#10050 2022-12-21 13:11:24 +01:00
Pablo Aragon 78c4f15c16 9994 Add trigger to id_module_group 2022-12-21 12:56:26 +01: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 1dee676d5b phpchartjs pandora_enterprise#9554 2022-12-21 12:33:53 +01:00
Jonathan fa0a38b1a7 #1270 Not delete cascade for cluster modules 2022-12-21 11:54:41 +01:00
Rafael Ameijeiras b79d3d9a08 Merge branch 'ent-9463-Mejorar-linkado-mapas-de-red' into 'develop'
Ent 9463 mejorar linkado mapas de red

See merge request artica/pandorafms!5339
2022-12-21 10:53:29 +00:00
daniel 872b079b20 fix errors in new charts pandora_enterprise#9554 2022-12-21 11:49:57 +01:00
alejandro.campos@artica.es 3970c3b7c1 fixed 500 2022-12-21 10:43:43 +01:00
daniel 36eda00ae6 fix errors in new charts pandora_enterprise#9554 2022-12-21 10:07:18 +01: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
artica 258c4c2c9f Auto-updated build strings. 2022-12-21 01:00:22 +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
Diego Muñoz-Reja de0efc7f3a Merge branch 'ent-9965-error-sql-en-busqueda-de-widgets' into 'develop'
Fix sql error on widget search

See merge request artica/pandorafms!5323
2022-12-20 15:04:58 +00:00
alejandro.campos@artica.es 73e8495f96 removed enterprise limitation 2022-12-20 15:43:05 +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
daniel ae88c33aad composer static phpchartjs pandora_enterprise#9554 2022-12-20 14:22:13 +01:00
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Rafael Ameijeiras 434fd17277 Merge branch 'ent-9908-Fallo-en-filtro-de-eventos-metaconsola-al-modificar-el-autorrefresco' into 'develop'
fix bug when loading filters from base64 string

See merge request artica/pandorafms!5332
2022-12-20 12:54:56 +00:00
alejandro.campos@artica.es 5520daead9 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' of brutus.artica.es:artica/pandorafms into ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional 2022-12-20 13:41:44 +01:00
alejandro.campos@artica.es 90e5205b16 changed admin pass encryption 2022-12-20 13:41:25 +01:00
Alejandro Campos 93c1c040dd Merge branch 'develop' into 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional'
# Conflicts:
#   pandora_console/extras/mr/60.sql
2022-12-20 12:05:31 +00: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 2e48d51714 change version 768-MR60 pandora_enterprise#9554 2022-12-20 12:32:41 +01:00
alejandro.campos@artica.es 22b63222c9 bcrypt implementation 2022-12-20 12:27:58 +01:00
Rafael Ameijeiras e642ca29b5 Merge branch 'ent-9922-no-se-puede-filtrar-por-tags-en-la-vista-de-alertas' into 'develop'
Fix alert list tag filter

See merge request artica/pandorafms!5315
2022-12-20 11:25:53 +00:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
alejandro.campos@artica.es bd7480a1e1 bcrypt implementation 2022-12-20 12:22:43 +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
Daniel Rodriguez 0f4e3d4056 Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos

See merge request artica/pandorafms!5255
2022-12-20 10:20:26 +00:00
Daniel Maya 23407892b9 #9292 fixed issues 3 2022-12-20 10:03:45 +01:00
artica 38b946c326 Auto-updated build strings. 2022-12-20 01:00:21 +01:00
Jonathan 618c07bf40 #1270 Add document module_check_childrens_and_delete function 2022-12-19 17:08:32 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Daniel Maya 091dda3eea #9292 fixed issues 2 2022-12-19 16:30:41 +01:00
Rafael Ameijeiras e18277bc89 Merge branch 'ent-9847-cambiar-plugins-de-inventario-remoto-de-windows-para-que-usen-pandorawmic-2' into 'develop'
added updates to mr with new code to update the scripts and changed the code...

See merge request artica/pandorafms!5337
2022-12-19 14:33:52 +00:00
Rafael Ameijeiras 6982d79bbd Merge branch 'ent-9912-14580-guardia-problema-ejecucion-en-la-tareas-programadas' into 'develop'
Ent 9912 14580 guardia problema ejecucion en la tareas programadas

See merge request artica/pandorafms!5296
2022-12-19 14:33:01 +00:00
Daniel Maya aa34653049 #9292 fixed issues 2022-12-19 11:51:43 +01:00
Rafael Ameijeiras b640b9f7b9 Merge branch 'ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard' into 'develop'
new widget datamatrix pandora_enterprise#8619

See merge request artica/pandorafms!5257
2022-12-19 10:49:45 +00: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
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero 105109f0fb add icon datamatrix widget pandora_enterprise#8619 2022-12-19 09:37:01 +01:00
Daniel Maya c9cac037f1 #9783 Fixed networkmap 3 2022-12-19 09:01:02 +01:00
artica 87c8dac3af Auto-updated build strings. 2022-12-19 01:00:16 +01:00
artica de5aae51e0 Auto-updated build strings. 2022-12-18 01:00:18 +01:00
artica acc527dc1a Auto-updated build strings. 2022-12-17 01:00:20 +01:00
Daniel Barbero 1d01b8257d WIP pandora_enterprise#9554 2022-12-16 14:28:04 +01:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro.campos@artica.es 7e507d454b change password field length 2022-12-16 12:12:11 +01:00
alejandro.campos@artica.es 2922276654 minor change 2022-12-16 11:38:40 +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
alejandro.campos@artica.es 11c4319dd7 added link to node name 2022-12-16 11:19:23 +01:00
alejandro.campos@artica.es 69631da08a added link to node name 2022-12-16 11:17:47 +01:00
alejandro.campos@artica.es 38d279581a added link to node name 2022-12-16 11:09:04 +01:00
Daniel Barbero 445dc8d973 fixed js render 2022-12-16 10:39:12 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
Jonathan 97c967ede8 Disable enter on profiles create/edit for duplicate profile name check 2022-12-16 09:53:10 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
artica 48c8f31352 Auto-updated build strings. 2022-12-16 01:00:18 +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 32c07afdf4 Merge branch 'ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api' into 'develop'
Added ACL to apì get tree agents plugin user and plugin pass

See merge request artica/pandorafms!5214
2022-12-15 13:38:29 +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 4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
Luis 0351886e1b ACL api get tree agents 2022-12-15 12:39:06 +01:00
alejandro.campos@artica.es 26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
artica de946e56e8 Auto-updated build strings. 2022-12-15 01:00:18 +01:00
Luis 7716157b8d Merge remote-tracking branch 'origin/develop' into ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api 2022-12-14 16:25:36 +01:00
alejandro.campos@artica.es b9c49fed84 fixed report update 2022-12-14 12:16:48 +01:00
Rafael Ameijeiras 50b7fc7c7a Merge branch 'ent-9349-14050-authtoken-hash-se-ve-en-treeview-metaconsola' into 'develop'
Hide meta treeview user hash

See merge request artica/pandorafms!5225
2022-12-14 10:48:38 +00:00
Daniel Maya 52e2ccba54 #9783 Fixed networkmap 2 2022-12-14 11:27:51 +01:00
alejandro.campos@artica.es 2106cac36a minor fix 2022-12-14 11:23:32 +01:00
alejandro.campos@artica.es 6a21efc42c fix bug when loading filters from base64 string 2022-12-14 11:08:24 +01:00
Luis 897bca7807 SO filter on policy 2022-12-14 09:11:29 +01:00
artica 37c6a8a67b Auto-updated build strings. 2022-12-14 01:00:18 +01:00
Luis ad39ca397e Fi browser console reporting errors 2022-12-13 20:08:04 +01:00
Diego Muñoz-Reja eb212e3c8a Merge branch 'ent-9833-no-funciona-busqueda-general-de-usuarios-en-open' into 'develop'
Ent 9833 no funciona busqueda general de usuarios en open

See merge request artica/pandorafms!5277
2022-12-13 16:16:04 +00:00
alejandro.campos@artica.es e3f4842e60 visual change 2022-12-13 16:00:35 +01:00
alejandro.campos@artica.es 45e91762a9 visual change 2022-12-13 15:27:58 +01:00
alejandro.campos@artica.es e5f2c83120 minor change 2022-12-13 15:25:16 +01:00
Rafael Ameijeiras f6b4631b50 Merge branch 'ent-9597-derivado-del-trabajo-q-a-765-cambiar-el-puerto-por-defecto-en-la-integracion-con-ehorus' into 'develop'
Changed eHorus default port

See merge request artica/pandorafms!5324
2022-12-13 14:22:47 +00:00
Rafael Ameijeiras 44e22d1675 Merge branch 'ent-9498-14180-perfil-de-usuario-sin-grupo-asignado-en-llamada-por-api' into 'develop'
Check group and profile exist on api add permission user to group

See merge request artica/pandorafms!5223
2022-12-13 14:22:16 +00:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional'
# Conflicts:
#   pandora_console/extras/mr/60.sql
2022-12-13 11:42:41 +00:00
alejandro.campos@artica.es 79e9597dd5 implemented alert warning in visual consoles 2022-12-13 12:03:13 +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
Rafael Ameijeiras 30eac6dc6e Merge branch 'ent-10000-error-500-en-llamada-api-tree_agents' into 'develop'
Ent 10000 error 500 en llamada api tree agents

See merge request artica/pandorafms!5325
2022-12-13 10:48:15 +00:00
Daniel Barbero 14f548aa3a fixed error format data datamatrix pandora_enterprise#8619 2022-12-13 11:06:42 +01:00
Daniel Barbero eecda4560a fixed error pagination datamatrix pandora_enterprise#8619 2022-12-13 10:41:38 +01:00
Daniel Barbero 2d638a61cf Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-12-13 09:59:30 +01:00
Daniel Barbero cbc598eb03 fixed minor error pandora_enterprise#9135 2022-12-13 09:30:56 +01: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
Daniel Barbero 5f91d2b077 new chart chartjs pandora_enterprise#9554 2022-12-13 09:11:29 +01:00
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
artica 1ebe09698b Auto-updated build strings. 2022-12-13 01:00:57 +01:00
Rafael Ameijeiras 884e07d11e Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop'
Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos

See merge request artica/pandorafms!5251
2022-12-12 22:54:27 +00:00
Rafael Ameijeiras d3a079765d Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop'
add new macro event response group_contact pandora_enterprise#9246

See merge request artica/pandorafms!5240
2022-12-12 22:53:21 +00: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
Daniel Maya 198f539901 #10000 Fixed api call tree_agents 2022-12-12 16:39:14 +01:00
Calvo 0eb33032ac Changed eHorus default port 2022-12-12 16:17:11 +01:00
Calvo 6913f237dc Fix sql error on widget search 2022-12-12 15:48:10 +01:00
Rafael Ameijeiras 8a6e3e5e06 Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854

See merge request artica/pandorafms!5246
2022-12-12 14:02:36 +00: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
Rafael Ameijeiras 75be3a0c66 Merge branch 'ent-9508-superposicion-de-texto-en-dashboards' into 'develop'
Fix dashboard dialog tranlations and search bar size

See merge request artica/pandorafms!5314
2022-12-12 08:19:39 +00:00
Rafael Ameijeiras 7ea46174c1 Merge branch 'ent-9496-14178-bug-api-validacion-valores-de-entrada' into 'develop'
Fix module type validadion on api set create network module

See merge request artica/pandorafms!5224
2022-12-12 08:14:08 +00:00
Rafael Ameijeiras 1b3535da58 Merge branch 'ent-9709-crear-el-usuario-admin-como-local-por-defecto' into 'develop'
Ent 9709 crear el usuario admin como local por defecto

See merge request artica/pandorafms!5256
2022-12-12 08:12:42 +00:00
Rafael Ameijeiras dab898aaa0 Merge branch 'ent-9873-14572-imagenes-personalizadas-en-elementos-servicios-de-consola-visual-desaparecen' into 'develop'
Ent 9873 14572 imagenes personalizadas en elementos servicios de consola visual desaparecen

See merge request artica/pandorafms!5301
2022-12-12 08:10:10 +00:00
Rafael Ameijeiras bca3cf82c7 Merge branch 'ent-9851-14558-visualizacion-erronea-de-imagenes-en-la-pantalla-de-login' into 'develop'
Ent 9851 14558 visualizacion erronea de imagenes en la pantalla de login

See merge request artica/pandorafms!5292
2022-12-12 08:09:11 +00:00
artica ccde106851 Auto-updated build strings. 2022-12-12 01:00:47 +01:00
artica e57b0af2a3 Auto-updated build strings. 2022-12-11 01:00:15 +01:00
artica bdbd313a0d Auto-updated build strings. 2022-12-10 01:00:15 +01:00
alejandro.campos@artica.es 0f8b7ad834 removed linebreak 2022-12-09 12:50:13 +01:00
alejandro.campos@artica.es 39920692ef Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional 2022-12-09 12:49:04 +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
artica f2ad934c92 Auto-updated build strings. 2022-12-09 01:00:14 +01:00
artica 7cba39d358 Auto-updated build strings. 2022-12-08 01:00:15 +01:00
Daniel Maya 3351b6b9bd #9783 Fixed networkmap 2022-12-07 15:54:40 +01:00
KANAYAMA Akihiro 63e649be85 Removed unnecessary escape of ampersand. 2022-12-07 19:25:27 +09:00
Calvo 51e6e5b0a1 Fix alert list tag filter 2022-12-07 11:24:09 +01:00
artica 4f194134cc Auto-updated build strings. 2022-12-07 01:00:41 +01:00
artica 0f9977acca Auto-updated build strings. 2022-12-06 01:00:13 +01:00
Calvo c5c36dab8b Fix dashboard dialog tranlations and search bar size 2022-12-05 17:20:08 +01:00
alejandro.campos@artica.es 10d3b67bfa fix task summary 2022-12-05 14:09:12 +01:00
artica d91ba1b4e1 Auto-updated build strings. 2022-12-05 01:00:14 +01:00
artica c9f1cd6566 Auto-updated build strings. 2022-12-04 01:00:15 +01:00
artica 30a4e4af3a Auto-updated build strings. 2022-12-03 01:00:16 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
Calvo e0afcd0b85 WIP: Download wait message. datatables 2022-12-02 13:12:58 +01:00
Rafael Ameijeiras 86491e3a78 Merge branch 'ent-9948-Varios-problemas-con-elementos-de-CV-en-php8' into 'develop'
fixed several bugs

See merge request artica/pandorafms!5311
2022-12-02 10:52:46 +00:00
alejandro.campos@artica.es c45d588ca6 fixed several bugs 2022-12-02 10:42:34 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
artica 0eead22fdf Auto-updated build strings. 2022-12-02 01:00:15 +01:00
Enrique Martin c455059546 Added metaconsole_access_node value to new_user API function 2022-12-01 16:47:44 +01:00
Daniel Rodriguez 35a939e746 Merge branch 'ent-9960-500-en-operaciones-masivas-en-open' into 'develop'
Ent 9960 500 en operaciones masivas en open

See merge request artica/pandorafms!5308
2022-12-01 13:19:57 +00:00
Rafael Ameijeiras 7aea7672c6 Merge branch 'ent-9943-No-se-pueden-crear-templates-de-CV' into 'develop'
fixed vc template creation

See merge request artica/pandorafms!5307
2022-12-01 13:05:03 +00:00
Daniel Rodriguez 338e64c906 Merge branch 'ent-9939-Error-en-query-SQL-de-widget-Top-N-of-agent-module' into 'develop'
fixed query errors

See merge request artica/pandorafms!5306
2022-12-01 12:02:49 +00:00
Daniel Maya 755b9ec2a3 #9960 Fixed array_unique and array_reverse in pandora open 2022-12-01 09:40:46 +01:00
artica 7f694195e9 Auto-updated build strings. 2022-12-01 01:00:49 +01:00
alejandro.campos@artica.es 2c020bcd46 fixed vc template creation 2022-11-30 18:50:57 +01:00
Rafael Ameijeiras d96eb65b88 Merge branch 'ent-9952-500-al-editar-un-mapa-gis-php8' into 'develop'
Ent 9952 500 al editar un mapa gis php8

See merge request artica/pandorafms!5305
2022-11-30 15:59:55 +00:00
alejandro.campos@artica.es b4079bd557 fixed query errors 2022-11-30 16:52:40 +01:00
Daniel Maya 8bbfabb891 #9952 Fixed count error 2022-11-30 16:08:59 +01:00
Daniel Maya 5bca791021 #9954 Fixed table 2022-11-30 15:57:49 +01:00
Daniel Maya 8609028b4f #9937 Added ajax call 2022-11-30 14:40:41 +01:00
Daniel Rodriguez 229b29caa6 Merge branch 'ent-9880-14538-fallo-en-visualizacion-de-network-usage-map' into 'develop'
Ent 9880 14538 fallo en visualizacion de network usage map

See merge request artica/pandorafms!5300
2022-11-30 10:17:47 +00:00
artica a91546f51b Auto-updated build strings. 2022-11-30 01:00:15 +01:00
Daniel Maya 57bd23f94c #9873 Fixed images 2022-11-29 16:45:44 +01:00
Rafael Ameijeiras d39c014e0f Merge branch 'ent-9919-Contador-de-alertas-da-datos-erroneos' into 'develop'
changed wrong count

See merge request artica/pandorafms!5299
2022-11-29 15:10:10 +00:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
artica ab2a00b248 Auto-updated build strings. 2022-11-29 13:19:26 +01:00
artica 58ecdbd18e Updated version and build strings. 2022-11-29 13:18:16 +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
artica 64101bc837 Auto-updated build strings. 2022-11-29 01:00:19 +01:00
Diego Muñoz-Reja f6e880f84f Merge branch 'ent-9904-14470-Vista-erronea-tras-actualizacion' into 'develop'
fixed filter

See merge request artica/pandorafms!5293
2022-11-28 11:19:26 +00:00
Daniel Rodriguez 31e02467ce Merge branch 'ent-9927-anadir-nombre-de-release-lts-767-hope' into 'develop'
Ent 9927 anadir nombre de release lts 767 hope

See merge request artica/pandorafms!5297
2022-11-28 10:49:22 +00:00
Daniel Rodriguez 5809af9098 Merge branch 'ent-9894-error-500-ldap-con-php-function-php-8-0' into 'develop'
Ent 9894 error 500 ldap con php function php 8 0

See merge request artica/pandorafms!5290
2022-11-28 10:10:03 +00:00
Rafael Ameijeiras ee23bd1de8 Merge branch 'ent-9923-vista-de-setup-de-agentes-descuadrada-desplazada' into 'develop'
visual error pandora_enterprise#9923

See merge request artica/pandorafms!5294
2022-11-28 08:31:04 +00:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
José González 695f457a09 Fix issue with Database Lock. 2022-11-28 07:47:47 +00:00
artica c8df0dec0c Auto-updated build strings. 2022-11-28 01:00:16 +01:00
artica ca566d6d9b Auto-updated build strings. 2022-11-27 01:00:16 +01:00
artica f047f8bb14 Auto-updated build strings. 2022-11-26 01:00:19 +01:00
Daniel Barbero 117c2e6d5c visual error pandora_enterprise#9923 2022-11-25 14:12:11 +01:00
Rafael Ameijeiras ff82665da9 Merge branch 'ent-9901-no-se-visualizan-tags-en-tyr-saga-en-los-filtros-de-eventos' into 'develop'
Ent 9901 no se visualizan tags en tyr saga en los filtros de eventos

See merge request artica/pandorafms!5291
2022-11-25 12:29:01 +00:00
artica a276816bde Auto-updated build strings. 2022-11-25 01:00:18 +01:00
alejandro.campos@artica.es d170771905 fixed filter 2022-11-24 16:18:58 +01:00
Daniel Maya fcd918d00b #9851 Fixed background image size 2022-11-24 15:49:11 +01:00
Daniel Maya d59b587de2 #9901 Fixed tags 2022-11-24 14:04:10 +01:00
Rafael Ameijeiras bca50dc51c Merge branch 'ent-9900-Problemas-a-la-hora-de-añadir-perfiles-con-tags-en-tyr-y-parama' into 'develop'
minor fix

See merge request artica/pandorafms!5289
2022-11-24 11:46:14 +00:00
Rafael Ameijeiras f111191c86 Merge branch 'ent-9890-Error-en-masivas-de-modulos' into 'develop'
fix reference error

See merge request artica/pandorafms!5288
2022-11-24 11:45:37 +00:00
Daniel Maya 1ffac9bc80 #9894 Fixed ldap_search 2022-11-24 12:07:48 +01:00
alejandro.campos@artica.es 081e004381 minor fix 2022-11-24 11:45:26 +01:00
alejandro.campos@artica.es d564fc4022 fix reference error 2022-11-24 10:25:28 +01:00
artica 38259c9f8d Auto-updated build strings. 2022-11-24 01:00:20 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
Daniel Rodriguez 33966c0ace Merge branch 'ent-9875-fallo-visual-en-el-filtro-de-eventos' into 'develop'
visual error pandora_enterprise#9875

See merge request artica/pandorafms!5282
2022-11-23 12:51:22 +00:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +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
Daniel Rodriguez 8e860d153b Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop'
Ent 9874 editar usuario propio admin en meta da un error 500

See merge request artica/pandorafms!5286
2022-11-23 11:12:16 +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 fd56904ef1 Merge branch 'ent-9499-Backup-BBDD-desde-la-consola-no-esta-borrando-las-antiguas' into 'develop'
fixed backup cron task

See merge request artica/pandorafms!5241
2022-11-23 09:49:09 +00:00
Daniel Rodriguez ba4112907d Merge branch 'ent-9494-post-busqueda-de-eventos-por-custom_data-no-permite-espacios-ni-mayusculas' into 'develop'
Ent 9494 post busqueda de eventos por custom data no permite espacios ni mayusculas

See merge request artica/pandorafms!5208
2022-11-23 09:47:55 +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
José González 001892ed5a Fix issue with empty autorefresh list 2022-11-23 09:42:12 +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
Luis 4729a21636 Update php_message.php 2022-11-23 07:43:41 +00:00