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

17227 Commits

Author SHA1 Message Date
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
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
Pablo Aragon fe548936a0 10048 Exclude id_alert_action from query 2022-12-23 10:29:18 +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
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
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
artica 71544593e7 Auto-updated build strings. 2022-12-22 01:00:18 +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
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
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
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
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 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
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
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
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.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
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
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
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 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