Commit Graph

20364 Commits

Author SHA1 Message Date
Alejandro Fraguas c76558c66e Merge branch 'ent-3564-sincronizar-colecciones-desde-meta-con-modo-centralizado-edicion-de-directorios-nodo' into 'develop'
Fixed synchronize collections in node

See merge request artica/pandorafms!2226

Former-commit-id: 18310b2aa7ae2275e2c19196118f00738a64daf4
2019-03-08 10:25:08 +01:00
alejandro-campos 35ff5ced90 add aws first task icon
Former-commit-id: b5e083e599ebe00194261cbb5a6da017c5723f2c
2019-03-08 10:14:17 +01:00
manuel c41c9d10e0 Changed sql files
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +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
fbsanchez 3e39e727b6 WIP: Unified class NetworkMapClass
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
Alejandro Gallardo Escobar 913a69e99a Visual Console Client: WIP
Former-commit-id: 677dde49e68e8b2f1ebd15fba60a4b99253fa7d5
2019-03-07 18:41:33 +01:00
Luis Calvo 98ec2f31e6 Restored width in % and forced Agent SNMP view to enter if with widget=true
Former-commit-id: 25ca763789d5d30d298b6bf77bd5f0630aff526f
2019-03-07 18:05:03 +01:00
Alejandro Gallardo Escobar c58dbf3d33 Visual Console Client: improved the cleaning of the build output dir
Former-commit-id: b92a726c0b098c73901feec53d872f9f25bc2fa1
2019-03-07 17:42:42 +01:00
fermin831 a191823d83 Added pct to netflow explorer datas
Former-commit-id: 63907ccffb70dd2b2fc98cee065b2100d827ed2a
2019-03-07 17:25:18 +01:00
Alejandro Gallardo Escobar 0dcbec64b4 Visual Console Client: now the files are built into the console
Former-commit-id: 7bf533c9acb53a64d3a2babd43942248880dbb8e
2019-03-07 17:20:24 +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
daniel 00283a5c6a progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +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
manuel 1020ec1bd7 Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
Conflicts:
pandora_console/godmode/setup/setup_visuals.php


Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
fermin831 1abe88c375 Show post in first step in netflow explorer
Former-commit-id: 21263d2d4ce0e9f5249156345c837f90b5227381
2019-03-07 13:38:03 +01:00
manuel d4f5482e99 Added custom field combo values in agent custom field
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
fbsanchez 3d09f81b7b Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: ef351653298260cfc0c2a3089e7792e8d2ebe737
2019-03-07 11:57:37 +01:00
fbsanchez 97e6c7c77d minor fix notif. satellite crashed
Former-commit-id: 829dc9d8ab224698bfb33582917ca8008ba7b255
2019-03-07 11:57:31 +01:00
daniel 560c6090a4 deprecated files
Former-commit-id: e5c9fb8f58ee78207514d045b478f5d534d86f89
2019-03-07 11:13:44 +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 db150470cb fixed errors in custom net scan
Former-commit-id: 15243259cbffa8c639e6412866349357753e1198
2019-03-07 11:09:28 +01:00
marcos.alconada 2d6636bb51 Revert changes on dbmanager.php
Former-commit-id: 3c9eaec695b923ea81f60d8dcfb5716af6515e37
2019-03-07 10:36:06 +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
daniel 20a0a64149 Merge remote-tracking branch 'origin/develop' into 3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local
Former-commit-id: 8cd0faa32438d2f8f14c409a64c24a4684b3d16f
2019-03-07 08:19:39 +01:00
daniel f224ec19de Merge remote-tracking branch 'origin/develop' into ent-2674-Nueva_macro_event_timestamp
Former-commit-id: 3f8a5700ea1555758a56bc47eb219d00cb5df34f
2019-03-07 08:16:19 +01:00
artica 4eb6c16339 Auto-updated build strings.
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
fbsanchez aef10cf649 Fixed grown in notifications
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
2019-03-06 19:39:07 +01:00
fbsanchez a860b293e3 minor fixes in url and descriptions (discovery)
Former-commit-id: a53542c61164a41cd4c2befea73191e9f74e5800
2019-03-06 18:28:00 +01:00
fbsanchez b9357b6b73 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 275cfc7046e2155a6b9d1860372f59cc175924c8
2019-03-06 18:02:47 +01:00
fbsanchez aa67c6b157 Improved notifications text avoiding entities
Former-commit-id: ef21786881bcd1b7bc332275e533757fc7bddd33
2019-03-06 18:00:28 +01:00
marcos.alconada e79e2a4fbc Finished
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
daniel d722c39393 add custom net scan
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
alejandro-campos d760c7d701 fix bug in functions_filemanager
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
2019-03-06 17:07:37 +01:00
marcos.alconada 18ca3a191b ticket changed
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
fbsanchez 40bc938000 notifications font color and some minor changes
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
2019-03-06 16:38:06 +01:00
fbsanchez 05c6e82e93 WIP: netmap
Former-commit-id: 9d269c2829df2c2e4eaddb7432ff1071ee1adb3a
2019-03-06 16:30:40 +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