Commit Graph

12561 Commits

Author SHA1 Message Date
artica c8ee27ed2b Auto-updated build strings. 2020-03-11 01:00:17 +01:00
alejandro-campos ef704895b1 truncate long texts 2020-03-10 17:23:19 +01:00
Jose Gonzalez 6488a88636 Solved issue with WHERE clause 2020-03-10 12:00:25 +01:00
artica 8b3dafc48f Auto-updated build strings. 2020-03-10 01:00:15 +01:00
artica b7408b5e99 Auto-updated build strings. 2020-03-09 01:00:14 +01:00
artica 1ff7219e06 Auto-updated build strings. 2020-03-08 01:00:13 +01:00
artica d995210494 Auto-updated build strings. 2020-03-07 01:00:14 +01:00
artica bdd6cde6c2 Auto-updated build strings. 2020-03-06 01:00:16 +01:00
artica 4a5af5da40 Auto-updated build strings. 2020-03-05 01:00:08 +01:00
Luis Calvo c2e608f120 Added cont for module status alert triggered 2020-03-04 12:09:54 +01:00
Jose Gonzalez 3501efb0ad Added tags_user for events responses 2020-03-04 10:42:52 +01:00
artica 9d3db50cf4 Auto-updated build strings. 2020-03-04 01:00:07 +01:00
artica 3e6cc7b2e7 Auto-updated build strings. 2020-03-03 01:00:09 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
Alejandro Fraguas 3c542b4d06 Merge branch 'ent-5371-tags-perfil-usuario-monitor-view' into 'develop'
Fixed monitor view groups without tags

See merge request artica/pandorafms!3083
2020-03-02 10:24:07 +01:00
artica 97037d1266 Auto-updated build strings. 2020-03-02 01:00:08 +01:00
artica 501d76b975 Auto-updated build strings. 2020-03-01 01:00:08 +01:00
artica b106981613 Auto-updated build strings. 2020-02-29 01:00:10 +01:00
alejandro-campos 814b68c284 avoid trying to connect to server if server name is empty or zero 2020-02-28 14:54:20 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00
alejandro-campos b29e0c7966 added ui_get_full_url to paths 2020-02-28 11:38:41 +01:00
artica 6e594f5503 Auto-updated build strings. 2020-02-28 01:00:10 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
daniel ac6ca52c45 Fixed resulution charts 2020-02-27 10:52:01 +01:00
artica a9590892bf Auto-updated build strings. 2020-02-27 01:00:09 +01:00
marcos e28415250c remove entities from reports 2020-02-26 15:18:42 +01:00
vgilc a0ea52983b Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"
This reverts merge request !2519
2020-02-26 14:27:19 +01:00
artica 3b9e100f9f Auto-updated build strings. 2020-02-26 01:00:08 +01:00
alejandro-campos bd6540da87 fixed visual bug in table 2020-02-25 11:09:11 +01:00
artica 400809ce61 Auto-updated build strings. 2020-02-25 01:00:10 +01:00
Alejandro Fraguas 568b869681 Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'
Removed entitites

See merge request artica/pandorafms!2519
2020-02-24 14:15:14 +01:00
artica 03b97f4fdb Auto-updated build strings. 2020-02-24 01:00:07 +01:00
artica bfab0285e5 Auto-updated build strings. 2020-02-23 01:00:11 +01:00
artica 1667ed4f1c Auto-updated build strings. 2020-02-22 01:00:10 +01:00
marcos dcce09befd fixed error 2020-02-21 14:53:48 +01:00
Daniel Rodriguez 4e403bca72 Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters

