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

23484 Commits

Author SHA1 Message Date
Daniel Rodriguez 5374a06cbf Merge branch 'ent-5150-errores-y-mejoras-generales-en-correlacion-de-alertas' into 'develop' 
add wiki url alerts correlation

See merge request artica/pandorafms!3022
 2020-01-22 13:41:47 +01:00
marcos 18a3a747bd add wiki url alerts correlation 2020-01-22 12:24:15 +01:00
Daniel Rodriguez 189ba74f01 Merge branch 'ent-5323-Phar-object-injection' into 'develop' 
Prepend folder to image to avoid Phar injection

See merge request artica/pandorafms!3021
 2020-01-22 12:20:35 +01:00
vgilc 69d9051339 Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop' 
Fixed visual bug in grouped report item

See merge request artica/pandorafms!2992
 2020-01-22 12:20:05 +01:00
Daniel Rodriguez f6cb7eb3d7 Merge branch 'ent-5325-CSRF-XSS-realtime-graphs' into 'develop' 
Added enconding to POST variables realtime graphs

See merge request artica/pandorafms!3019
 2020-01-22 12:04:14 +01:00
Daniel Rodriguez ec03f947fe Merge branch 'ent-5226-Update-Manager-Offline-mostrar-aviso' into 'develop' 
Added warning in update manager offline

See merge request artica/pandorafms!2998
 2020-01-22 11:10:02 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Luis Calvo ca35bb64cc Prepend folder to image to avoid Phar injection 2020-01-22 10:17:35 +01:00
artica 475517afd7 Auto-updated build strings. 2020-01-22 00:01:19 +01:00
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
Luis Calvo 3d0b71d953 Added enconding to POST variables 2020-01-21 11:05:49 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
Alejandro Fraguas 8803cbff33 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' into 'develop' 
changes in module data formatting when printed across the application and new setup options

See merge request artica/pandorafms!2944
 2020-01-20 14:19:45 +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
Alejandro Fraguas 4e1c3a72a8 Merge branch 'ent-5187-modulos-remote_cmd-no-funcionan' into 'develop' 
Set default rcmd_timeout=10 and new rcmd_timeout_bin token

See merge request artica/pandorafms!2990
 2020-01-16 19:16:20 +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
Daniel Rodriguez 587492b40e Merge branch 'ent-5261-Cambio-de-control-de-intervalo-en-alertas' into 'develop' 
Ent 5261 cambio de control de intervalo en alertas

See merge request artica/pandorafms!3013
 2020-01-16 13:50:39 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Alejandro Fraguas 2189709cf6 Merge branch 'ent-5240-9303-bloqueos-discovery' into 'develop' 
Fixed method calls in Base.pm

See merge request artica/pandorafms!2996
 2020-01-16 13:06:28 +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
Alejandro Fraguas c1a124c970 Merge branch 'ent-5099-Dobles-interfaces-en-mapas-de-red-no-se-visualizan' into 'develop' 
Ent 5099 dobles interfaces en mapas de red no se visualizan

See merge request artica/pandorafms!3004
 2020-01-15 14:11:36 +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
Daniel Rodriguez 4cc0fb0090 Merge branch 'ent-5219-fallo-cambiar-grupo-mapa-red' into 'develop' 
Fixed group change on networkmap.ACL and source group working separated

See merge request artica/pandorafms!3010
 2020-01-15 12:14:37 +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
Daniel Rodriguez b725315ed0 Merge branch 'ent-4795-Check-Seleccionar-todos-queda-marcado' into 'develop' 
Ent 4795 check seleccionar todos queda marcado

See merge request artica/pandorafms!2821
 2020-01-14 08:37:04 +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