Commit Graph

15864 Commits

Author SHA1 Message Date
fermin831 1da6d3710b Minor style fix
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
2019-03-20 18:26:27 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
fbsanchez ad432ffc12 Merge branch 'ent-3595-discovery-fase-2' into wip/3595
Former-commit-id: df24037730e212308a8e8805e0440e73e1ec0f16
2019-03-20 17:28:35 +01:00
fbsanchez 05c03d2d46 NetworkMap class
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
fermin831 a0f4163c1d Fix netflow filters on database
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
Tatiana Llorente 5d409cd778 New view user edit
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
Daniel Maya ca1b6f1ee4 created item class and test
Former-commit-id: b3a0b052f3556c5bafdac492718f9c7c63f9e85b
2019-03-20 16:31:29 +01:00
alejandro-campos e60934b215 Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: f223b20926f7107793020caa3a348528b76ea5b3
2019-03-20 16:07:11 +01:00
Alejandro Fraguas 49a28eb13c Merge branch 'ent-3612_Update_manager_eliminar_archivos_obsoletos' into 'develop'
add delete files in update manager

See merge request artica/pandorafms!2263

Former-commit-id: 13d246c80921f2d4b5ceb0b191d0024e8bba753c
2019-03-20 15:51:19 +01:00
alejandro-campos 791a3ccfc6 Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4ac64c1af6d4487f6a5d1ad1a55400b1879bb730
2019-03-20 15:48:37 +01:00
alejandro-campos 67d24860d1 Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
2019-03-20 15:46:33 +01:00
alejandro-campos b5e1487736 add strict comparator
Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b
2019-03-20 15:26:42 +01:00
alejandro-campos 36119ebb85 fix bug in event filter by group when not using secondary groups
Former-commit-id: fe9c88e8e2d7552fed7e5c7cd5a5694d47ee444f
2019-03-20 14:48:02 +01:00
Daniel Barbero Martin daf72a4bac fixed errors delete files update manager open and metaconsole
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
Tatiana Llorente d27c509817 Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
2019-03-20 13:28:07 +01:00
Tatiana Llorente a99c8b1a7b New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
fbsanchez 9aecc6b85b NetworkClass RC1
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
2019-03-20 13:10:20 +01:00
Daniel Rodriguez 058d7f4410 Merge branch 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite' into 'develop'
fix auth parameters not being included in agent config file when creating module…

See merge request artica/pandorafms!2268

Former-commit-id: f419becfe09a90b75b3efb896a61340f284a958c
2019-03-20 12:35:34 +01:00
fermin831 9b345ea947 [Netflow live] Hide netflow circular mesh
Former-commit-id: d00293853fc8b498ddee9798b1d1feaea3c13fbf
2019-03-20 12:16:30 +01:00
Alejandro Gallardo Escobar 53d00d3c89 Visual Console Refactor: added a bootstrap file for tests
Former-commit-id: cf89bb15900c5d4c4f56d2fde5852badee9ddfb1
2019-03-20 11:59:33 +01:00
fermin831 f32e022b1b Fixed detailed host traffic chart
Former-commit-id: abdf6f9d171facf53260d90f28204d1e81bbeaf4
2019-03-20 10:26:44 +01:00
artica c598eb60fb Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
fbsanchez 1b99c5db49 WIP netclass editor
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
2019-03-19 20:43:08 +01:00
fermin831 bc9192b98a [Netflow] Merge three reports in one
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
Alejandro Campos 5cdf2dffa7 Merge branch 'develop' into 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite'
# Conflicts:
#   pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php

