fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
1dceb93a76
Added some docs
...
Former-commit-id: 22d2aeda5c16a4fcf4414760affb77a6d5c0c375
2019-03-25 12:40:49 +01:00
eba858d6c1
[Network usage map] Fixed timepickers
...
Former-commit-id: d5803cea0443eae7a0dca2846dfba199a5e35f3c
2019-03-25 12:32:39 +01:00
ddc01f9a4e
Added data from NTA to networl_usage_map
...
Former-commit-id: 9f6192faa1698959ce1ba44e13b974b8470a6a3c
2019-03-25 12:30:51 +01:00
24309e9582
Fixed enterprise acl in extensions(tool)
...
Former-commit-id: 966614e5214713c94ed40e0df86d6061695667f1
2019-03-25 12:22:18 +01:00
6a1bf2fbce
Added first version of live map
...
Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779
2019-03-25 11:34:03 +01:00
e1a4250d01
NetworkClass RC1
...
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
b5401a500c
minor fixes
...
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
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
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
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
3916bcf636
Auto-updated build strings.
...
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
0e51cd0760
Auto-updated build strings.
...
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
9efd962867
Auto-updated build strings.
...
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
0708947804
add interface link fix
...
Former-commit-id: 368a30d67bdbd3a08e503167b81a75fb733f327b
2019-03-22 20:30:14 +01:00
83a80b6aa2
minor fix
...
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
eac0d66056
refresh holding area in networkmap
...
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
2019-03-22 19:16:45 +01:00
face622e9e
reset-map fixed
...
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
091e2db13a
minor fix
...
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
2019-03-22 16:00:01 +01:00
732fdafc14
custom text in links
...
Former-commit-id: 31b851b5c296e8beb135a60f6b67ee8a073a28ea
2019-03-22 15:08:44 +01:00
e31607a4e0
custom link colors
...
Former-commit-id: 9aa8f8114494d8b8fd8f010fa5066142fd104f70
2019-03-22 15:06:01 +01:00
9ef66a11c4
custom link colors
...
Former-commit-id: 44a7df6e814679cfff1a0489374c25edcc9ab52c
2019-03-22 15:00:02 +01:00
4910da5e31
minor fix map_filter builder
...
Former-commit-id: 0ef6bcaa84163f21fe0d6bcd869a7b8646581893
2019-03-22 14:57:29 +01:00
a4c048dd29
minor fix
...
Former-commit-id: 1ccd9e446645362fb9b305a699527c5aa2c20369
2019-03-22 14:43:55 +01:00
bc1195e78e
minor fix
...
Former-commit-id: b100cf9398a52a443f934632794da991ea4f2342
2019-03-22 14:30:50 +01:00
3d71d17440
minor fix
...
Former-commit-id: 3d00cc3810df66e79ac69a71ee48df1c9c6b326e
2019-03-22 14:27:53 +01:00
64c4514ace
minor fix orphans while no pandora node
...
Former-commit-id: 067f83b5cd8fc87922c61622873b60753edebf2d
2019-03-22 13:16:26 +01:00
80ecb58f8f
minor fix orphans while no pandora node
...
Former-commit-id: a9f053624ba5c38a08c3589689d4a56cfcfcff37
2019-03-22 13:04:53 +01:00
0d301cd8ed
minor fix orphans while no pandora node
...
Former-commit-id: 5c21ffec17ba10d77921961c6c813b116449d3a0
2019-03-22 13:02:57 +01:00
45c7bea6e6
Fixed a bug: show map image alternative when offline
...
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
2019-03-22 10:57:22 +01:00
c19ec2b041
fix bug when filtering events by group
...
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
4947d2117a
minor fixes networkmapclass
...
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
cb8cd37ee7
Auto-updated build strings.
...
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
6990951dc7
Fix in group map calculation
...
Former-commit-id: 1d77a55b629553ac89cb0ae33d1d1f1ad76c3de3
2019-03-21 21:34:56 +01:00
26d231e78c
Improved user experience networkmaps
...
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
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
8fd3f7788a
networkmap functions ligth cleanup
...
Former-commit-id: 51d7eaa9dee0d58eb8e01f4043149766145df20d
2019-03-21 18:38:31 +01:00
151fe6ac78
Fixed a bug: show map image alternative when offline
...
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
95d2259236
Improvements. networkmap class
...
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
b8f1b5f6a1
Fixed a bug: show popup double authentication
...
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
2019-03-21 15:58:10 +01:00
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
94cf43d6ab
[Netflow live] Separate relationships data from circular mesh parsing
...
Former-commit-id: 68485217517ab70bcabed8855fdc9127b83547a6
2019-03-21 13:09:48 +01:00
030bcc69c4
[Netflow live] Readded circular mesh and some refactorizations
...
Former-commit-id: a3b2d9cf622a6e539baff9de3c36f1b7a7072e4b
2019-03-21 12:37:03 +01:00
dfadf48b4e
Auto-updated build strings.
...
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
1da6d3710b
Minor style fix
...
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
2019-03-20 18:26:27 +01:00
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
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
ad432ffc12
Merge branch 'ent-3595-discovery-fase-2' into wip/3595
...
Former-commit-id: df24037730e212308a8e8805e0440e73e1ec0f16
2019-03-20 17:28:35 +01:00
05c03d2d46
NetworkMap class
...
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
a0f4163c1d
Fix netflow filters on database
...
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
Tatiana Llorente
fermin831
Daniel Maya
fbsanchez
Alejandro Fraguas
artica
alejandro-campos