Commit Graph

19749 Commits

Author SHA1 Message Date
fbsanchez f19bdf956e Wiz. minor fix default value url in goback button
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
2019-02-20 12:32:12 +01:00
manuel af2954d392 Changed controls in static graph vs
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
2019-02-20 11:46:32 +01:00
Alejandro Fraguas c527378183 Merge branch 'ent-3345-Error_al_subir_imagenes_en_el_file_manager' into 'develop'
fixed error filemanager

See merge request artica/pandorafms!2186

Former-commit-id: d7cbd95f2b8cf86a7cdcbc85e100dc282a94d483
2019-02-20 11:42:29 +01:00
fbsanchez 8872968600 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: c3eed02e448a213a65159897355dc44d844b9741
2019-02-20 11:11:37 +01:00
fbsanchez a63e497497 Wiz. Added textarea input
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
2019-02-20 11:11:26 +01:00
Daniel Rodriguez 1c7c0ebe8f Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
remove special characters from agent alias string on creation and trim blank…

See merge request artica/pandorafms!2100

Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
Daniel Rodriguez 33ed8a2cc1 Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
Fixed bug in metaconsole custom fields2

See merge request artica/pandorafms!2070

Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
fbsanchez 8ec5cda8bf Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 057a5915c8397b3798dcbe97f6ac3f1302879c8c
2019-02-20 10:59:05 +01:00
fbsanchez 65db8482c1 Wiz. Added option url to printGoBackButton
Former-commit-id: fd0c76ce5efef9902cbda2817b13e59e6672c972
2019-02-20 10:58:56 +01:00
fbsanchez e2bb9e9a15 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 4d47587e87964b25e4d5bc2a16551846507c266c
2019-02-20 10:54:09 +01:00
fbsanchez e9d97e8010 Wiz. Added option url to printGoBackButton
Former-commit-id: 31c9c56da3475f9b1510904ad7237f993c0a6ccf
2019-02-20 10:53:54 +01:00
Daniel Rodriguez 55486e7b93 Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
Fixed bug in filtered modules by tag

See merge request artica/pandorafms!2181

Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
Alejandro Fraguas 094a5c17d8 Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop'
disable double authentication option on user edit when disabled in authentication setup

See merge request artica/pandorafms!2054

Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
2019-02-20 09:56:49 +01:00
Ramon Novoa c36241de4f Add additional help icons.
Former-commit-id: 9641eb9ceaefde1c24503fcfb4c7965afedf8fbc
2019-02-20 09:04:15 +01:00
fbsanchez c0e1d0b85d Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 420e2b09287bccdacc979be2381159a1ad942a27
2019-02-20 08:59:30 +01:00
fermin831 ca243c46fb Minor fix
Former-commit-id: f3c550c07a38df24b5de84200190583437586720
2019-02-20 08:52:29 +01:00
manuel 3d2ae47543 Added prepareBreadcrum function
Former-commit-id: caf781a20bdd16bed7347bf755e2bf0da6ae7e99
2019-02-20 08:41:15 +01:00
artica 53a41a7a56 Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
fbsanchez 69abba260a Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
2019-02-19 20:27:34 +01:00
fbsanchez fa3f548cdd Several changes for Wiz.App support
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
2019-02-19 20:27:05 +01:00
fermin831 55af128cd5 Modified snmp browser to work with wizard
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
2019-02-19 20:14:14 +01:00
fbsanchez 422708c04a Revert "Wiz.Applications SQL updates" Identification using recon_script
This reverts commit e7abe4ad43 [formerly e0f547a0f35b338705a14df6477bf3a5461d8e49].


Former-commit-id: 5b112c7d889d98c2040514556849ce4e408ab444
2019-02-19 18:33:17 +01:00
fermin831 819910923f Added callback to print forms
Former-commit-id: 8e95ba3ae518a750d421fcce41238ca7f47b46c2
2019-02-19 18:29:59 +01:00
fermin831 86d57f2654 Added callback to print forms
Former-commit-id: e8f113710158278cb61f494a6c0111e1615ab877
2019-02-19 18:23:20 +01:00
Alejandro Fraguas 63c00f00a8 Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
Eliminated message when secondary groups are added