Former-commit-id: f15c507347700205a081d010a9c6f58c0e2e5720
2019-03-19 14:47:32 +01:00
alejandro-campos 120706248b fix auth parameters not being included in agent config file when creating module through SNMP interface wizard using SNMP version 3
Former-commit-id: 86cfc2f9573ecba48af68ca01c43394cd2c23390
2019-03-19 13:24:06 +01:00
Daniel Maya 1f0bb9cf21 new functions for container and new assert test
Former-commit-id: db29ea0fcecd5bb6c36ad1a21b15a35c56c5be24
2019-03-19 12:03:02 +01:00
artica 392c0d0bff Auto-updated build strings.
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
fbsanchez 97b53db82b wip relationships
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
2019-03-18 18:11:54 +01:00
fermin831 bf633e891c [Netflow live] Merged summatory pie and statistic into a single view called Summary
Former-commit-id: 367adc7ff96bdd6b16c4d4acf9fff2fb02cd4a75
2019-03-18 16:44:16 +01:00
fermin831 80c79b532b [Netflow live] Removed aggregate by protocol
Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef
2019-03-18 15:44:23 +01:00
fermin831 4f8c7daada [Netflow live] Change start date and end date
Former-commit-id: 14a24767a1426aa8151ba99495a17ddb71047cbb
2019-03-18 15:33:48 +01:00
Alejandro Gallardo Escobar 7b811fdc84 Visual Console Refactor: added a WIP test file
Former-commit-id: b8bc3aab786a4b66cc7e2de9aa0ca7154f606f67
2019-03-18 13:35:59 +01:00
Alejandro Gallardo Escobar 862cba00de Visual Console Refactor: minor fix
Former-commit-id: 7d01488816c5cbf3f171a8801849d72bc7d153d0
2019-03-18 13:35:30 +01:00
Alejandro Gallardo Escobar 99a6e96ce9 Visual Console Refactor: added a Visual Console model
Former-commit-id: e3ae133ce6ab9c5df3c3f9c079af122e9af92e6c
2019-03-18 12:47:39 +01:00
Alejandro Gallardo Escobar 9eebf18622 Visual Console Refactor: added a base Model class
Former-commit-id: 6051b7706686c9254851c2f9314f6c40bbc2af4d
2019-03-18 12:47:09 +01:00
Alejandro Gallardo Escobar c0e7256339 Visual Console Refactor: added autoload paths
Former-commit-id: 3f6cc155b1bba8435583327c1125b166684dfe6f
2019-03-18 12:46:20 +01:00
fermin831 2be3333d29 Update version script cannot delete initial whitespaces in install.php
Former-commit-id: e0b973605efb316ca73fad0a5cfeded2bffe149d
2019-03-18 11:18:55 +01:00
fermin831 60870efad6 [Netflow live] Removed aggregate and resolution from report content and move to header subtitle
Former-commit-id: 205e5f8ff7633016fe83667b2fc237bc1bdae03f
2019-03-18 10:54:37 +01:00
Daniel Maya c2033715a9 Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af
2019-03-18 09:06:20 +01:00
Daniel Maya d13e7bbf44 new generic functions
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
Daniel Maya 8a7702e054 Update networkmap class with simple map
Former-commit-id: cb6bd489ba973cf0f9c6eda8dee062518f33f382
2019-03-18 09:01:53 +01:00
fermin831 e91335ae21 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/install.php

