Commit Graph

19921 Commits

Author SHA1 Message Date
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
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
artica e43d1aa356 Auto-updated build strings.
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
fermin831 471770ec85 Reduced icon size on netflow explorer
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
2019-03-07 19:16:24 +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
Daniel Rodriguez 962e519bc9 Merge branch 'ent-3590-Ampliar_limite_de_caracteres_en_str_warning_y_str_critical_en_consola' into 'develop'
fixed minor error lenght str.warning and str.critical 1024 charts

See merge request artica/pandorafms!2233

Former-commit-id: d79f8f1b2b293544dd463387d33bd36669accb4c
2019-03-07 15:50:59 +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
daniel cfcb427676 fixed minor error
Former-commit-id: 5025e19699e773afee950a31bdceeeb0eb4bc47d
2019-03-07 14:52:31 +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
fermin831 1abe88c375 Show post in first step in netflow explorer
Former-commit-id: 21263d2d4ce0e9f5249156345c837f90b5227381
2019-03-07 13:38:03 +01:00
Daniel Rodriguez 06705e7e25 Merge branch 'ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva' into 'develop'
add new functionality in event response

See merge request artica/pandorafms!2212

Former-commit-id: e32962100f2f2b71f1977f29e10c0772b6c27e17
2019-03-07 11:13:36 +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
artica 4eb6c16339 Auto-updated build strings.
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
fermin 9e87585e4b Merge branch 'ent-3618-meter-las-dependencias-del-modo-debug-en-la-imagen-de-docker' into 'develop'
Added debugger and profiler deps to Dockerfile

See merge request artica/pandorafms!2220

Former-commit-id: 82ba7af10d0d644fc91e2af5d0a43b21afa6f27d
2019-03-06 15:47:55 +01:00
Daniel Rodriguez 9152e2f236 Merge branch 'ent-3504-Bug-pandoradbmigrate' into 'develop'
add changes to migrate script

See merge request artica/pandorafms!2214

Former-commit-id: 24ef182bbdf7b7daabb613e865c88befaec09acc
2019-03-06 14:27: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
Daniel Rodriguez 7ded65d162 Merge branch 'ent-3432-Nueva-cabecera-y-menu-lateral' into 'develop'
Ent 3432 nueva cabecera y menu lateral

See merge request artica/pandorafms!2240

Former-commit-id: ea97a0795a923bb4a72d30c96de90490fb3a879b
2019-03-06 10:59:13 +01:00
Tatiana Llorente acc44ff9ce Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
Conflicts:
   pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +01:00
Tatiana Llorente b2bf411608 Resolve conflict with install.php - #3432
Former-commit-id: 7b082b9f2f4aaae5dd2218abc6ae67d17640735e
2019-03-06 08:59:41 +01:00
artica 88f1f16a5a Auto-updated build strings.
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +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
Alejandro Fraguas 63cd5fe018 Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop'
Fixed width unit on graph, setted to px instead of %

See merge request artica/pandorafms!2234

Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
2019-03-05 18:06:45 +01:00
Fermin c09f89dffe Added expport to CSV button
Former-commit-id: 7e8c23fbceb0e20bd0bc895212a52017241b68de
2019-03-05 17:30:47 +01:00
alejandro-campos 4943521904 fix pandora migrate script
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
2019-03-05 15:28:39 +01:00
Daniel Rodriguez 6bc73b54cb Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop'
Fixed downtimes disabled and enabled agents

Closes pandora_enterprise#3529

See merge request artica/pandorafms!2205

Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
2019-03-05 14:43:10 +01:00
Fermin 86a8024daa Minor fix
Former-commit-id: 607950b830c329095bb011966df4a4f67d270ed9
2019-03-05 14:10:44 +01:00
Alejandro Fraguas 590accf90c Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
Added new alert when failed database

See merge request artica/pandorafms!2229

Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
Tatiana Llorente 033eb2ff7c Fixed problem with install.php #3432
Former-commit-id: 7b1ac63e6a032fe2b1511c15e783fc5bbb6ac537
2019-03-05 13:33:29 +01:00
Tatiana Llorente 35633d181b Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/install.php


Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Fermin 233ede643b Added chart to network report
Former-commit-id: 3dab00002afd311e787f1f4fc062958e189948d7
2019-03-05 12:33:01 +01:00
Daniel Rodriguez f817a94609 Merge branch 'ent-3319-ldap-save-password-conf-not-saving' into 'develop'
Fixed ldap conf tooltips

See merge request artica/pandorafms!2238

Former-commit-id: 355e217947287e500ea146a8f3777ec1cb3bc219
2019-03-05 10:34:15 +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
Luis Calvo 2ceba76d22 Fixed ldap conf tooltips
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
Fermin 942b160a3d Use multiples in network explorer table
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
2019-03-05 08:03:18 +01:00
artica 930c527ad2 Auto-updated build strings.
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +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