1da6d3710b
Minor style fix
...
Former-commit-id: f730c6b8d4517b750a50ce73d1f940e0110a5f76
2019-03-20 18:26:27 +01:00
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
756e785634
Merge branch 'wip/3595' into 'ent-3595-discovery-fase-2'
...
Wip/3595
See merge request artica/pandorafms!2279
Former-commit-id: e079a3c54a1f054498cb67af759ee5d3f1be4eac
2019-03-20 17:33:47 +01:00
ad432ffc12
Merge branch 'ent-3595-discovery-fase-2' into wip/3595
...
Former-commit-id: df24037730e212308a8e8805e0440e73e1ec0f16
2019-03-20 17:28:35 +01:00
05c03d2d46
NetworkMap class
...
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
a0f4163c1d
Fix netflow filters on database
...
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
5d409cd778
New view user edit
...
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
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
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
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
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
b5e1487736
add strict comparator
...
Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b
2019-03-20 15:26:42 +01:00
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
9b68e7d04e
Switch extended events to standard events in host creation (recon)
...
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
2019-03-20 14:15:33 +01:00
daf72a4bac
fixed errors delete files update manager open and metaconsole
...
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
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
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
9aecc6b85b
NetworkClass RC1
...
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
2019-03-20 13:10:20 +01:00
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
9b345ea947
[Netflow live] Hide netflow circular mesh
...
Former-commit-id: d00293853fc8b498ddee9798b1d1feaea3c13fbf
2019-03-20 12:16:30 +01:00
f32e022b1b
Fixed detailed host traffic chart
...
Former-commit-id: abdf6f9d171facf53260d90f28204d1e81bbeaf4
2019-03-20 10:26:44 +01:00
c598eb60fb
Auto-updated build strings.
...
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
1b99c5db49
WIP netclass editor
...
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
2019-03-19 20:43:08 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
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
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
392c0d0bff
Auto-updated build strings.
...
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
97b53db82b
wip relationships
...
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
2019-03-18 18:11:54 +01:00
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
80c79b532b
[Netflow live] Removed aggregate by protocol
...
Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef
2019-03-18 15:44:23 +01:00
4f8c7daada
[Netflow live] Change start date and end date
...
Former-commit-id: 14a24767a1426aa8151ba99495a17ddb71047cbb
2019-03-18 15:33:48 +01:00
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
2be3333d29
Update version script cannot delete initial whitespaces in install.php
...
Former-commit-id: e0b973605efb316ca73fad0a5cfeded2bffe149d
2019-03-18 11:18:55 +01:00
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
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
d13e7bbf44
new generic functions
...
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
8a7702e054
Update networkmap class with simple map
...
Former-commit-id: cb6bd489ba973cf0f9c6eda8dee062518f33f382
2019-03-18 09:01:53 +01:00
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
fermin831
fbsanchez
Tatiana Llorente
alejandro-campos
Alejandro Fraguas
Daniel Barbero Martin
Daniel Rodriguez
artica
Daniel Maya