José González
|
bdc4d0a8b1
|
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
|
2021-11-04 16:28:15 +01:00 |
Jose Gonzalez
|
c0abe5edb9
|
Fix merge
|
2021-11-04 16:00:05 +01:00 |
fbsanchez
|
a5bf72cca0
|
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
|
2021-10-26 14:21:40 +02:00 |
Daniel Rodriguez
|
35c877ad79
|
Merge branch 'ent-8024-source-ip-advanced-filter' into 'develop'
Ent 8024 source ip advanced filter
See merge request artica/pandorafms!4430
|
2021-10-06 08:34:56 +00:00 |
Jose Gonzalez
|
6deaee84ac
|
Merge
|
2021-10-04 10:00:15 +02:00 |
Daniel Maya
|
12d47cd1aa
|
#8024 fixed router ip
|
2021-09-30 16:09:08 +02:00 |
|
Jose Gonzalez
|
8696d21a42
|
Fixed any minor bugs
|
2021-09-29 17:03:13 +02:00 |
|
Daniel Maya
|
fb449910c9
|
#7963 Fixed netflow view 2
|
2021-09-29 10:57:57 +02:00 |
|
Daniel Maya
|
d237fab6a6
|
#8024 fixed router ip
|
2021-09-28 13:42:30 +02:00 |
|
Daniel Maya
|
af4e49e156
|
#7963 Fixed netflow view
|
2021-09-28 09:42:05 +02:00 |
|
José González
|
fb129750d5
|
Fixed issues with views in Netflow live view
|
2021-06-28 12:03:25 +02:00 |
alejandro.campos@artica.es
|
9cde8c345f
|
removed deprecated incident permissions
|
2021-05-13 13:33:45 +02:00 |
Marcos Alconada
|
d8a628b1c4
|
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
|
2021-03-11 14:40:23 +00:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
|
José González
|
311b259684
|
Backup upload
|
2020-06-30 12:16:51 +02:00 |
Junichi Satoh
|
64493fc9fa
|
Modified nfdump's arguments order. The 'filters' should be last with some nfdump binary.
|
2020-04-30 16:00:33 +09:00 |
|
alejandro-campos
|
0a1dd6fe24
|
fix save of filters
|
2020-02-21 13:01:47 +01:00 |
|
alejandro-campos
|
e0a159736c
|
safe output to string with entities
|
2020-02-21 10:50:56 +01:00 |
|
alejandro-campos
|
b9e3c70374
|
fix bug when saving netflow filters
|
2020-02-18 11:25:45 +01:00 |
Luis Calvo
|
22cd129f71
|
Fixed netflow command injection vulnerability
|
2019-12-03 13:58:14 +01:00 |
fermin831
|
932802acb4
|
Fixed netflow reports resolution
Former-commit-id: f49404e7c1129344df026a81e4059e9276acf9eb
|
2019-03-28 15:16:09 +01:00 |
|
fermin831
|
189d4864dc
|
[Network usage map] Refactorized some code
Former-commit-id: 83fe7cedef01b4d4d38045b15c6b37ec936d5fb3
|
2019-03-26 09:10:28 +01:00 |
|
fermin831
|
58e74c1db1
|
Fixed minor warning
Former-commit-id: 38278d285faa6aea5f61d0933543b7e24926ae79
|
2019-03-26 08:40:22 +01:00 |
|
fermin831
|
85474c6037
|
[Network usage map] Minor changes
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
|
2019-03-25 16:40:07 +01:00 |
|
fermin831
|
f9744ca8c8
|
Added Others node
Former-commit-id: 64179fd7b2520e3378d188438f8bc846edb56004
|
2019-03-25 15:57:04 +01:00 |
|
fermin831
|
d37acbb159
|
[Netflow usage map] Added data to show
Former-commit-id: ca4db091b4c0f40061b9f7b8f13c4fe915ce022e
|
2019-03-25 13:10:47 +01:00 |
|
fermin831
|
1dceb93a76
|
Added some docs
Former-commit-id: 22d2aeda5c16a4fcf4414760affb77a6d5c0c375
|
2019-03-25 12:40:49 +01:00 |
|
fermin831
|
6a1bf2fbce
|
Added first version of live map
Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779
|
2019-03-25 11:34:03 +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 |
|
fermin831
|
1da6d3710b
|
Minor style fix
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
|
2019-03-20 18:26:27 +01:00 |
|
fermin831
|
9b345ea947
|
[Netflow live] Hide netflow circular mesh
Former-commit-id: d00293853fc8b498ddee9798b1d1feaea3c13fbf
|
2019-03-20 12:16:30 +01:00 |
|
fermin831
|
f32e022b1b
|
Fixed detailed host traffic chart
Former-commit-id: abdf6f9d171facf53260d90f28204d1e81bbeaf4
|
2019-03-20 10:26:44 +01:00 |
|
fermin831
|
bc9192b98a
|
[Netflow] Merge three reports in one
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
|
2019-03-19 17:33:39 +01:00 |
|
fermin831
|
bf633e891c
|
[Netflow live] Merged summatory pie and statistic into a single view called Summary
Former-commit-id: 367adc7ff96bdd6b16c4d4acf9fff2fb02cd4a75
|
2019-03-18 16:44:16 +01:00 |
|
fermin831
|
80c79b532b
|
[Netflow live] Removed aggregate by protocol
Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef
|
2019-03-18 15:44:23 +01:00 |
|
fermin831
|
60870efad6
|
[Netflow live] Removed aggregate and resolution from report content and move to header subtitle
Former-commit-id: 205e5f8ff7633016fe83667b2fc237bc1bdae03f
|
2019-03-18 10:54:37 +01:00 |
|
Fermin
|
fbce6d8aba
|
Fixed code style
Former-commit-id: 0292582ee1d12de325929e77053f1f15985791fb
|
2019-03-15 14:24:49 +01:00 |
|
Fermin
|
c123d9d9fd
|
[Netflow live] Recalculate multiplier time if resolution is too high
Former-commit-id: 60861c9e220a9d69841939dd485265e52542b1ae
|
2019-03-15 11:36:13 +01:00 |
|
fermin831
|
6299d23528
|
[Netflow live] Minor fixes
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
|
2019-03-14 17:49:44 +01:00 |
|
fermin831
|
da08acce4f
|
[Netflow live] Removed units
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
|
2019-03-14 10:36:15 +01:00 |
|
fermin831
|
cf8915af36
|
[Netflow live] Removed unit from circular mesh
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
|
2019-03-14 10:05:21 +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 |
|
fermin831
|
834c18e49e
|
[Netflow live] Remove unit from statistics table
Former-commit-id: 2b0289fef0b663b558794b2ac1b16d0128c68bc9
|
2019-03-14 09:07:17 +01:00 |
|
Fermin
|
473a40e7d2
|
[Netflow live] Removed unit functionallity from area graph and data table
Former-commit-id: 2d60141028e01e1fdf5a9d5716aa69a2cfe08d08
|
2019-03-13 21:14:43 +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 |
|
fermin831
|
a321a7465d
|
Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/include/functions_netflow.php
pandora_console/operation/network/network_report.php
Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668
|
2019-03-11 13:19:17 +01:00 |
|
Fermin
|
ed25536a97
|
Added top by other metric in netflow report
Former-commit-id: 48f5b58ea255c59ffaa109805032c1b35de61a48
|
2019-03-08 11:57:32 +01:00 |