Commit Graph

20378 Commits

Author SHA1 Message Date
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
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
fbsanchez 825128e31e WIP: minor updates in notification wrapper
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
fbsanchez 63ee3b0329 wip: style checks
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
fbsanchez 70e4e86cdf Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
fbsanchez c03631ec9b Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
2019-03-05 18:56:14 +01:00
fbsanchez 39805c3f0c removed old useless code
Former-commit-id: d378a359085f9ad8d45f40bff6c280b456a86c33
2019-03-05 18:29:42 +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 5c65f2541d Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 12579e897dc21339580e7b52f4de593714431c58
2019-03-05 16:48:41 +01:00
alejandro-campos 0548fdd95f Change english strings
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
2019-03-05 16:48:27 +01:00
Alejandro Gallardo Escobar fe61d38686 Visual Console Client: improved the build system
Former-commit-id: ced96606af3fd36d2d77a2963df7ca70f4174d6e
2019-03-05 16:45:47 +01:00
Alejandro Gallardo Escobar 10cb9c969b Visual Console Client: improved the module exposition and the playground
Former-commit-id: a519293bd398b4176c164b25fb909ca4e32337bd
2019-03-05 16:18:52 +01:00
Alejandro Gallardo Escobar b5ddabb9de Visual Console Client: improvements into the clock item
Former-commit-id: c328ea72b00857d10317de6f0812df05c30ec856
2019-03-05 16:17:57 +01:00
Alejandro Gallardo Escobar f34c9df172 Visual Console Client: added a function to prefix css rules
Former-commit-id: a920845d44bc7b29899c1213347e0967c071e44d
2019-03-05 16:16:29 +01:00
Alejandro Gallardo Escobar d6028b809e Visual Console Client: huge improvements on the webpack loaders
Former-commit-id: b374944088b36cbe6db066bfb56f4597b464cadc
2019-03-05 16:14:39 +01:00
Alejandro Gallardo Escobar cb04947ca2 Visual Console Client: added mocks to the test runner
Former-commit-id: 239ef3cff19026884bac8f70a101d8d8dc95d34d
2019-03-05 16:12:32 +01:00
fbsanchez 4c0263206e WIP: Networkmap & recon improvements
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +01:00
Alejandro Gallardo Escobar d76f00ec9b Visual Console Client: minor fix
Former-commit-id: 92b2bd59717dda204af1746671fb3191dae2d0ea
2019-03-05 16:11:59 +01:00
Daniel Maya e26c81aa6c Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
alejandro-campos 4943521904 fix pandora migrate script
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
2019-03-05 15:28:39 +01:00
alejandro-campos 9d29af2af5 add new field for table treport_content
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
2019-03-05 15:15:48 +01:00
alejandro-campos da0f0b492a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: dbfc5603652eacc4214e6503b5603bd79f834984
2019-03-05 15:06:18 +01:00
alejandro-campos 09897591c3 Add extended events to event reporting tables
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +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
fbsanchez 054bc070f7 WIP review netmaps
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
2019-03-05 13:19:03 +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