fermin831
af9936c78f
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/install.php
Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
fermin831
94cf43d6ab
[Netflow live] Separate relationships data from circular mesh parsing
...
Former-commit-id: 68485217517ab70bcabed8855fdc9127b83547a6
2019-03-21 13:09:48 +01:00
fermin831
030bcc69c4
[Netflow live] Readded circular mesh and some refactorizations
...
Former-commit-id: a3b2d9cf622a6e539baff9de3c36f1b7a7072e4b
2019-03-21 12:37:03 +01:00
artica
dfadf48b4e
Auto-updated build strings.
...
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
fermin831
1da6d3710b
Minor style fix
...
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
2019-03-20 18:26:27 +01:00
fermin831
a0f4163c1d
Fix netflow filters on database
...
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +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
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
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
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
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
artica
392c0d0bff
Auto-updated build strings.
...
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +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
Daniel Rodriguez
9b95cfc1b1
Merge branch 'ent-3727-evitar-que-los-cambios-de-version-del-installphp-quiten-espacios' into 'develop'
...
Update version script cannot delete initial whitespaces in install.php
See merge request artica/pandorafms!2266
Former-commit-id: 0e54aed49fbbc42871f6d3e0a7b9e4a07cf0cd0d
2019-03-18 14:19:08 +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
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
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
Fermin
fbce6d8aba
Fixed code style
...
Former-commit-id: 0292582ee1d12de325929e77053f1f15985791fb
2019-03-15 14:24:49 +01:00
Daniel Rodriguez
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
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
artica
be08d76e6c
Auto-updated build strings.
...
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +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
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
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
alejandro-campos
1276eb3ecf
Add module version line to config module configuration data
...
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
