147 Commits

Author SHA1 Message Date
Daniel Maya
24161241fb #12952 Fixed check nfdump 2024-02-28 15:33:37 +01:00
Diego Muñoz-Reja
1980b36c17 Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop'
Ent 11165 Añadir info de whois de una IP dada en Netflow explorer

See merge request artica/pandorafms!6827
2024-01-31 09:14:44 +00:00
alejandro.campos@artica.es
18cb14bec6 minor fixes 2024-01-25 16:03:48 +01:00
alejandro.campos@artica.es
19024e63d3 implement several changes in top-n connection report item 2024-01-08 18:05:29 +01:00
alejandro.campos@artica.es
f6ee798603 implement several changes in top-n connection report item 2024-01-08 17:59:23 +01:00
alejandro.campos@artica.es
9a7ef16f9c implement several changes in top-n connection report item 2024-01-08 17:31:52 +01:00
Daniel Cebrian
3287ab2ee4 #11165 new popup for command whois in netflow 2024-01-03 17:06:20 +01:00
Daniel Cebrian
8aa1e88317 #12191 optimized command netflow and sflow 2023-10-18 19:02:27 +02:00
Rafael Ameijeiras
9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop'
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
2023-07-19 11:54:01 +00:00
Daniel Cebrian
018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
Jonathan
82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Jonathan
9fd08c928a #11573 network filters 2023-06-19 16:14:21 +02:00
miguel angel rasteu
db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu
1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu
933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Cebrian
9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Jose Gonzalez
9ac04fba28 Netflow fix 2023-03-16 09:42:59 +01:00
Daniel Cebrian
f79d22b781 #9624 clear log 2023-03-13 09:57:57 +01:00
Daniel Cebrian
ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Daniel Barbero
01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
alejandro.campos@artica.es
065617a67a fixed several netflow bugs 2022-03-21 13:24:23 +01:00
alejandro.campos@artica.es
1a030bcd42 fixed several netflow bugs 2022-03-21 12:21:47 +01:00
alejandro.campos@artica.es
abae27e361 implement new netflow item 2022-02-21 15:27:41 +01:00
alejandro.campos@artica.es
931477fcd5 implement new netflow item 2022-02-21 12:26:48 +01:00
alejandro.campos@artica.es
659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
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