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 |
Daniel Rodriguez
|
9152e2f236
|
Merge branch 'ent-3504-Bug-pandoradbmigrate' into 'develop'
add changes to migrate script
See merge request artica/pandorafms!2214
Former-commit-id: 24ef182bbdf7b7daabb613e865c88befaec09acc
|
2019-03-06 14:27:56 +01:00 |
alejandro-campos
|
4943521904
|
fix pandora migrate script
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
|
2019-03-05 15:28:39 +01:00 |
|
alejandro-campos
|
09897591c3
|
Add extended events to event reporting tables
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
|
2019-03-05 15:03:05 +01:00 |
daniel
|
e55e47cbfa
|
change mr
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
|
2019-02-27 11:35:00 +01:00 |
|
alejandro-campos
|
0a37f6d848
|
add changes to migrate script
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
|
2019-02-27 11:32:39 +01:00 |
|
Daniel Rodriguez
|
11106f9b86
|
Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
Added models in tlog_graph_models
See merge request artica/pandorafms!2200
Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
|
2019-02-25 19:37:49 +01:00 |
|
Alejandro Campos
|
7f47a4504b
|
Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
# Conflicts:
# pandora_console/extras/mr/25.sql
Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
|
2019-02-25 18:47:28 +01:00 |
|
alejandro-campos
|
4bf7469565
|
change mr and migrate for table twidget
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
|
2019-02-25 18:42:52 +01:00 |
|
alejandro-campos
|
13cbc78fdd
|
change mr and migrate for table twidget
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
|
2019-02-25 18:41:24 +01:00 |
Daniel Maya
|
16f1474691
|
Added models in tlog_graph_models
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
|
2019-02-25 17:45:37 +01:00 |
|
fbsanchez
|
d8ee90c285
|
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
|
2019-02-25 14:42:48 +01:00 |
|
Daniel Rodriguez
|
7f01e47e1f
|
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
|
2019-02-25 13:48:37 +01:00 |
|
fbsanchez
|
e65d128b25
|
minor fix db schema
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
|
2019-02-22 12:40:02 +01:00 |
|
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
|
fbsanchez
|
42448cf0d8
|
Updated path for discovery plugins
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
|
2019-02-22 10:41:54 +01:00 |
|
fbsanchez
|
e856969a59
|
Minor fix changed vmware_plugin reference to vmware-plugin
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
|
2019-02-21 15:13:27 +01:00 |
|
fbsanchez
|
8fb84e910a
|
Minor SQL fixes discovery
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
|
2019-02-21 14:29:59 +01:00 |
|
fbsanchez
|
1167cfcafc
|
Minor SQL fixes discovery
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
|
2019-02-21 14:27:09 +01:00 |
|
fbsanchez
|
c12ba3b12e
|
Minor MR and sql updates - presets
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
|
2019-02-21 13:58:29 +01:00 |
|
fbsanchez
|
698451ee98
|
MR25 Discovery
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
|
2019-02-21 13:38:58 +01:00 |
|
alejandro-campos
|
acf3c94642
|
fix bad solved conflict and added changes in bd to migrate and mr
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
|
2019-02-21 13:16:32 +01:00 |
|
fbsanchez
|
eb3adfb6fb
|
Data update. added recon scripts app.vmware and cloud
Former-commit-id: 1fa41a16848794846fee6b5da510bd49aa7b51b1
|
2019-02-20 17:17:24 +01:00 |
manuel
|
25f389b325
|
Merge branch 'develop' into 3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info
Conflicts:
pandora_console/extras/pandora_diag.php
Former-commit-id: d49e9ec693a709661bc69f2b3f4282ccb9a67123
|
2019-02-18 16:25:30 +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
|
166c3bbe88
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
|
2019-02-12 12:41:11 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
fbsanchez
|
d40ced2043
|
alert_command send notification
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
|
2019-02-12 11:16:34 +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
|
7077d5d1ef
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3381-eventos-extendidos
Former-commit-id: e67aa2dd0d9aac3040bd1708cbf598e6d17dd2c8
|
2019-02-08 14:02:18 +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 |
Alejandro Gallardo Escobar
|
229c60c5cc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
|
2019-01-31 09:42:10 +01:00 |
|
daniel
|
d0fe6c9ecf
|
fixed mr token
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
|
2019-01-30 17:11:48 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
|
fbsanchez
|
dc3d7cc5e2
|
notifications, first approach db schema
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
|
2019-01-30 11:56:21 +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 |
|
daniel
|
17b2ff2819
|
Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
fixed error migratesql
See merge request artica/pandorafms!2095
Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
|
2019-01-02 11:50:32 +01:00 |
|
daniel
|
ed30441f86
|
fixed error migrate 6 to 7
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
|
2018-12-28 13:42:40 +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 |
|
daniel
|
73d429ff67
|
fixed error migratesql
Former-commit-id: dba8e3108d2160f51aee058735a7822fd722dddb
|
2018-12-18 12:52:40 +01:00 |
|
manuel.montes
|
c5c5ba9403
|
Fixed bug in diagnostic info
Former-commit-id: 0318eabdf8cbf60267667ba1b4d74d8e476d0b3d
|
2018-12-12 12:21:52 +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 |