Commit Graph

20607 Commits

Author SHA1 Message Date
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 4947d2117a minor fixes networkmapclass
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
artica cb8cd37ee7 Auto-updated build strings.
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
fbsanchez 6990951dc7 Fix in group map calculation
Former-commit-id: 1d77a55b629553ac89cb0ae33d1d1f1ad76c3de3
2019-03-21 21:34:56 +01:00
fbsanchez 26d231e78c Improved user experience networkmaps
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
Alejandro Gallardo Escobar 107594bf48 Visual Console Refactor: added a WIP version of two items
Former-commit-id: 817361ea626057d7a23d2584fb1da1defa75b848
2019-03-21 18:42:53 +01:00
fbsanchez da3602fbc5 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 7867c83c3571bcd27c19f4c1dcdc6e8b95eb2715
2019-03-21 18:38:41 +01:00
fbsanchez 8fd3f7788a networkmap functions ligth cleanup
Former-commit-id: 51d7eaa9dee0d58eb8e01f4043149766145df20d
2019-03-21 18:38:31 +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
Daniel Maya 282a816c01 Updated doc and created box class
Former-commit-id: b369630638f809f82bedb1745914538b24cb4922
2019-03-21 17:47:10 +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
fermin831 af9936c78f Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/install.php

Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
manuel 603f8a08e8 Fixed bug in ACL setup section 2
Former-commit-id: a3d2f53cdc169fe7a5455368229e396451de0208
2019-03-21 13:15:21 +01:00
fermin831 94cf43d6ab [Netflow live] Separate relationships data from circular mesh parsing
Former-commit-id: 68485217517ab70bcabed8855fdc9127b83547a6
2019-03-21 13:09:48 +01:00
fermin831 030bcc69c4 [Netflow live] Readded circular mesh and some refactorizations
Former-commit-id: a3b2d9cf622a6e539baff9de3c36f1b7a7072e4b
2019-03-21 12:37:03 +01:00
Alejandro Gallardo Escobar fa366590ce Visual Console Refactor: WIP version of the label item
Former-commit-id: 8a8ef1b789442a566156e726edceb692911222b3
2019-03-21 09:45:42 +01:00
Daniel Barbero Martin 8551abc51e Merge remote-tracking branch 'origin/develop' into ent-3731-Bug_en_reports_SLA_mensual
Former-commit-id: 78e83edbfbec6e25c305dc5aa5f400d098bc4801
2019-03-21 08:29:51 +01:00
artica dfadf48b4e Auto-updated build strings.
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
fermin831 1da6d3710b Minor style fix
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
2019-03-20 18:26:27 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
fbsanchez 756e785634 Merge branch 'wip/3595' into 'ent-3595-discovery-fase-2'
Wip/3595

See merge request artica/pandorafms!2279

Former-commit-id: e079a3c54a1f054498cb67af759ee5d3f1be4eac
2019-03-20 17:33:47 +01:00
fbsanchez ad432ffc12 Merge branch 'ent-3595-discovery-fase-2' into wip/3595
Former-commit-id: df24037730e212308a8e8805e0440e73e1ec0f16
2019-03-20 17:28:35 +01:00
fbsanchez 05c03d2d46 NetworkMap class
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
fermin831 a0f4163c1d Fix netflow filters on database
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
Tatiana Llorente 5d409cd778 New view user edit
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
Daniel Maya ca1b6f1ee4 created item class and test
Former-commit-id: b3a0b052f3556c5bafdac492718f9c7c63f9e85b
2019-03-20 16:31:29 +01:00
alejandro-campos e60934b215 Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: f223b20926f7107793020caa3a348528b76ea5b3
2019-03-20 16:07:11 +01:00
Alejandro Fraguas 49a28eb13c Merge branch 'ent-3612_Update_manager_eliminar_archivos_obsoletos' into 'develop'
add delete files in update manager

See merge request artica/pandorafms!2263

Former-commit-id: 13d246c80921f2d4b5ceb0b191d0024e8bba753c
2019-03-20 15:51:19 +01:00
alejandro-campos 791a3ccfc6 Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4ac64c1af6d4487f6a5d1ad1a55400b1879bb730
2019-03-20 15:48:37 +01:00
alejandro-campos 67d24860d1 Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
2019-03-20 15:46:33 +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
fbsanchez 9b68e7d04e Switch extended events to standard events in host creation (recon)
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
2019-03-20 14:15:33 +01:00
Daniel Barbero Martin daf72a4bac fixed errors delete files update manager open and metaconsole
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +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
fbsanchez 9aecc6b85b NetworkClass RC1
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
2019-03-20 13:10:20 +01:00
Daniel Rodriguez 058d7f4410 Merge branch 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite' into 'develop'
fix auth parameters not being included in agent config file when creating module…

See merge request artica/pandorafms!2268

Former-commit-id: f419becfe09a90b75b3efb896a61340f284a958c
2019-03-20 12:35:34 +01:00
fermin831 9b345ea947 [Netflow live] Hide netflow circular mesh
Former-commit-id: d00293853fc8b498ddee9798b1d1feaea3c13fbf
2019-03-20 12:16:30 +01:00
Alejandro Gallardo Escobar 53d00d3c89 Visual Console Refactor: added a bootstrap file for tests
Former-commit-id: cf89bb15900c5d4c4f56d2fde5852badee9ddfb1
2019-03-20 11:59:33 +01:00
manuel 05ab375f8a Fixed bug in meta
Former-commit-id: abccf5d87390bdb9981928e975947fe3ad71cc70
2019-03-20 11:32:25 +01:00
fermin831 f32e022b1b Fixed detailed host traffic chart
Former-commit-id: abdf6f9d171facf53260d90f28204d1e81bbeaf4
2019-03-20 10:26:44 +01:00
Daniel Barbero Martin 1fe1beb930 fixed IPAM config
Former-commit-id: 39b80d2ca41c21a823cdec5948e30109a81eeb2a
2019-03-20 09:51:15 +01:00
artica c598eb60fb Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
fbsanchez 1b99c5db49 WIP netclass editor
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
2019-03-19 20:43:08 +01:00
fermin831 bc9192b98a [Netflow] Merge three reports in one
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
manuel 6121c2a32b Added types reports to send email
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +01:00
Daniel Barbero Martin df85b0f700 fixed SLA weekly hourly and monthly
Former-commit-id: 9c04c8f55b080d6d12f3b3868e7d96660db76470
2019-03-19 16:09:59 +01:00