Former-commit-id: 3d8ef5634d3c1b87e09db11180047bedc0518028
2019-03-18 08:21:25 +01:00
artica 4772f84850 Auto-updated build strings.
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
fbsanchez 1ddeda295c WIP networkmap class
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
2019-03-17 01:39:56 +01:00
artica 093404eedc Auto-updated build strings.
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
artica 16d5bf5f66 Auto-updated build strings.
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
fbsanchez fe045962e7 wip generate_dot
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
2019-03-15 20:44:57 +01:00
Fermin fbce6d8aba Fixed code style
Former-commit-id: 0292582ee1d12de325929e77053f1f15985791fb
2019-03-15 14:24:49 +01:00
Daniel Barbero d5108efb0d fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Fermin c123d9d9fd [Netflow live] Recalculate multiplier time if resolution is too high
Former-commit-id: 60861c9e220a9d69841939dd485265e52542b1ae
2019-03-15 11:36:13 +01:00
Fermin bf5dfd8bdb Extend class to pencil image in html interval component
Former-commit-id: baf46a4b64f58e300b092a8ee71c438931e2d840
2019-03-15 10:52:46 +01:00
Fermin 33fd100d91 [Netflow view] Added start date
Former-commit-id: 98134de0f1e8c40458b36b0a14ad0b8c87bff0f2
2019-03-15 10:46:18 +01:00
Daniel Barbero 916d11c625 Merge remote-tracking branch 'origin/develop' into ent-3612_Update_manager_eliminar_archivos_obsoletos
Former-commit-id: 70641758194522782cc1041f51a278350a7877f1
2019-03-15 10:39:23 +01:00
Daniel Barbero 7e345035e1 add height and round border in d3 graph progress
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
Daniel Barbero 0593e72f3e move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
artica be08d76e6c Auto-updated build strings.
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
fbsanchez 8c8f368993 WIP: NetworkMaps rebuild
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
Daniel Barbero Martin a1aa480421 add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
fermin831 6299d23528 [Netflow live] Minor fixes
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
2019-03-14 17:49:44 +01:00
fbsanchez 99b1aadacb discovery icon set
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +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 cf8915af36 [Netflow live] Removed unit from circular mesh
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
2019-03-14 10:05:21 +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
fermin831 834c18e49e [Netflow live] Remove unit from statistics table
Former-commit-id: 2b0289fef0b663b558794b2ac1b16d0128c68bc9
2019-03-14 09:07:17 +01:00
artica 0ccbb1198a Auto-updated build strings.
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
Fermin 473a40e7d2 [Netflow live] Removed unit functionallity from area graph and data table
Former-commit-id: 2d60141028e01e1fdf5a9d5716aa69a2cfe08d08
2019-03-13 21:14:43 +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
fbsanchez f4290e52fe Minor fix notif. ball margins
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
Daniel Rodriguez e0c63e17d7 Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop'
Add module version line to config module configuration data

See merge request artica/pandorafms!2259

Former-commit-id: 5595b821efd2c15e25458cbe8f5d52ab708c533a
2019-03-13 14:05:08 +01:00
Daniel Rodriguez ff120b23e2 Merge branch 'ent-3675-Tipo-erroneo-modulos-Ifoperstatus-desde-satelite' into 'develop'
Fixed data type to remote_snmp_proc in modules IfOperSttus

See merge request artica/pandorafms!2258

Former-commit-id: 61b2bc62b5605304b2fc278838ed1bf8fc20c395
2019-03-13 13:02:04 +01:00
fbsanchez f5b0e6b1a4 minor fix radial redirection
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
2019-03-13 12:55:24 +01:00
alejandro-campos 1276eb3ecf Add module version line to config module configuration data
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
fbsanchez 95c61024f7 Cleanup Networkmaps
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
Daniel Rodriguez 046a126889 Merge branch 'ent-3696-7723-No-inserta-comentario-create_event-API' into 'develop'
disable cache for events_comment

See merge request artica/pandorafms!2257

Former-commit-id: 1293d55a9bc009b79e37dd54cd848544ae6c3286
2019-03-13 10:32:56 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
artica 99afea22cb Auto-updated build strings.
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
fbsanchez e61d409acc fix in redirection after map creation
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
fbsanchez bf9b84f266 discarded ranksep var as recommended edge len
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
2019-03-12 18:38:58 +01:00
fbsanchez 663c1e0841 NetworkMap class rc1
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
fbsanchez 1bc326c00c WIP: NetworkMap class
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
samucarc a8af2f89d1 Fixed data type to remote_snmp_proc in modules IfOperSttus
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
Alejandro Fraguas cb1fc5dc67 Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
Ent 3616 pantalla de login

See merge request artica/pandorafms!2248

Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
2019-03-12 17:23:04 +01:00
fbsanchez c91c79a735 WIP experiments with graphviz
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
2019-03-12 16:52:42 +01:00
fbsanchez 06f8aae91a WIP NetworkMap class
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
Daniel Maya 96d6e12546 disable cache for events_comment
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
Daniel Rodriguez d314062623 Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop'
Ent 2674 nueva macro event timestamp

