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

23769 Commits

Author SHA1 Message Date
Jose Gonzalez 6fdd460f8a Solved an internal issue for control the test result 2020-01-20 11:27:39 +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
Daniel Barbero Martin 03c1224563 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-20 08:00:46 +01:00
artica ba1f0b96b4 Auto-updated build strings. 2020-01-20 00:01:08 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin 536af6f33a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-19 11:37:18 +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
Jose Gonzalez 867ae40b17 Changed pandora server start for control if is needed add parameters. Also, deleted default parameters 2020-01-17 22:58:45 +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 Barbero Martin 02199b19b5 fixed errors VC 2020-01-16 16:55:48 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Daniel Barbero Martin 5900e7ba4a fixed errors VC 2020-01-16 14:07:35 +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
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
artica 40f03e5682 Auto-updated build strings. 2020-01-16 00:01:08 +01:00
Daniel Barbero Martin d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +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
Daniel Maya c68f83f013 availability failover 2020-01-15 17:16:46 +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
Daniel Barbero Martin c3ae3f08a7 Fixed errors VC 2020-01-15 14:28:43 +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
Tatiana Llorente c21682145c Changed value for constants 1year, 2years, 3years 2020-01-15 10:37:05 +01:00
Daniel Barbero Martin 121ac2e80e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-15 07:57:22 +01:00
artica 6bf5d07a2c Auto-updated build strings. 2020-01-15 00:01:09 +01:00
Daniel Barbero 89b43f1aee loading on resize and update elements VC 2020-01-14 15:52:47 +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
Daniel Barbero e723c98275 Fix clocks 2020-01-14 15:02:38 +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 Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +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