See merge request artica/pandorafms!3064
2020-02-21 13:27:34 +01:00
alejandro-campos 0a1dd6fe24 fix save of filters 2020-02-21 13:01:47 +01:00
marcos f25aacf108 fixed erro2 2020-02-21 10:58:04 +01:00
alejandro-campos e0a159736c safe output to string with entities 2020-02-21 10:50:56 +01:00
artica 540fffc6ef Auto-updated build strings. 2020-02-21 00:01:14 +01:00
marcos bc4c811071 update reports with enttites 2020-02-20 17:04:18 +01:00
Daniel Barbero Martin a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
Daniel Barbero Martin 6ccc606c74 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-20 08:06:59 +01:00
artica 70ee4f4e9b Auto-updated build strings. 2020-02-20 00:01:12 +01:00
Daniel Barbero 3288fec039 Fixed visual error VC 2020-02-19 15:31:30 +01:00
marcos e265bc2970 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-19 09:31:31 +01:00
artica a04b92a0bc Auto-updated build strings. 2020-02-19 09:12:12 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
marcos 2dffb967cc Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-18 12:58:11 +01:00
alejandro-campos b9e3c70374 fix bug when saving netflow filters 2020-02-18 11:25:45 +01:00
Daniel Barbero Martin 1ab92fe798 Fixed error event history VC 2020-02-18 08:08:56 +01:00
Daniel Barbero Martin dd437be186 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-18 07:55:19 +01:00
artica 92e1492f2b Auto-updated build strings. 2020-02-18 00:01:12 +01:00
marcos 7564249207 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-17 16:15:29 +01:00
marcos fbea1e7077 remove entities reports 2020-02-17 15:54:09 +01:00
marcos dea661f14d update 2020-02-17 14:49:34 +01:00
marcos 6a8fa93358 updates 2020-02-17 13:53:38 +01:00
marcos b521cc37fd update reports entitines 2020-02-17 13:17:33 +01:00
Daniel Barbero Martin 3ad9e3c420 Fixed error event history VC 2020-02-17 08:19:36 +01:00
Daniel Barbero Martin f3b744717e Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-17 08:06:50 +01:00
artica bf0211c9b8 Auto-updated build strings. 2020-02-17 00:01:09 +01:00
artica 6a3d1b4992 Auto-updated build strings. 2020-02-16 00:01:08 +01:00
artica 19b59f2819 Auto-updated build strings. 2020-02-15 00:01:16 +01:00
artica e60ccb8a68 Auto-updated build strings. 2020-02-14 00:01:12 +01:00
Daniel Barbero Martin f9c944fa8d Fixed error events history VC 2020-02-13 10:08:50 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Barbero Martin cad6889c46 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-13 07:58:06 +01:00
artica d1663cd242 Auto-updated build strings. 2020-02-13 00:01:09 +01:00
Daniel Maya e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
artica 79fe01ee56 Auto-updated build strings. 2020-02-12 00:01:09 +01:00
Daniel Rodriguez 5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop'
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
2020-02-11 15:39:26 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
Daniel Barbero Martin 962b3d2248 Fix linked ACL another VC 2020-02-11 09:45:43 +01:00
Alejandro Fraguas f1a52d6272 Merge branch 'ent-4771-Revision-llamada-API-create-event-en-metaconsola' into 'develop'
Ent 4771 revision llamada api create event en metaconsola

See merge request artica/pandorafms!2793
2020-02-11 09:37:40 +01:00
Daniel Barbero Martin 1d2ad47507 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-11 07:57:42 +01:00
artica 0db7abbe9e Auto-updated build strings. 2020-02-11 00:01:12 +01:00
Daniel Barbero Martin 0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Tatiana Llorente 740dcdb35b Changed id_agent for id_tagent 2020-02-10 17:10:39 +01:00
Tatiana Llorente 9a84c8c893 Changed id_agent for id_tagent 2020-02-10 17:05:03 +01:00
Tatiana Llorente 19f07b9b9e Changed id_agent for id_tagent 2020-02-10 17:01:36 +01:00
Tatiana Llorente 6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Daniel Maya 363b3e8a80 Changed pandora fms by product name 2020-02-10 16:21:04 +01:00
Alejandro Fraguas 0538bd5185 Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
Ent 5227 problema encoding aplicación politicas

See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
Jose Gonzalez 0b7d4a9463 Added solution for UTF8 charset in treeview and main agent view 2020-02-10 11:16:57 +01:00
Daniel Rodriguez 6faac04672 Merge branch 'ent-5267-Fechas-erroneas-en-availability-graph' into 'develop'
Fixed date in availability graph

See merge request artica/pandorafms!3027
2020-02-10 10:46:55 +01:00
Daniel Rodriguez 6e3d70cd76 Merge branch 'ent-5411-Availability-graphs-visualización-pdf' into 'develop'
Ent 5411 availability graphs visualización pdf

