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

12436 Commits

Author SHA1 Message Date
artica 395920f8eb Auto-updated build strings. 2020-01-29 00:01:09 +01:00
Daniel Barbero Martin e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin 5906273271 fixed errors VC 2020-01-28 17:52:40 +01:00
Daniel Barbero Martin 3f5e418d98 fixed errors VC 2020-01-28 16:42:51 +01:00
Daniel Barbero Martin 73dcabc48d fixed errors VC 2020-01-28 12:44:37 +01:00
Daniel Barbero Martin 0ad6e7842f fixed errors VC 2020-01-28 12:12:07 +01:00
Daniel Barbero Martin f459c6fb79 fixed errors VC 2020-01-28 11:05:15 +01:00
marcos d5016d4943 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-28 10:08:01 +01:00
alejandro-campos d79137148c fix bug in group alert report data visualization 2020-01-28 10:06:46 +01:00
Daniel Barbero Martin e2d610f22c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-28 09:13:29 +01:00
artica 71cc1f4951 Auto-updated build strings. 2020-01-28 00:01:07 +01:00
Daniel Barbero Martin 0dabab11cf Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/install.php
 2020-01-27 16:19:32 +01:00
Daniel Barbero Martin 6ddb501b08 fixed errors VC 2020-01-27 16:15:54 +01:00
alejandro-campos 5913f815d1 Added possibility to display comments with line breaks in event detail 2020-01-27 13:37:34 +01:00
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
fbsanchez 50a2d74adb Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms 
Conflicts:
	pandora_server/pandora_server.spec
 2020-01-27 12:38:19 +01:00
Daniel Maya 1998db3317 Fixed date in availability graph 2020-01-27 11:52:13 +01:00
Daniel Rodriguez 28392b71ef Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop' 
availability failover

See merge request artica/pandorafms!3015
 2020-01-27 10:48:50 +01:00
Daniel Maya c0d6ae1496 Fixed label Failover 2020-01-27 09:32:22 +01:00
Daniel Barbero Martin 8ee038667c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-27 08:22:36 +01:00
artica e35edd92b3 Auto-updated build strings. 2020-01-27 00:01:09 +01:00
artica 5dbb80287e Auto-updated build strings. 2020-01-26 00:01:10 +01:00
Daniel Barbero Martin 19964c8463 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-25 11:57:19 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
artica b4b1fbb3c1 Auto-updated build strings. 2020-01-25 00:01:10 +01:00
Daniel Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +01:00
alejandro-campos d21068e368 fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed 2020-01-24 13:52:09 +01:00
Daniel Barbero Martin aea073b4d5 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-24 11:41:35 +01:00
Daniel Rodriguez 6a35ffa01b Merge branch 'ent-5322-SQL-Injection-leads-to-Login-Bypass' into 'develop' 
Fixed injection sql in chart_generator

See merge request artica/pandorafms!3024
 2020-01-24 10:52:02 +01:00
artica ea3a317a1b Auto-updated build strings. 2020-01-24 00:01:33 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
Daniel Barbero Martin 481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
marcos 79a34ac756 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-23 11:06:15 +01:00
Daniel Maya 9f9cc9beda Fixed injection sql in chart_generator 2020-01-23 10:40:55 +01:00
Daniel Barbero Martin 76dd28fbdc fixed errors VC 2020-01-23 10:24:46 +01:00
vgilc 2447514c41 Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop' 
Fix visual problems with agent details

See merge request artica/pandorafms!2625
 2020-01-23 10:11:35 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero 203a91f065 fixed errors 2020-01-22 17:47:47 +01:00
marcos 823fb30db7 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-22 13:42:58 +01:00
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
Daniel Barbero f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +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
Daniel Maya 5c3b6c7a69 Fix total check for failover 2020-01-22 12:18:11 +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
Daniel Barbero 8bcacf546c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-22 10:13:25 +01:00
artica 475517afd7 Auto-updated build strings. 2020-01-22 00:01:19 +01:00
Daniel Barbero Martin 4b5a754d2e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-21 17:44:06 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Maya 81fe77d9fd Added failover in templates 2020-01-21 16:26:36 +01:00
marcos 76ed257287 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-21 15:23:26 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +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
Daniel Barbero Martin b2f356bd4b Fixed errors VC 2020-01-21 10:42:09 +01:00
Daniel Barbero Martin 8672629dd6 Fixed errors VC 2020-01-21 10:33:07 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +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
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
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
artica cf4362e433 Auto-updated build strings. 2020-01-17 00:01:10 +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
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Marcos Alconada 5268c23c7a Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens' 
# Conflicts:
#   pandora_console/include/functions_config.php
 2020-01-16 09:23:42 +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 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
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
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
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 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
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
Daniel Barbero Martin 602ce39907 Fixed clock item VC 2020-01-13 17:13:52 +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
Daniel Barbero Martin e54740ec19 fixed parent input 2020-01-13 14:19:56 +01:00
Daniel Barbero Martin 60bd600392 module graph convert to image base 64 2020-01-13 13:31:23 +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
Daniel Barbero Martin 4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Daniel Barbero Martin 09f1e2b733 fixed errors in resize and move item percentile and value 2020-01-13 09:53:00 +01:00
Daniel Barbero Martin fe46a2a74e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-13 08:07:20 +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 79161b3206 Merge branch 'ent-5239-No-aparece-update-fallido-por-OUM-offline-en-audit-log' into 'develop' 
Added log when offline update fails

See merge request artica/pandorafms!3003
 2020-01-10 14:34:41 +01:00
Daniel Rodriguez d864b47424 Merge branch 'ent-4677-error-appliying-report-templates' into 'develop' 
Fixed ui message icon bug on meta

See merge request artica/pandorafms!3007
 2020-01-10 14:26:35 +01:00
Daniel Barbero Martin d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00
Luis Calvo 6742881009 Fixed ui message icon bug on meta 2020-01-10 13:16:53 +01:00
Daniel Rodriguez 2734b6461e Merge branch 'ent-4895-error-redireccion-plantillas-cron-tasklist' into 'develop' 
Fixed template redirection tasklist on cron extension

See merge request artica/pandorafms!3006
 2020-01-10 11:12:39 +01:00
Daniel Maya c9a524b128 fixed interval counter 2020-01-10 11:12:05 +01:00
Daniel Barbero Martin f34387b24e Fixed modal send more forms 2020-01-10 08:41:07 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
artica 467db373b7 Auto-updated build strings. 2020-01-10 00:01:55 +01:00
Daniel Barbero 7e4cb02ceb fixed styles and more 2020-01-09 18:05:21 +01:00
Luis Calvo 4ff1c9cb7d Fixed template redirection tasklist on cron extension 2020-01-09 17:56:34 +01:00
manuel 62c915d6df Added log when offline update fails 2020-01-09 17:09:55 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
Luis Calvo 2d303635ae Merge remote-tracking branch 'origin/develop' into ent-5165-error-pdf-report-names-generated-by-template 2020-01-09 10:42:46 +01:00
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
artica d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
Daniel Barbero Martin 909dc4bf7c fixed css 2020-01-08 18:08:20 +01:00
Daniel Barbero Martin a8e9c69e9a save min.js and min.js.map 2020-01-08 17:33:00 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Tatiana Llorente b6d5d1a15a Fixed bug with clock item in the visual consoles in meta 2020-01-08 15:23:39 +01:00
Daniel Rodriguez 1f15fd5dae Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop' 
Ent 5181 pete sql y mal funcionamineto de auto combined graph

See merge request artica/pandorafms!3000
 2020-01-08 14:46:29 +01:00
Tatiana Llorente 2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00