Commit Graph

23527 Commits

Author SHA1 Message Date
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +01:00
artica 395920f8eb Auto-updated build strings. 2020-01-29 00:01:09 +01:00
Daniel Rodriguez 914a796ce1 Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Changed pandora server start for control if is needed add parameters.

See merge request artica/pandorafms!3017
2020-01-28 13:41:42 +01:00
artica 71cc1f4951 Auto-updated build strings. 2020-01-28 00:01:07 +01:00
Jose Gonzalez c8194166ef Added console_api_pass write for pandora_server.conf 2020-01-27 16:19:27 +01:00
Daniel Rodriguez ba7936f084 Merge branch 'ent-4697-cicd-pandorafms' into 'develop'
Resolved deprecated options rpm spec

See merge request artica/pandorafms!2989
2020-01-27 12:55:12 +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 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
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
artica b4b1fbb3c1 Auto-updated build strings. 2020-01-25 00:01:10 +01:00
Jose Gonzalez 7102b14e8b Refactoring and adding new specs 2020-01-24 13:10:02 +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
Daniel Maya aa3bf33607 Added treport_content_item in migrate 2020-01-24 09:28:16 +01:00
artica ea3a317a1b Auto-updated build strings. 2020-01-24 00:01:33 +01:00
Daniel Rodriguez a0ef0e1ee1 Merge branch 'ent-5324-Remote-file-inclusion-phar-object-injection-as-lowest-privileged-user' into 'develop'
fixed vulnerability

See merge request artica/pandorafms!3023
2020-01-23 11:04:40 +01:00
Daniel Maya 9f9cc9beda Fixed injection sql in chart_generator 2020-01-23 10:40:55 +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
alejandro-campos c44b595c8a fixed vulnerability 2020-01-22 17:20:13 +01:00
Jose Gonzalez 78fb874886 Solved some issues with paramethers 2020-01-22 16:33:12 +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
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 Maya 5c3b6c7a69 Fix total check for failover 2020-01-22 12:18:11 +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 Maya 81fe77d9fd Added failover in templates 2020-01-21 16:26:36 +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
Jose Gonzalez ee44c74d27 Solved issue with user profile creation 2020-01-20 12:40:19 +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
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
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
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