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 |
|
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 |
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 |
|
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 |
|
artica
|
88f1f16a5a
|
Auto-updated build strings.
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
|
2019-03-06 00:01:33 +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 |
|
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 |
|
Fermin
|
3eef1b3dbe
|
Minor fix
Former-commit-id: 5e0e476822261c99c4c6e14d4be3b87880cce4a2
|
2019-03-01 13:26:15 +01:00 |
|
Fermin
|
f0a3f4e9d7
|
Added configurable purge tnetwork_matrix
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
|
2019-03-01 12:39:55 +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 |
Daniel Maya
|
fb40ef7ce4
|
Changed Maintainer in pandorafms-agent-unix
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
|
2019-02-28 17:12:31 +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 |
samucarc
|
9f92f3f010
|
Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
|
2019-02-27 10:35:40 +01:00 |
|
samucarc
|
8f24c0cb18
|
Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
|
2019-02-27 10:28:36 +01:00 |
|
artica
|
65b89f6688
|
Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
|
2019-02-27 00:01:47 +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 |
|
fbsanchez
|
4abf19722b
|
Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
|
2019-02-22 18:12:01 +01:00 |
|
Daniel Rodriguez
|
bd6ac21595
|
Merge branch 'ent-3554-7588-apply_policy-no-funciona' into 'develop'
Added new parameter in pandora_add_policy_queue
See merge request artica/pandorafms!2176
Former-commit-id: 65ceb6b0fe1bf2c81bcfb1ce946f7d73d2c68df2
|
2019-02-22 13:09:34 +01:00 |
|
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
|
artica
|
b1149a053b
|
Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
|
2019-02-22 00:01:38 +01:00 |
|
fermin831
|
4930968ec9
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/godmode/reporting/reporting_builder.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/functions_reports.php
Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
|
2019-02-21 17:21:42 +01:00 |
|
fbsanchez
|
6409fc2ddd
|
Added discovery name convention to server files
Former-commit-id: d432ac2c5526cc05b7cbb29df66aef60a35ab0e7
|
2019-02-21 15:07:51 +01:00 |
|
Daniel Rodriguez
|
36410a26d1
|
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
|
2019-02-21 14:38:21 +01:00 |
|
Daniel Rodriguez
|
ba87d6a9b8
|
Merge branch 'ent-3214-exact-oid-matches' into 'develop'
Add support for exact matches to SNMP alerts.
See merge request artica/pandorafms!2090
Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
|
2019-02-21 11:35:51 +01:00 |
|
artica
|
1156b29743
|
Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
|
2019-02-21 00:01:55 +01:00 |
|
fbsanchez
|
6a43536b33
|
Discovery. Added App.VMw
Former-commit-id: 18a9300f37163048bd99109c08c1228231426a59
|
2019-02-20 19:30:25 +01:00 |
|
fbsanchez
|
08c6d782a4
|
Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
|
2019-02-20 18:24:32 +01:00 |
|
artica
|
53a41a7a56
|
Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
|
2019-02-20 00:01:26 +01:00 |
Ramon Novoa
|
7bd5851667
|
Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
|
2019-02-19 13:04:57 +01:00 |
Alejandro Fraguas
|
39a60639fb
|
Merge branch 'ent-3439-Añadir-la-macro-de-id-del-trap-a-las-macros-de-alerta-de-trap-snmp' into 'develop'
Add _id_trap_ macro to snmp alert macros - #3439
See merge request artica/pandorafms!2177
Former-commit-id: 863b66aead27483654b8ec9eb21efd540f1a22e4
|
2019-02-19 12:33:43 +01:00 |