See merge request artica/pandorafms!2124

Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
Daniel Rodriguez 0352ef2b70 Merge branch '3141-SQL-query-a-la-propia-metaconsola' into 'develop'
fix metaconsole sql items creation

See merge request artica/pandorafms!2097

Former-commit-id: a2efa5704837d09eec24f144eb0fcc5b922b856a
2019-02-19 18:08:14 +01:00
fbsanchez e7abe4ad43 Wiz.Applications SQL updates
Former-commit-id: e0f547a0f35b338705a14df6477bf3a5461d8e49
2019-02-19 17:59:02 +01:00
daniel df88582982 fixed error filemanager
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
Alejandro Fraguas 218e90a663 Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
Fixed minor bug in pandora flot js

See merge request artica/pandorafms!1897

Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
fbsanchez 07db5ce37d Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 9ca0cec89fa7ee8dc9747ab414d95d8afd49877b
2019-02-19 17:15:14 +01:00
manuel ea70c0846c Added href in wizard
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
2019-02-19 16:34:11 +01:00
alejandro-campos c80a1fc3dd add tooltip to agent alias on creation
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
fermin831 2c3357ac64 Added interval input to Wizards
Former-commit-id: ad64615eed06f025654d7875a3b572b865364d37
2019-02-19 16:06:41 +01:00
Daniel Rodriguez 04c4162419 Merge branch '339-No_cortar_elementos_en_PDF' into 'develop'
339 no cortar elementos en pdf

See merge request artica/pandorafms!2163

Former-commit-id: 756360a1b91e5edf2c1af80e601085f7b41b505c
2019-02-19 15:39:03 +01:00
daniel cf79f54a48 fixed minor error
Former-commit-id: ffde6120127e31865553a8b06f91b3f0938a164c
2019-02-19 15:07:07 +01:00
daniel d4e7cbcdc8 Fixed error user edit tocken filter events not set.
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
Alejandro Gallardo Escobar 2573e40538 Bugfix
Former-commit-id: 0ea7cf8437935c77098b1e408a723ac3de4d973c
2019-02-19 14:52:14 +01:00
Alejandro Gallardo Escobar 68afc9289d Documentation improvements
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
fbsanchez 1b82a970b1 WIP: App wiz
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
2019-02-19 14:36:16 +01:00
alejandro-campos 2e78012e40 Fix double authentication check in meta authentication setup
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
2019-02-19 13:13:13 +01:00
manuel 00cba4cbc9 Fixed bug in filtered modules by tag
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
Ramon Novoa 7bd5851667 Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
Alejandro Fraguas 39a60639fb Merge branch 'ent-3439-Añadir-la-macro-de-id-del-trap-a-las-macros-de-alerta-de-trap-snmp' into 'develop'
Add _id_trap_ macro to snmp alert macros - #3439

See merge request artica/pandorafms!2177

Former-commit-id: 863b66aead27483654b8ec9eb21efd540f1a22e4
2019-02-19 12:33:43 +01:00
daniel d116e4742a add new tocken max events responses
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
Alejandro Gallardo Escobar d554dcc7db Added the _current_user_ macro to the event responses
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
fbsanchez 8c09b945c7 minor fix changed customer check
Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154
2019-02-19 11:14:48 +01:00
fbsanchez 85371424ee Minor fixes and status check
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
fermin831 c9cc744e07 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Former-commit-id: d609bc3171cb75d89b641f6dd100e593ae5d1ebd
2019-02-19 11:01:11 +01:00
fbsanchez 906ba091e1 minor fixes/changes DiscoveryServer
Former-commit-id: 8273727109628f99fc86c125c9b6f62a416c07f1
2019-02-19 10:37:09 +01:00
Daniel Rodriguez b8fe20e373 Merge branch '3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info' into 'develop'
Fixed bug in diagnostic info

See merge request artica/pandorafms!2076

Former-commit-id: 79147da886f68dc106ba946a06bad66a6fd00d59
2019-02-19 10:28:31 +01:00