See merge request artica/pandorafms!2244

Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
2019-03-12 13:51:47 +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
Tatiana Llorente aaf5d7bf89 New view user edit
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
fbsanchez d7983bec4e WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +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
Tatiana Llorente 29f00dd1da New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
Tatiana Llorente c5722d2e10 New view user edit
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
fbsanchez c6fa365b90 minor fix force discovery console task
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
2019-03-12 10:47:28 +01:00
fbsanchez e5190a91ee WIP NetworkMap class
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
2019-03-12 10:29:35 +01:00
fbsanchez 0ad8a0383f WIP NetworkMap class
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
2019-03-12 10:29:19 +01:00
Tatiana Llorente 9a702a90a1 New view user edit
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
artica 67080c72d9 Auto-updated build strings.
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
fbsanchez 1d660d259f WIP NetworkMap class
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
2019-03-11 20:10:08 +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
fbsanchez e672456998 fixes satellite contact interval detector
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
2019-03-11 18:04:23 +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
Daniel Rodriguez 80fb8679a3 Merge branch 'ent-3578-ACL-visual-consol-not-working-properly' into 'develop'
Ent 3578 acl visual consol not working properly

See merge request artica/pandorafms!2250

Former-commit-id: 66f3e799ed124327f73061962a40dd1f63174b21
2019-03-11 17:02:10 +01:00
Daniel Maya ccb41f1b68 Fixed z_dash(zoom) in networkmap
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
fermin831 e0d41957f9 Netflow graphs display as stacked
Former-commit-id: 58bdd14900b5d6e36041417d31b242f31af9358b
2019-03-11 16:25:10 +01:00
fbsanchez 5f7680f4ee WIP NetworkMap class
Former-commit-id: 0380bec0023a1c6a5eb3f902ed66738c1d297754
2019-03-11 15:40:44 +01:00
fbsanchez 81bc8daa73 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: ad74ff783b7a5747a85057c73c04bca37a622109
2019-03-11 15:38:14 +01:00
fbsanchez 2188caaec2 WIP NetworkMap class
Former-commit-id: 5af817aef635798f1ebdfcf596f30939b327e2a7
2019-03-11 15:37:08 +01:00
Daniel Maya 9db8078e72 Fixed first painted map
Former-commit-id: 8f1098e312b4524568501a25642a533615e899f9
2019-03-11 15:18:09 +01:00
fbsanchez 0920328e0a Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 0064084ad35250594897ae6bb85a1b26c4dbfaa0
2019-03-11 15:10:26 +01:00
fbsanchez c8bad2b68a WIP NetworkMap class
Former-commit-id: e6918056fa9d71d33cc3b06e3c265dc3856e45af
2019-03-11 15:10:22 +01:00
fbsanchez fcab1ae612 WIP NetworkMap class
Former-commit-id: da5ce8681313cdf5c5a7ec7a005c3ebd273fea43
2019-03-11 15:09:31 +01:00
fermin831 935db452d2 Network report. Fixed some styles
Former-commit-id: 19a181044bae3f5bcec1f873e20ec50c41a73f00
2019-03-11 15:02:22 +01:00
Daniel Rodriguez 3b2d72308e Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
Changed Maintainer in pandorafms-agent-unix

See merge request artica/pandorafms!2228

Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
2019-03-11 14:23:00 +01:00
Alejandro Fraguas 9a7bdd76ba Merge branch 'ent-3681-Recuperar-el-boton-de-lista-de-servidores-con-estado' into 'develop'
Added button servers list in header

See merge request artica/pandorafms!2249

Former-commit-id: 21b5bfef18b66b8124fe8d3c26709675ecb14857
2019-03-11 14:12:25 +01:00
Luis Calvo f4208a35f2 Changede sec=reporting to sec=network on visual console link to another console
Former-commit-id: 5cbbae6f99993a7b250feea354eb197fe6355969
2019-03-11 13:25:28 +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
alejandro-campos db2f23a9c2 Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: d0a201e884ba53c33e83c10ff5e0bbe896d00ff5
2019-03-11 12:59:19 +01:00
manuel 8f9beccf76 Fixed url
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
2019-03-11 12:47:27 +01:00
Daniel Rodriguez cfa2c08b16 Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop'
fix bug in functions_filemanager

