5147 Commits

Author	SHA1	Message	Date
fermin831	eba858d6c1	[Network usage map] Fixed timepickers ... Former-commit-id: d5803cea0443eae7a0dca2846dfba199a5e35f3c	2019-03-25 12:32:39 +01:00
fermin831	ddc01f9a4e	Added data from NTA to networl_usage_map ... Former-commit-id: 9f6192faa1698959ce1ba44e13b974b8470a6a3c	2019-03-25 12:30:51 +01:00
fermin831	6a1bf2fbce	Added first version of live map ... Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779	2019-03-25 11:34:03 +01:00
fbsanchez	040f942c9f	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32	2019-03-25 10:29:49 +01:00
Alejandro Fraguas	5411eb9d17	Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop' ... fix bug in event filter by group when not using secondary groups See merge request artica/pandorafms!2276 Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34	2019-03-25 10:22:45 +01:00
fermin831	2711eb59ea	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395	2019-03-25 09:20:06 +01:00
fbsanchez	83a80b6aa2	minor fix ... Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775	2019-03-22 19:28:32 +01:00
Tatiana Llorente	45c7bea6e6	Fixed a bug: show map image alternative when offline ... Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd	2019-03-22 10:57:22 +01:00
alejandro-campos	c19ec2b041	fix bug when filtering events by group ... Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b	2019-03-22 10:47:40 +01:00
fbsanchez	26d231e78c	Improved user experience networkmaps ... Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3	2019-03-21 20:52:01 +01:00
Tatiana Llorente	151fe6ac78	Fixed a bug: show map image alternative when offline ... Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810	2019-03-21 18:13:21 +01:00
fbsanchez	95d2259236	Improvements. networkmap class ... Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9	2019-03-21 16:16:53 +01:00
Tatiana Llorente	b8f1b5f6a1	Fixed a bug: show popup double authentication ... Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d	2019-03-21 15:58:10 +01:00
Tatiana Llorente	5d409cd778	New view user edit ... Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a	2019-03-20 16:45:24 +01:00
alejandro-campos	b5e1487736	add strict comparator ... Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b	2019-03-20 15:26:42 +01:00
alejandro-campos	36119ebb85	fix bug in event filter by group when not using secondary groups ... Former-commit-id: fe9c88e8e2d7552fed7e5c7cd5a5694d47ee444f	2019-03-20 14:48:02 +01:00
Tatiana Llorente	d27c509817	Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario ... Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c	2019-03-20 13:28:07 +01:00
Tatiana Llorente	a99c8b1a7b	New view user edit ... Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54	2019-03-20 13:26:15 +01:00
fermin831	80c79b532b	[Netflow live] Removed aggregate by protocol ... Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef	2019-03-18 15:44:23 +01:00
fermin831	4f8c7daada	[Netflow live] Change start date and end date ... Former-commit-id: 14a24767a1426aa8151ba99495a17ddb71047cbb	2019-03-18 15:33:48 +01:00
Fermin	33fd100d91	[Netflow view] Added start date ... Former-commit-id: 98134de0f1e8c40458b36b0a14ad0b8c87bff0f2	2019-03-15 10:46:18 +01:00
fbsanchez	8c8f368993	WIP: NetworkMaps rebuild ... Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454	2019-03-14 18:51:48 +01:00
fermin831	6299d23528	[Netflow live] Minor fixes ... Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96	2019-03-14 17:49:44 +01:00
fermin831	b660da6e84	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/install.php Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b	2019-03-14 10:49:16 +01:00
fermin831	d174af9a57	[Netflow live] Fixed filter styles ... Former-commit-id: 8990361112fb96fbe2589ac2e31a105167754a8d	2019-03-14 10:43:59 +01:00
fermin831	da08acce4f	[Netflow live] Removed units ... Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84	2019-03-14 10:36:15 +01:00
fermin831	e16d48804e	[Netflow live] Added removed unit from pie graph and summary table and refactorized bytes format ... Former-commit-id: 35b9fd71ad97869e23119bd0d2031ec12400d745	2019-03-14 09:25:50 +01:00
Fermin	c2c8287d3e	Fixed resolution in netflow reports ... Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70	2019-03-13 20:15:53 +01:00
Fermin	3d1f1f86ed	[Netflow live] Removed agregate by none ... Former-commit-id: 4da1581da67c95f29b9b34eb70436e8f68706988	2019-03-13 19:16:21 +01:00
Fermin	8a336d6cfe	[Netflow live] Implemented resolution on area graphs and fixed end date ... Former-commit-id: 86d55ac7645e62fcae6a07cbf1bd50f92d5d37a1	2019-03-13 18:55:16 +01:00
fbsanchez	f5b0e6b1a4	minor fix radial redirection ... Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074	2019-03-13 12:55:24 +01:00
fbsanchez	95c61024f7	Cleanup Networkmaps ... Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f	2019-03-13 11:38:03 +01:00
fbsanchez	750c64fbd7	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7	2019-03-13 09:52:00 +01:00
fbsanchez	e61d409acc	fix in redirection after map creation ... Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0	2019-03-12 19:23:40 +01:00
fbsanchez	1bc326c00c	WIP: NetworkMap class ... Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec	2019-03-12 18:17:18 +01:00
fbsanchez	06f8aae91a	WIP NetworkMap class ... Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301	2019-03-12 16:22:28 +01:00
Alejandro Fraguas	dbf0229ce0	Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop' ... fixed warnings php See merge request artica/pandorafms!2197 Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca	2019-03-12 13:24:48 +01:00
Daniel Rodriguez	e55d7f0042	Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop' ... 3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar See merge request artica/pandorafms!2192 Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d	2019-03-12 13:18:10 +01:00
daniel	15ca89068d	Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 ... Conflicts: pandora_console/godmode/servers/manage_recontask_form.php pandora_console/include/functions_events.php Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613	2019-03-12 13:07:12 +01:00
marcos.alconada	5227390c87	se elimina linea de autosearch = false ... Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de	2019-03-12 13:06:27 +01:00
Tatiana Llorente	aaf5d7bf89	New view user edit ... Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f	2019-03-12 12:24:33 +01:00
Alejandro Fraguas	60337b0da7	Merge branch 'ent-3559-Poner-evento-en-in-progress-provoca-un-fallo-de-visualizacion' into 'develop' ... Fixed error in event filters when is only new events See merge request artica/pandorafms!2252 Former-commit-id: 3dd94c18cf9c3896d7a1f95546c879de63c86fe8	2019-03-12 11:18:51 +01:00
Tatiana Llorente	c5722d2e10	New view user edit ... Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd	2019-03-12 10:59:44 +01:00
Tatiana Llorente	9a702a90a1	New view user edit ... Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b	2019-03-12 08:56:45 +01:00
fermin831	3437994915	Fixed code style ... Former-commit-id: 7422b647bb92ecc2d724aa71911a446aff058d3a	2019-03-11 19:36:49 +01:00
fermin831	92d2e505ed	Added advanced filter on netflow live view ... Former-commit-id: 13e2d3d26f6bb2c2f25900793464390997be4e41	2019-03-11 19:26:50 +01:00
fermin831	8696bd9f91	Fixed CSV on network/netflow explorer ... Former-commit-id: b111d5717ee66754ae15aa25c79464da92678174	2019-03-11 18:04:01 +01:00
fermin831	7bf44b7c5b	Fixed styles ... Former-commit-id: 6292bf0badc9175b6fb801b326e58ac475ae2bfb	2019-03-11 17:57:08 +01:00
fermin831	4cc3eb13b9	Fixed order_by filter (some filter where lost) ... Former-commit-id: 8f58c2615e5e8d5ba85908a888ec3dd2bcdf6f14	2019-03-11 17:53:21 +01:00
samucarc	5b3dd6121b	Fixed error in event filters when is only new events ... Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93	2019-03-11 17:14:26 +01:00