tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,745 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

17132 Commits

Author SHA1 Message Date
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
Pablo Aragon 78c4f15c16 9994 Add trigger to id_module_group 2022-12-21 12:56:26 +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
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
alejandro.campos@artica.es 3970c3b7c1 fixed 500 2022-12-21 10:43:43 +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
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
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
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +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 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 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
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
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
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
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
artica 37c6a8a67b Auto-updated build strings. 2022-12-14 01:00:18 +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
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
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