Commit Graph

3310 Commits

Author SHA1 Message Date
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
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
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
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
fermin831 935db452d2 Network report. Fixed some styles
Former-commit-id: 19a181044bae3f5bcec1f873e20ec50c41a73f00
2019-03-11 15:02:22 +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
Daniel Rodriguez ae006026bf Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
fixed error in snmp browser change server

See merge request artica/pandorafms!2236

Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
Fermin fbd5648d60 Added filter to ntop part in network explorer
Former-commit-id: 688f737c26599da309ed414f4291e24e521d74a0
2019-03-08 12:11:18 +01:00
Fermin ed25536a97 Added top by other metric in netflow report
Former-commit-id: 48f5b58ea255c59ffaa109805032c1b35de61a48
2019-03-08 11:57:32 +01:00
Fermin e9061d74b6 Added ordering header element
Former-commit-id: 11ffbe8c00a8ea9d881321be7c7541eaf0babe92
2019-03-08 11:46:47 +01:00
Fermin 7b9bbe6b9c Fixed reporting menu
Former-commit-id: efaf4d26e0d48bbdea3df7afb2c462a1b70a6701
2019-03-08 09:29:12 +01:00
Fermin dd8265f65e Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
fermin831 6fc0a4924b Do not calculate percentages. Catch it from netflow
Former-commit-id: b06a18df02d90a29660a34309a9d40c5774816b9
2019-03-07 19:11:30 +01:00
fermin831 a191823d83 Added pct to netflow explorer datas
Former-commit-id: 63907ccffb70dd2b2fc98cee065b2100d827ed2a
2019-03-07 17:25:18 +01:00
fermin831 aecbdabbe0 Change period by a module interval input
Former-commit-id: 9f1b25e803d62a6ab501ba701083fd823a14bd64
2019-03-07 15:15:16 +01:00
fermin831 1f89cccbbe Change item link filter by image filter in network/flow explorer
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
fermin831 1fa4ef4555 Change start date by end date and vice versa
Former-commit-id: 193fff3013e21d8fc812bd8c6092bbf203fb104e
2019-03-07 14:04:29 +01:00
fermin831 76422928e8 Added version check on netflow explorer
Former-commit-id: 2786b7a6c0282920d11808e77a2f66fc549d01e9
2019-03-07 14:01:50 +01:00
daniel 798567bf8e fixed minor errors change word command for parameters
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
daniel f79400ecfb Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
marcos.alconada e79e2a4fbc Finished
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
marcos.alconada 18ca3a191b ticket changed
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
fermin831 962284f8c5 Added action to hidden params en network explorer
Former-commit-id: e87bab9db0bb00a0b13f2bb6e0cc58a000b18c17
2019-03-06 13:41:13 +01:00
fermin831 de35de6689 Added flows to CSV
Former-commit-id: 2cff3714b1502c3abcb36ec20e5a2fc354242a8b
2019-03-06 13:36:28 +01:00
fermin831 ccb8078a5a Added listeners and talkers netflow explorer
Former-commit-id: aabd4c468ae9163a89447da170861a5ab1dcc2a0
2019-03-06 13:31:55 +01:00
Fermin 2e65301ace Make IP filter permanent and added a remove button
Former-commit-id: f36766f60881edd7825c7aa992c832f8b74cda38
2019-03-05 18:14:38 +01:00
Fermin c09f89dffe Added expport to CSV button
Former-commit-id: 7e8c23fbceb0e20bd0bc895212a52017241b68de
2019-03-05 17:30:47 +01:00
Fermin 86a8024daa Minor fix
Former-commit-id: 607950b830c329095bb011966df4a4f67d270ed9
2019-03-05 14:10:44 +01:00
Fermin 233ede643b Added chart to network report
Former-commit-id: 3dab00002afd311e787f1f4fc062958e189948d7
2019-03-05 12:33:01 +01:00
Fermin a01319464e Added link with params html component and modify the network report
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
Fermin 942b160a3d Use multiples in network explorer table
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
2019-03-05 08:03:18 +01:00
Fermin d62b7f0d79 Added filter by ip requesting network matrix datas
Former-commit-id: 20a88fe66f9bcb2c39a9121b46e7204ed006470d
2019-03-04 20:26:11 +01:00
fermin831 c95b057c14 Added simple table on network explorer
Former-commit-id: 9f2cdc58d7fc1f0375e6945c087aafbd521bacc9
2019-03-04 17:03:10 +01:00
fermin831 32f14e8fe4 Added header to network explorer
Former-commit-id: ba49f7cb158affc89d006c77f64a1448c7da178e
2019-03-04 16:31:59 +01:00
fermin831 8480572e5a Added network explorer report filter
Former-commit-id: f50d86b3ba226cc8068b3eae0fb5c72f4d30dd0b
2019-03-04 16:29:08 +01:00