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
4772f84850
Auto-updated build strings.
...
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
1ddeda295c
WIP networkmap class
...
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
2019-03-17 01:39:56 +01:00
093404eedc
Auto-updated build strings.
...
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
16d5bf5f66
Auto-updated build strings.
...
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
fe045962e7
wip generate_dot
...
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
2019-03-15 20:44:57 +01:00
fbce6d8aba
Fixed code style
...
Former-commit-id: 0292582ee1d12de325929e77053f1f15985791fb
2019-03-15 14:24:49 +01:00
eac346daf4
Merge branch 'ent-3598-cambio-en-plugin-dynamic-snmp' into 'develop'
...
minor updates in plugintools
See merge request artica/pandorafms!2211
Former-commit-id: 30806fc6b073af4607cb4cdf1c3222d930a66d58
2019-03-15 14:07:31 +01:00
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
c123d9d9fd
[Netflow live] Recalculate multiplier time if resolution is too high
...
Former-commit-id: 60861c9e220a9d69841939dd485265e52542b1ae
2019-03-15 11:36:13 +01:00
bf5dfd8bdb
Extend class to pencil image in html interval component
...
Former-commit-id: baf46a4b64f58e300b092a8ee71c438931e2d840
2019-03-15 10:52:46 +01:00
33fd100d91
[Netflow view] Added start date
...
Former-commit-id: 98134de0f1e8c40458b36b0a14ad0b8c87bff0f2
2019-03-15 10:46:18 +01:00
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
7e345035e1
add height and round border in d3 graph progress
...
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
0593e72f3e
move custom net scan and script to OPEN
...
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
be08d76e6c
Auto-updated build strings.
...
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
8c8f368993
WIP: NetworkMaps rebuild
...
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
6299d23528
[Netflow live] Minor fixes
...
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
2019-03-14 17:49:44 +01:00
99b1aadacb
discovery icon set
...
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +01:00
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
d174af9a57
[Netflow live] Fixed filter styles
...
Former-commit-id: 8990361112fb96fbe2589ac2e31a105167754a8d
2019-03-14 10:43:59 +01:00
da08acce4f
[Netflow live] Removed units
...
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
2019-03-14 10:36:15 +01:00
cf8915af36
[Netflow live] Removed unit from circular mesh
...
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
2019-03-14 10:05:21 +01:00
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
834c18e49e
[Netflow live] Remove unit from statistics table
...
Former-commit-id: 2b0289fef0b663b558794b2ac1b16d0128c68bc9
2019-03-14 09:07:17 +01:00
0ccbb1198a
Auto-updated build strings.
...
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
473a40e7d2
[Netflow live] Removed unit functionallity from area graph and data table
...
Former-commit-id: 2d60141028e01e1fdf5a9d5716aa69a2cfe08d08
2019-03-13 21:14:43 +01:00
c2c8287d3e
Fixed resolution in netflow reports
...
Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70
2019-03-13 20:15:53 +01:00
3d1f1f86ed
[Netflow live] Removed agregate by none
...
Former-commit-id: 4da1581da67c95f29b9b34eb70436e8f68706988
2019-03-13 19:16:21 +01:00
8a336d6cfe
[Netflow live] Implemented resolution on area graphs and fixed end date
...
Former-commit-id: 86d55ac7645e62fcae6a07cbf1bd50f92d5d37a1
2019-03-13 18:55:16 +01:00
f4290e52fe
Minor fix notif. ball margins
...
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
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
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
f5b0e6b1a4
minor fix radial redirection
...
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
2019-03-13 12:55:24 +01:00
1276eb3ecf
Add module version line to config module configuration data
...
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
95c61024f7
Cleanup Networkmaps
...
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
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
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
99afea22cb
Auto-updated build strings.
...
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
e61d409acc
fix in redirection after map creation
...
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
bf9b84f266
discarded ranksep var as recommended edge len
...
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
2019-03-12 18:38:58 +01:00
663c1e0841
NetworkMap class rc1
...
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
1bc326c00c
WIP: NetworkMap class
...
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
a8af2f89d1
Fixed data type to remote_snmp_proc in modules IfOperSttus
...
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
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
c91c79a735
WIP experiments with graphviz
...
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
2019-03-12 16:52:42 +01:00
06f8aae91a
WIP NetworkMap class
...
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
96d6e12546
disable cache for events_comment
...
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
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
fermin831
artica
fbsanchez
Daniel Rodriguez
Daniel Barbero
alejandro-campos
samucarc
Alejandro Fraguas
Daniel Maya