See merge request artica/pandorafms!3048
2020-02-10 10:06:15 +01:00
Daniel Barbero Martin d99d31b432 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-10 09:54:03 +01:00
artica 583c605b31 Auto-updated build strings. 2020-02-10 00:01:08 +01:00
artica 47b60c29d6 Auto-updated build strings. 2020-02-09 00:01:08 +01:00
artica 1be17441e7 Auto-updated build strings. 2020-02-08 00:01:08 +01:00
alejandro-campos 58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
artica 0cb2f88540 Auto-updated build strings. 2020-02-07 00:01:25 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
artica 36fdaf3ff7 Auto-updated build strings. 2020-02-06 00:01:11 +01:00
Daniel Barbero Martin 68dd01ba09 fixed errors VC 2020-02-05 18:56:28 +01:00
Daniel Maya ae015fa00f Fixed width in availability graph 2020-02-05 16:40:01 +01:00
Daniel Barbero Martin 902c42b559 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-05 14:05:26 +01:00
Daniel Rodriguez 97adbca5cd Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop'
Fixed macro agent address empty ip

See merge request artica/pandorafms!2823
2020-02-05 12:56:13 +01:00
Alejandro Fraguas ec98d861b2 Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop'
Fixed bug with API access list - #4622

See merge request artica/pandorafms!2724
2020-02-05 10:44:42 +01:00
artica 70e5486ce6 Auto-updated build strings. 2020-02-05 00:01:11 +01:00
Daniel Rodriguez 3342b7dd53 Merge branch 'ent-5403-XSS-vistas-por-Nokia-USA' into 'develop'
Fixed XSS vulnerability

See merge request artica/pandorafms!3041
2020-02-04 17:30:21 +01:00
Daniel Rodriguez 0e9e59efbb Merge branch 'ent-5289-9247-Group-Alert-Report-bug' into 'develop'
fix bug in group alert report data visualization

See merge request artica/pandorafms!3031
2020-02-04 13:25:29 +01:00
Daniel Rodriguez e6a5d7986f Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop'
Fixed % with sprintf

See merge request artica/pandorafms!3039
2020-02-04 13:14:55 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
artica 3415838700 Auto-updated build strings. 2020-02-04 00:01:10 +01:00
alejandro-campos 3b233eeb90 changed functionality to not show trigger times that are not within the interval 2020-02-03 18:01:28 +01:00
fbsanchez 72d23e5dfa Module graph paint direct 2020-02-03 16:32:20 +01:00
Alejandro Fraguas 00ab0b9952 Merge branch 'ent-5295-Constantes-de-1año-2-años-y-3-años-no-son-correctas' into 'develop'
Ent 5295 constantes de 1año 2 años y 3 años no son correctas

See merge request artica/pandorafms!3014
2020-02-03 16:21:22 +01:00
Daniel Rodriguez bdb8d309ad Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop'
fix to display pandora tab subtitle based on condition and display rebranding...

See merge request artica/pandorafms!3025
2020-02-03 14:06:38 +01:00
Alejandro Fraguas 12d8dca70e Merge branch 'ent-5149-9065-Pandora-manage-create-event-poner-saltos-de-linea' into 'develop'
Added possibility to display comments with line breaks in event detail

See merge request artica/pandorafms!3029
2020-02-03 10:34:56 +01:00
artica af7d1ea5f9 Auto-updated build strings. 2020-02-03 00:01:08 +01:00
artica 690f6e715d Auto-updated build strings. 2020-02-02 00:01:08 +01:00
artica 3136563bba Auto-updated build strings. 2020-02-01 00:01:09 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
artica 7aa9a630d0 Auto-updated build strings. 2020-01-31 00:01:10 +01:00
Daniel Maya bf53eb5a6b Fixed XSS vulnerability 2020-01-30 17:29:07 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
artica 1134c041f2 Auto-updated build strings. 2020-01-30 00:01:08 +01:00
marcos 0ed4937368 add traductions 2020-01-29 13:48:48 +01:00
Alejandro Fraguas 0cf42f2d74 Merge branch 'new-vc-line-element' into 'develop'
New vc line element

See merge request artica/pandorafms!2795
2020-01-29 11:04:23 +01:00
Daniel Barbero Martin 2bbc5d18b5 fixed errors VC 2020-01-29 10:15:31 +01:00
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +01:00
Daniel Barbero Martin 3bd3ca00bf Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-29 08:20:11 +01:00
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