fermin831
|
2711eb59ea
|
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
|
2019-03-25 09:20:06 +01:00 |
fbsanchez
|
da3602fbc5
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 7867c83c3571bcd27c19f4c1dcdc6e8b95eb2715
|
2019-03-21 18:38:41 +01:00 |
|
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 |
artica
|
dfadf48b4e
|
Auto-updated build strings.
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
|
2019-03-21 00:02:00 +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
|
9b68e7d04e
|
Switch extended events to standard events in host creation (recon)
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
|
2019-03-20 14:15:33 +01:00 |
|
artica
|
c598eb60fb
|
Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
|
2019-03-20 00:01:24 +01:00 |
|
artica
|
392c0d0bff
|
Auto-updated build strings.
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
|
2019-03-19 00:01:25 +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 |
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 |
|
artica
|
be08d76e6c
|
Auto-updated build strings.
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
|
2019-03-15 00:01:22 +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 |
|
artica
|
0ccbb1198a
|
Auto-updated build strings.
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
|
2019-03-14 00:01:25 +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 |
|
artica
|
67080c72d9
|
Auto-updated build strings.
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
|
2019-03-12 00:01:23 +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 |
|
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 |
|
artica
|
4eb6c16339
|
Auto-updated build strings.
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
|
2019-03-07 00:01:27 +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 |
|
artica
|
88f1f16a5a
|
Auto-updated build strings.
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
|
2019-03-06 00:01:33 +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
|
4c0263206e
|
WIP: Networkmap & recon improvements
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
|
2019-03-05 16:12:29 +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 |
|
artica
|
930c527ad2
|
Auto-updated build strings.
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
|
2019-03-05 00:01:26 +01:00 |
|
fbsanchez
|
f557d09529
|
discoveryserver change default value (server) and minor fix in subst_column_macros
Former-commit-id: ff22af353cf794ae0600a23d61fd30256193d463
|
2019-03-04 15:01:50 +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 |
|
artica
|
8fc432b934
|
Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
|
2019-03-01 00:01:32 +01:00 |
|
Fermin
|
511c5e3d10
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/25.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/install.php
pandora_server/util/pandora_db.pl
Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
|
2019-02-28 17:13:48 +01:00 |
|
artica
|
a8a9a9d620
|
Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
|
2019-02-28 00:01:32 +01:00 |
|
fbsanchez
|
f979af0735
|
minor fixes
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
|
2019-02-27 13:56:06 +01:00 |
artica
|
26560c734c
|
Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
|
2019-02-27 11:25:50 +01:00 |
|
artica
|
65b89f6688
|
Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
|
2019-02-27 00:01:47 +01:00 |
|
fbsanchez
|
c1aaacbc07
|
minor updates in plugintools
Former-commit-id: 85d3d6a099d4b08b1d79d996157e1725e3414809
|
2019-02-26 18:16:10 +01:00 |
|
fermin831
|
86509caf6b
|
Fixed downtimes disabled and enabled agents
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
|
2019-02-26 14:44:51 +01:00 |
|
artica
|
88202977fa
|
Auto-updated build strings.
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
|
2019-02-26 00:01:57 +01:00 |
|
fbsanchez
|
510833eaf1
|
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
|
2019-02-25 10:47:46 +01:00 |
|
artica
|
9753faa17a
|
Auto-updated build strings.
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
|
2019-02-25 00:01:36 +01:00 |
|
artica
|
a49f68e96b
|
Auto-updated build strings.
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
|
2019-02-24 00:01:50 +01:00 |
|
fbsanchez
|
6105ef1116
|
Quick fix DiscoveryServer
Former-commit-id: 0dea07b53b993a82d233acec71a45f7a241a205e
|
2019-02-23 00:35:59 +01:00 |
|
artica
|
febe2cc3a6
|
Auto-updated build strings.
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
|
2019-02-23 00:02:37 +01:00 |
|
fbsanchez
|
4289684e00
|
Cloud Discovery RC1
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
|
2019-02-23 00:01:59 +01:00 |