Daniel Barbero Martin
|
0064bc0cba
|
fixed errors
|
2019-07-01 17:07:39 +02:00 |
|
Daniel Barbero Martin
|
a10cf51b1b
|
update current package
|
2019-06-26 15:37:04 +02:00 |
marcos.alconada
|
1e843777bc
|
Delete line with log4x
|
2019-06-07 10:57:15 +02:00 |
|
Marcos Alconada
|
d49d303469
|
Update pandoradb_data.sql
|
2019-06-07 10:20:29 +02:00 |
|
Marcos Alconada
|
be82afc9c5
|
Update pandoradb_data.sql
|
2019-06-07 09:50:49 +02:00 |
|
Marcos Alconada
|
241eda5c39
|
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"
This reverts merge request !2282
|
2019-06-07 09:35:13 +02:00 |
|
marcos.alconada
|
a13dab3f35
|
resolving merge conflict
|
2019-06-07 09:22:07 +02:00 |
fbsanchez
|
5e9b2479eb
|
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
|
2019-05-20 13:11:39 +02:00 |
|
fbsanchez
|
ec60a3193a
|
removed all group from communications target
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
|
2019-05-16 12:52:41 +02:00 |
|
fbsanchez
|
3bf06f0b72
|
MR minor updates
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
|
2019-05-15 00:00:21 +02:00 |
|
fbsanchez
|
8004e096fd
|
MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
|
2019-05-14 18:09:34 +02:00 |
|
fbsanchez
|
920786216b
|
UM notifications MR update
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
|
2019-05-14 17:17:04 +02:00 |
|
Marcos Alconada
|
cf45be2c60
|
Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews'
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
|
2019-05-14 10:03:37 +02:00 |
|
marcos.alconada
|
9501187ebc
|
Se cambian las consultas sql sin la imagen en la consulta
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
|
2019-05-14 10:01:30 +02:00 |
|
marcos.alconada
|
ac60e296c1
|
Add new message to News board
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
|
2019-05-10 11:17:46 +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 |
|
marcos.alconada
|
8dc2644368
|
Deleted default insert on tevent_response
Former-commit-id: 33fb686679fa89afbf0834e1e434739d11bfc4dd
|
2019-04-29 12:36:37 +02:00 |
|
manuel
|
c075d5caad
|
Added condition type not normal in alert templates
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
|
2019-04-24 10:51:55 +02:00 |
|
fbsanchez
|
79bd37ee5b
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
|
2019-04-08 16:28:26 +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
|
9d4d2e65cf
|
Resolved ticket with sql sentence
Former-commit-id: de4b92ab338dccb9fa720a61a2ff98f263128401
|
2019-03-22 11:20:32 +01:00 |
|
marcos.alconada
|
9bc536396d
|
Resolved ticket with sql sentence
Former-commit-id: 959c27837ca824f386fe3b3ee43005a8235e4197
|
2019-03-22 10:20:41 +01:00 |
alejandro-campos
|
67d24860d1
|
Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
|
2019-03-20 15:46:33 +01:00 |
|
manuel
|
6121c2a32b
|
Added types reports to send email
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
|
2019-03-19 17:16:31 +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 |
|
fbsanchez
|
41138fbfbb
|
discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
|
2019-03-01 15:26:05 +01:00 |
|
daniel
|
e55e47cbfa
|
change mr
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
|
2019-02-27 11:35:00 +01:00 |
artica
|
26560c734c
|
Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
|
2019-02-27 11:25:50 +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 |
|
fbsanchez
|
e65d128b25
|
minor fix db schema
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
|
2019-02-22 12:40:02 +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
|
c12ba3b12e
|
Minor MR and sql updates - presets
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
|
2019-02-21 13:58:29 +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 |
|
alejandro-campos
|
e4ca9b7fc8
|
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
|
2019-02-15 14:22:55 +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
|
681ad67028
|
ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
|
2019-02-07 18:00:51 +01:00 |
|
fbsanchez
|
cf5716e569
|
supervisor added subtype to tmensajes
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
|
2019-02-07 12:56:48 +01:00 |
|
daniel
|
d0fe6c9ecf
|
fixed mr token
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
|
2019-01-30 17:11:48 +01:00 |
|
fbsanchez
|
dc3d7cc5e2
|
notifications, first approach db schema
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
|
2019-01-30 11:56:21 +01:00 |
|
artica
|
cec6aedaf5
|
Updated version and build strings.
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
|
2019-01-29 11:08:54 +01:00 |
|
alejandro-campos
|
2155420d71
|
implement custom fields for node monitor view
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
|
2019-01-18 11:13:29 +01:00 |
|
daniel
|
01a9621eb5
|
Custom fields view add new filters
|
2018-12-03 11:36:34 +01:00 |
|
daniel
|
a7918a1816
|
delete field flash chart php7
|
2018-10-19 11:56:49 +02:00 |