19098 Commits

Author SHA1 Message Date
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 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
jose.gonzalez@pandorafms.com
2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +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
artica
48c8f31352 Auto-updated build strings. 2022-12-16 01:00:18 +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
alejandro.campos@artica.es
4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
jose.gonzalez@pandorafms.com
4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com
d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +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
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
jose.gonzalez@pandorafms.com
d41ee38ba2 Fixed images 2022-12-14 09:09:46 +01:00
artica
37c6a8a67b Auto-updated build strings. 2022-12-14 01:00:18 +01: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
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
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
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