See merge request artica/pandorafms!2243

Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
2019-03-11 12:37:23 +01:00
manuel bf0e8633ff Added button servers list in header
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
2019-03-11 12:36:52 +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
Tatiana Llorente c6c04fd0c9 Merge remote-tracking branch 'origin/develop' into ent-3616-Pantalla-de-login
Former-commit-id: e3261f935989cbc06f503abe6d8b762cef1b78f0
2019-03-11 10:08:44 +01:00
Tatiana Llorente 71afb7a741 New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
Luis Calvo b6bb7b2697 Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
Former-commit-id: ebd11459b73a64d43228e4d764fc5fc7585ae056
2019-03-11 09:47:24 +01:00
manuel 1acde54a3f Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
Conflicts:
pandora_console/install.php


Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
manuel ccb669a204 Fixed minor errors in setup_ehorus
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
artica 0210c2381d Auto-updated build strings.
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
artica b79815bb06 Auto-updated build strings.
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
artica fd68b49710 Auto-updated build strings.
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
Daniel Maya 75b92a57c4 Created function run_graphviz
Former-commit-id: 3baf21fc620a09518641d63b456c43de32e305ed
2019-03-08 14:12:58 +01:00
Daniel Rodriguez eb1917eed3 Merge branch 'ent-3605-Informe_de_servicios_casca_con_paradas_planificadas' into 'develop'
fixed errors SLA With planned downtime

See merge request artica/pandorafms!2232

Former-commit-id: 6e38f88f9b06e38e5fa1cb8dc770a410a04ba249
2019-03-08 12:14:55 +01:00
Fermin fbd5648d60 Added filter to ntop part in network explorer
Former-commit-id: 688f737c26599da309ed414f4291e24e521d74a0
2019-03-08 12:11:18 +01:00
Luis Calvo 5d33d7468e Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
Former-commit-id: 506c3611ff578c95f07753113d1bc46d80069c95
2019-03-08 12:04:57 +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
Daniel Rodriguez 82a239240c Merge branch 'ent-3677-SLA-Graphics-not-viewing-properly' into 'develop'
Restored width in % and forced Agent SNMP view to enter if with widget=true

See merge request artica/pandorafms!2247

Former-commit-id: 8c579cdb697ff55426bee8c6f3d1a94fda99c7fb
2019-03-08 10:53:43 +01:00
Daniel Rodriguez b19161ed3c Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
Added custom field combo values in agent custom field

See merge request artica/pandorafms!2246

Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
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
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
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
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 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
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
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
fbsanchez 4c0263206e WIP: Networkmap & recon improvements
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +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
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
fbsanchez d89e3993e7 WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
fbsanchez ab453fde68 WIP: event extended reports
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
fermin831 c95b057c14 Added simple table on network explorer
Former-commit-id: 9f2cdc58d7fc1f0375e6945c087aafbd521bacc9
2019-03-04 17:03:10 +01:00
fbsanchez 92974c71d9 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
2019-03-04 16:43:55 +01:00
fbsanchez 756fdd2cd4 minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +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
daniel 9d7c6854a8 fixed error in snmp browser change server
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
Daniel Maya 1f1c9de887 changes in default values in networkmap
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
fbsanchez 9fd391a819 Make always basic checks while browsing pandora
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
2019-03-04 14:57:57 +01:00
fbsanchez 5e496d0d7a Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
Daniel Rodriguez 1cfabda53e Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
Modified agents_create_agent to permit create agents with name as alias

See merge request artica/pandorafms!2209

Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +01:00
manuel 488be0d602 Changed radio buttons by checkbox switch
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
fermin831 f9b14072d8 Moved report nt_top_n requesting data to functions_network
Former-commit-id: a117a63c1b23c0104ffadb2741d049f02a81d6d4
2019-03-04 12:49:18 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
artica 3ed6a2b089 Auto-updated build strings.
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
artica 62c7e8dffc Auto-updated build strings.
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
artica b194d439d2 Auto-updated build strings.
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
fbsanchez 41138fbfbb discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
Luis Calvo d4b79179d9 Fixed width unit on graph, setted to px instead of %
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
Fermin b11fd87592 Added network explorer view
Former-commit-id: c34056a1cc0e2b700df8873a0b589d5bbfe36165
2019-03-01 14:51:13 +01:00
Fermin 568d187902 Style fix
Former-commit-id: d7d8ba5bdc7269496adf6a1caa2ffa0631102cd5
2019-03-01 14:26:59 +01:00