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 |
|
daniel
|
0b0bad8a73
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
|
2018-10-25 17:43:28 +02:00 |
|
manuel.montes
|
f4add9a7f8
|
Changed tlayout_template name table to varchar 600
|
2018-10-24 11:49:18 +02:00 |
|
fermin831
|
3946124cc7
|
Inaugurate the 22 mr with an alter table in talert_commands
|
2018-10-22 09:49:06 +02:00 |
|
daniel
|
6bb478ea1a
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
|
2018-10-22 08:04:36 +02:00 |
|
daniel
|
8c49b26a91
|
php7 version
|
2018-10-19 11:37:11 +02:00 |
|
daniel
|
e299209a92
|
fixed visual console custam graph in meta
|
2018-10-18 13:24:15 +02:00 |
|
fermin831
|
aff2879340
|
Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
Conflicts:
pandora_console/extras/mr/21.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
|
2018-10-16 11:35:14 +02:00 |
|
fbsanchez
|
299868cfd5
|
meta_db* added to tmetaconsole_setup
|
2018-10-10 14:35:09 +02:00 |
enriquecd
|
c1af14b90e
|
Change tlayou name table to varchar 600 - #2823
|
2018-10-05 12:25:15 +02:00 |
danielmaya
|
896ba6051b
|
fixed issue with string data in visual map
|
2018-09-26 11:00:44 +02:00 |
|
fermin831
|
8979890964
|
Added is_favourite to tservice table
|
2018-09-18 19:05:20 +02:00 |
|
manuel.montes
|
65010d7080
|
Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487
Conflicts:
pandora_console/extras/mr/20.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
|
2018-09-18 11:17:47 +02:00 |
|
vgilc
|
080cfb20ca
|
Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev'
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2018-09-17 14:44:24 +02:00 |
manuel.montes
|
19645f0550
|
Modified trecon_task table
|
2018-09-13 18:17:28 +02:00 |
Alejandro Gallardo Escobar
|
e9752e790e
|
Added columns for a policy feature
|
2018-09-13 16:57:13 +02:00 |
|
manuel.montes
|
a2b3d6e07f
|
Deleted reports from cron
|
2018-09-12 13:43:23 +02:00 |
|
Alejandro Gallardo Escobar
|
40ff7b9042
|
Now is possible to link visual consoles from different nodes to the visual console elements
|
2018-09-10 11:25:44 +02:00 |
|
danielmaya
|
816b969741
|
Added table tlog_graph_models
|
2018-09-06 16:48:18 +02:00 |
|
Alejandro Gallardo Escobar
|
36247d391f
|
Merge branch 'develop' into ent-2588-service-like-visual-console-status
|
2018-09-04 17:25:23 +02:00 |