Commit Graph

18526 Commits

Author SHA1 Message Date
Daniel Rodriguez 2a4e7bcceb Merge branch 'ent-5329-9418-remote_cmd_string-busca-histórico-en-tagente_datos' into 'develop'
remote_cmd_string modules historical data look into tagente_datos_string

See merge request artica/pandorafms!3018
2020-01-21 11:15:34 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
ismael.moreno 395d45cec9 remote_cmd_string modules historical data look into tagente_datos_string 2020-01-20 14:12:33 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
artica ba1f0b96b4 Auto-updated build strings. 2020-01-20 00:01:08 +01:00
artica 8eb77fa6cc Auto-updated build strings. 2020-01-19 00:01:07 +01:00
artica 14de9f3c59 Auto-updated build strings. 2020-01-18 00:01:15 +01:00
Daniel Rodriguez 96eebe4310 Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
Added port option on server configuration to be used when connecting to execution server

See merge request artica/pandorafms!3012
2020-01-17 14:40:58 +01:00
alejandro-campos bb4d3abe6b change config default value 2020-01-17 12:42:29 +01:00
Daniel Rodriguez 92eb63891b Merge branch 'ent-4754-mensaje-de-error-informes-con-base-de-datos-historica-mal-configurada' into 'develop'
add historical data fialure message

See merge request artica/pandorafms!2925
2020-01-17 10:32:53 +01:00
Marcos Alconada 2968ce7658 update error message 2020-01-17 10:09:52 +01:00
artica cf4362e433 Auto-updated build strings. 2020-01-17 00:01:10 +01:00
Marcos Alconada de1407badc Update mysqlerr.php 2020-01-16 17:58:50 +01:00
alejandro-campos 8778553cca Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota 2020-01-16 17:42:45 +01:00
alejandro-campos fb7cb57f03 added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config 2020-01-16 17:42:31 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
artica 40f03e5682 Auto-updated build strings. 2020-01-16 00:01:08 +01:00
Daniel Rodriguez 9777b687b4 Merge branch 'ent-5262-Mejoras-de-laylout-en-vista-de-alertas' into 'develop'
Ent 5262 mejoras de laylout en vista de alertas

See merge request artica/pandorafms!3011
2020-01-15 17:28:23 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
alejandro-campos d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos 3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
alejandro-campos 8b6c1261a9 change order of form port input 2020-01-15 15:37:42 +01:00
Alejandro Campos 6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +01:00
Tatiana Llorente 28b585196b Ent 5099 dobles interfaces en mapas de red no se visualizan 2020-01-15 14:11:36 +01:00
vgilc 1b5dcd781f Merge branch 'support-mysql8.0' into 'develop'
support for MySQL 8.0

See merge request artica/pandorafms!2984
2020-01-15 13:53:49 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
artica 6bf5d07a2c Auto-updated build strings. 2020-01-15 00:01:09 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Rodriguez 587e53dbd0 Merge branch 'ent-5259-Cambiar-estado-In-process-de-evento-no-añade-comentario' into 'develop'
Ent 5259 cambiar estado in process de evento no añade comentario

See merge request artica/pandorafms!3009
2020-01-14 08:36:43 +01:00
artica 8038e16c25 Auto-updated build strings. 2020-01-14 00:01:11 +01:00
Daniel Rodriguez 5a6efdd141 Merge branch 'ent-4832-revision-de-exportacion-de-informes-a-csv' into 'develop'
Fixed bug in CSV export

See merge request artica/pandorafms!2835
2020-01-13 18:28:09 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Daniel Rodriguez df721fc550 Merge branch 'ent-4602-Descuadre-Visual-console-Chrome-y-Chromium' into 'develop'
Fixed public_console height

See merge request artica/pandorafms!2950
2020-01-13 18:24:01 +01:00
Daniel Rodriguez 9cf16d91f8 Merge branch 'ent-5225-Bug-visual-en-demo-visual-console-2-meta' into 'develop'
Ent 5225 bug visual en demo visual console 2 meta

See merge request artica/pandorafms!3002
2020-01-13 18:22:45 +01:00
Luis db49db3711 report font not depending of custom report front enabled 2020-01-13 18:21:48 +01:00
Daniel Rodriguez 33aaca3c4e Merge branch 'ent-5165-error-pdf-report-names-generated-by-template' into 'develop'
Fixed meta regex agent matching ids

See merge request artica/pandorafms!2976
2020-01-13 18:21:17 +01:00
Daniel Rodriguez b1b6306c30 Merge branch 'ent-4975-Añadir-todas-las-horas-al-formulario-del-cron-from-y-cron-to' into 'develop'
fixed module cron minute selectors

See merge request artica/pandorafms!2892
2020-01-13 18:20:57 +01:00
Tatiana Llorente 1747806256 Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta 2020-01-13 18:19:50 +01:00
Daniel Rodriguez ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
Daniel Rodriguez f32d3ecc0b Merge branch 'ent-5237-Vulnerabilidad-en-una-funcion-de-gestión-de-ficheros-externos' into 'develop'
fixed file vulnerability

See merge request artica/pandorafms!2994
2020-01-13 15:07:16 +01:00
Tatiana Llorente 40a86384c2 Add comment in events when status is changed 2020-01-13 13:00:43 +01:00
Daniel Maya 49e03f5e44 Fixed XSS vulnerability 2020-01-13 11:29:18 +01:00
artica 2fa637ee4d Auto-updated build strings. 2020-01-13 00:01:08 +01:00
artica f7ea19863f Auto-updated build strings. 2020-01-12 00:01:08 +01:00
artica f4bc172355 Auto-updated build strings. 2020-01-11 00:01:09 +01:00
Daniel Rodriguez 50e533e559 Merge branch 'ent-5231-9298-Bug-al-crear-un-usuario-con-espacios-al-final' into 'develop'
add check to prevent user creation with an id with trailing spaces

See merge request artica/pandorafms!3008
2020-01-10 14:41:33 +01:00