Luis Calvo
|
702926cf85
|
solved merge conflict mr 28.sql
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
|
2019-05-16 10:15:46 +02:00 |
Daniel Barbero Martin
|
79701bba60
|
Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
|
2019-05-14 12:34:40 +02:00 |
|
Luis Calvo
|
860a4cdbf2
|
Updated pandoradb and migrate
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
|
2019-05-13 17:57:21 +02:00 |
Alejandro Campos
|
9347fc17aa
|
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
|
2019-05-13 17:10:06 +02:00 |
manuel
|
12c9952e4a
|
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
|
2019-05-10 09:11:17 +02:00 |
|
Daniel Barbero
|
c5884f1ac9
|
add changes sql for mr 28
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
|
2019-05-03 14:09:23 +02:00 |
|
alejandro-campos
|
5b3dfcbf74
|
add feature to enable obfuscation on command fields when creating or updating commands
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
|
2019-05-03 13:46:52 +02:00 |
|
manuel
|
8dc3beaaa9
|
changed in pandoradb
Former-commit-id: 8a9ccee718b24455fa21c7bfb38cf704c1aa2a0a
|
2019-04-29 15:07:39 +02:00 |
|
manuel
|
9e0748e718
|
Added changes in pandoradb.sql
Former-commit-id: 30f4d7bdc303c6ddd2ac6933872faa5f05de58b5
|
2019-04-24 11:19:27 +02:00 |
fbsanchez
|
cbdd8e7104
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
|
2019-04-22 09:01:24 +02:00 |
marcos.alconada
|
1b5786aedb
|
Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
|
2019-04-12 10:32:07 +02:00 |
|
fbsanchez
|
342e4b78c9
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
|
2019-04-11 15:12:46 +02:00 |
|
fbsanchez
|
798a2aad16
|
WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
|
2019-04-03 18:13:19 +02:00 |
|
fbsanchez
|
11b2fbc245
|
WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
|
2019-04-02 16:25:29 +02:00 |
|
marcos.alconada
|
b3c7a9fb4d
|
change
Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
|
2019-03-29 13:38:36 +01:00 |
|
marcos.alconada
|
7412a7cef0
|
change
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
|
2019-03-29 13:37:12 +01:00 |
|
marcos.alconada
|
3f41561628
|
Added pandoradb.sql without output column in tnetflow_filter
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
|
2019-03-29 09:23:38 +01:00 |
|
Daniel Barbero Martin
|
e3222626dc
|
fixed error in bbdd
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
|
2019-03-28 09:49:16 +01:00 |
|
Daniel Barbero Martin
|
a3865a3181
|
flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
|
2019-03-27 18:16:53 +01:00 |
fermin831
|
b2f046e4d6
|
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/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
|
2019-03-27 12:11:23 +01:00 |
|
fbsanchez
|
1238f15190
|
discovery task advanced summary support
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
|
2019-03-25 17:32:18 +01:00 |
|
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 |
|
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 |
|
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 |
|
manuel
|
c41c9d10e0
|
Changed sql files
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
|
2019-03-08 10:01:55 +01:00 |
|
alejandro-campos
|
9d29af2af5
|
add new field for table treport_content
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
|
2019-03-05 15:15:48 +01:00 |
|
fbsanchez
|
41138fbfbb
|
discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
|
2019-03-01 15:26:05 +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 |
|
fbsanchez
|
5816320eff
|
new token. autoconfiguration_enabled. discovery tasks
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
|
2019-02-18 14:00:38 +01:00 |
|
fbsanchez
|
3e9e668e00
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
|
2019-02-14 10:59:27 +01:00 |
|
fbsanchez
|
6e7369d672
|
Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
Ent 3381 eventos extendidos
See merge request artica/pandorafms!2169
Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
|
2019-02-14 10:51:04 +01:00 |
|
fbsanchez
|
10a37c313c
|
DB schema update native WMI scan
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
|
2019-02-13 15:05:21 +01:00 |
|
fbsanchez
|
738443445c
|
minor fix in tevento db script
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
|
2019-02-11 20:20:23 +01:00 |
|
fbsanchez
|
332c53b098
|
change behaviour to avoid mr slow updates. Event extended
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
|
2019-02-11 19:46:46 +01:00 |
|
fbsanchez
|
a3a1bbb778
|
added missed new field extended_info for events
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
|
2019-02-08 17:30:13 +01:00 |
|
fbsanchez
|
348a10cfe4
|
Added tevent_extended to db scripts
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
|
2019-02-08 13:59:48 +01:00 |
|
fbsanchez
|
cf5716e569
|
supervisor added subtype to tmensajes
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
|
2019-02-07 12:56:48 +01:00 |
|
fermin831
|
95f3c063a5
|
Added tnotification_source_group_user table
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
|
2019-01-31 16:27:55 +01:00 |
|
fbsanchez
|
dc3d7cc5e2
|
notifications, first approach db schema
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
|
2019-01-30 11:56:21 +01:00 |
|
fermin831
|
e0180aeebe
|
Added tnetwork_matrix data structure
Former-commit-id: e42bd0f0a78aab5cc9068270269262cfe7465c7b
|
2019-01-21 18:49:13 +01:00 |
|
fermin831
|
923c8ee0b8
|
Revert "Added tnetwork_matrix data structure"
This reverts commit 5328a0e239 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d].
Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a
|
2019-01-21 18:43:35 +01:00 |
|
fermin831
|
5328a0e239
|
Added tnetwork_matrix data structure
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
|
2019-01-21 17:42:41 +01:00 |
|
alejandro-campos
|
a1ba6fdf07
|
Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
|
2018-12-19 19:15:43 +01:00 |
|
fermin831
|
386eeec7ef
|
Added group_recursion as tevent_rule column
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
|
2018-12-11 16:07:13 +01:00 |
|
daniel
|
a03adb1762
|
add field group filter
|
2018-12-03 18:00:41 +01:00 |
|
daniel
|
01a9621eb5
|
Custom fields view add new filters
|
2018-12-03 11:36:34 +01:00 |
vgilc
|
5ac947c2fd
|
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
|
2018-11-20 11:33:00 +01:00 |
|
daniel
|
4dbcecb951
|
WIP custom fields view
|
2018-11-13 15:46:44 +01:00 |
|
fermin831
|
d63666cbbc
|
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
|
2018-11-08 14:00:49 +01:00 |
|
alejandro-campos
|
ef90536152
|
added new field in treport table
|
2018-11-02 16:31:54 +01:00 |