Commit Graph

31755 Commits

Author SHA1 Message Date
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
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
Diego Muñoz-Reja 7a5226b825 Merge branch 'ent-9323-14021-Modificar-el-display-de-valores-de-informe' into 'develop'
implemented float formatting and option in reports to change visualization format

See merge request artica/pandorafms!5219
2022-12-15 15:36:12 +00: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
Diego Muñoz-Reja 5dab41df36 Merge branch 'ent-fix-pandora_snmp_bandwidth-plugin' into 'develop'
bugfix about pandora_snmp_bandwith.pl

See merge request artica/pandorafms!5295
2022-12-15 12:51:08 +00: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
Daniel Maya 1b2e3c0046 #10019 Changed smartmatch 2022-12-14 12:24:56 +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
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
artica 37c6a8a67b Auto-updated build strings. 2022-12-14 01:00:18 +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
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
Rafael Ameijeiras 48cd23426c Merge branch 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' into 'develop'
Ent 9002 eliminar monitorizacion transaccional servidor transaccional

See merge request artica/pandorafms!5264
2022-12-13 11:58:09 +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
Rafael Ameijeiras 0cae4e5632 Merge branch 'collection_md5_file_size_0_support' into 'develop'
collection is not updated if the md5 file size of collection is 0

See merge request artica/pandorafms!5279
2022-12-13 11:28:10 +00: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
Rafael Ameijeiras c423eedbf3 Merge branch 'ent-9135-buscar-por-nombre-de-usuario-en-eventos' into 'develop'
add new filter pandora_enterprise#9135

See merge request artica/pandorafms!5244
2022-12-13 10:46:53 +00:00
Rafael Ameijeiras 0cf113f040 Merge branch 'ent-9221-12537-tipos-incorrectos-plugin-mysql-server-advanced-plugin' into 'develop'
adding new parameter check_type for define types of modules

See merge request artica/pandorafms!5169
2022-12-13 10:45:53 +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
Rafael Ameijeiras 1fdd29970a Merge branch 'ent-9447-control-de-entrada-en-cli-create_event' into 'develop'
Ent 9447 control de entrada en cli create event

See merge request artica/pandorafms!5221
2022-12-12 22:51:11 +00:00
Rafael Ameijeiras d874cbd5f1 Merge branch 'ent-9721-cli-add_event_comment-no-mete-id-de-evento-en-comentarios' into 'develop'
fixed CLI add comments pandora_enterprise#9721

See merge request artica/pandorafms!5248
2022-12-12 22:49:06 +00:00
Daniel Maya 10bb2bc0b3 #9447 Fixed label event type 2022-12-12 17:01:46 +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