Fermin
|
f0a3f4e9d7
|
Added configurable purge tnetwork_matrix
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
|
2019-03-01 12:39:55 +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 |
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 |
|
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 |
|
artica
|
febe2cc3a6
|
Auto-updated build strings.
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
|
2019-02-23 00:02:37 +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 |
|
artica
|
1156b29743
|
Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
|
2019-02-21 00:01:55 +01:00 |
|
artica
|
53a41a7a56
|
Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
|
2019-02-20 00:01:26 +01:00 |
|
artica
|
2b3a72e938
|
Auto-updated build strings.
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
|
2019-02-19 00:01:28 +01:00 |
|
artica
|
0ef118f401
|
Auto-updated build strings.
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
|
2019-02-18 00:01:24 +01:00 |
|
artica
|
1fafda8502
|
Auto-updated build strings.
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
|
2019-02-17 00:01:24 +01:00 |
|
artica
|
0d93ccc094
|
Auto-updated build strings.
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
|
2019-02-16 00:01:31 +01:00 |
|
artica
|
cd83f324a1
|
Auto-updated build strings.
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
|
2019-02-15 00:01:26 +01:00 |
|
artica
|
f0338cd08e
|
Auto-updated build strings.
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
|
2019-02-14 00:01:26 +01:00 |
|
fermin831
|
0ecf2bb9c4
|
Added pandora db messages purgue
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
|
2019-02-13 14:43:55 +01:00 |
|
artica
|
0e39e3fef7
|
Auto-updated build strings.
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
|
2019-02-13 00:01:37 +01:00 |
Ramon Novoa
|
6e236c404b
|
Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
|
2019-02-12 13:47:44 +01:00 |
|
artica
|
bbd3cb79ce
|
Auto-updated build strings.
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
|
2019-02-12 00:01:37 +01:00 |
|
artica
|
3acd6b8d31
|
Auto-updated build strings.
Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289
|
2019-02-11 00:01:26 +01:00 |
|
artica
|
56797e717b
|
Auto-updated build strings.
Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10
|
2019-02-10 00:01:25 +01:00 |
|
artica
|
f992e7b1f4
|
Auto-updated build strings.
Former-commit-id: 7eb19cce56cb06b70ee9269f4b51d7b45b19f5d9
|
2019-02-09 00:01:35 +01:00 |
|
artica
|
e6abb61a13
|
Auto-updated build strings.
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
|
2019-02-08 00:01:29 +01:00 |
|
Ramon Novoa
|
92e2262440
|
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
|
2019-02-07 11:18:15 +01:00 |
|
artica
|
1f3fe51f69
|
Auto-updated build strings.
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
|
2019-02-07 00:01:40 +01:00 |
|
artica
|
c0a23889ab
|
Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
|
2019-02-06 00:01:29 +01:00 |
|
artica
|
97259bc285
|
Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
|
2019-02-05 00:01:28 +01:00 |
|
artica
|
af1f081e5c
|
Auto-updated build strings.
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
|
2019-02-04 00:01:33 +01:00 |
|
artica
|
934533141e
|
Auto-updated build strings.
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
|
2019-02-03 00:01:26 +01:00 |
|
artica
|
24e799f18e
|
Auto-updated build strings.
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
|
2019-02-02 00:01:29 +01:00 |
|
artica
|
62461525e8
|
Auto-updated build strings.
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
|
2019-02-01 00:01:36 +01:00 |
|
artica
|
d6667354fc
|
Auto-updated build strings.
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
|
2019-01-31 00:01:24 +01:00 |
|
fermin831
|
2995c86a70
|
Added network matrix purge
Former-commit-id: a2b5f8b5662685924835a592ba04e750e4650fd9
|
2019-01-30 13:03:16 +01:00 |
|
Ramon Novoa
|
2626605030
|
Validate alerts at the time agents/modules are modified.
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
|
2019-01-30 12:58:31 +01:00 |
|
artica
|
6485de04fd
|
Auto-updated build strings.
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
|
2019-01-30 00:01:26 +01:00 |
|
artica
|
cec6aedaf5
|
Updated version and build strings.
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
|
2019-01-29 11:08:54 +01:00 |
|
artica
|
354834a872
|
Auto-updated build strings.
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
|
2019-01-29 00:01:27 +01:00 |
|
artica
|
550abc6634
|
Auto-updated build strings.
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
|
2019-01-28 00:01:23 +01:00 |
|
artica
|
dd9f6e5f21
|
Auto-updated build strings.
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
|
2019-01-27 00:01:29 +01:00 |
|
artica
|
50036f2120
|
Auto-updated build strings.
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
|
2019-01-26 00:01:25 +01:00 |
|
artica
|
d191cdef17
|
Auto-updated build strings.
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
|
2019-01-25 00:01:33 +01:00 |
|
artica
|
f9113fa2e5
|
Auto-updated build strings.
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
|
2019-01-24 00:01:27 +01:00 |
|
artica
|
1e4a288f53
|
Auto-updated build strings.
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
|
2019-01-23 00:01:23 +01:00 |
|
artica
|
c586b68cb3
|
Auto-updated build strings.
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
|
2019-01-22 00:01:24 +01:00 |