Commit Graph

19863 Commits

Author SHA1 Message Date
fbsanchez 4289684e00 Cloud Discovery RC1
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
2019-02-23 00:01:59 +01:00
fbsanchez 8b5f50f883 Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
fbsanchez 4abf19722b Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
Daniel Maya 12b8042c53 Added server plugins in meta
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
2019-02-22 14:26:58 +01:00
fermin831 2c1eb0fe03 Added aws view menu
Former-commit-id: a64079eb5e773d3fe36031bac856aa801728f79d
2019-02-22 14:16:39 +01:00
alejandro-campos faae9c58b3 implement services tree view
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
daniel f0c9d16318 fixed errors view discovery task list
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
2019-02-22 13:45:59 +01:00
fbsanchez 1feebae564 removed fullurl supervisor
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
2019-02-22 13:33:46 +01:00
Daniel Rodriguez bd6ac21595 Merge branch 'ent-3554-7588-apply_policy-no-funciona' into 'develop'
Added new parameter in pandora_add_policy_queue

See merge request artica/pandorafms!2176

Former-commit-id: 65ceb6b0fe1bf2c81bcfb1ce946f7d73d2c68df2
2019-02-22 13:09:34 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
daniel 3d2bfa95b5 add table console task in discovery
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +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
Alejandro Fraguas e55915e1e2 Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop

See merge request artica/pandorafms!2193

Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
Alejandro Fraguas 1aa60fd15d Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'
Ent 3511 bug en la edicion del widget de tipo agent/module view

See merge request artica/pandorafms!2190

Former-commit-id: bffc145be0e0eee4265dcdf7d8be2447e467bb79
2019-02-22 09:18:11 +01:00
artica b1149a053b Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
alejandro-campos 45bba4faa8 fix agent name input
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
fbsanchez 64679ee72e discovery minor fixes
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
2019-02-21 18:00:50 +01:00
alejandro-campos 59159ec473 change last status change info
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
Alejandro Fraguas a9eb3cf37b Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
Fixed filter by name of agents in events when they contain spaces

See merge request artica/pandorafms!2160

Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
fermin831 9e9d915609 Modified redirection
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
2019-02-21 15:35:44 +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 6409fc2ddd Added discovery name convention to server files
Former-commit-id: d432ac2c5526cc05b7cbb29df66aef60a35ab0e7
2019-02-21 15:07:51 +01:00
Daniel Rodriguez 36410a26d1 Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.

See merge request artica/pandorafms!2182

Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +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 e32c4025a4 Supervisor. minor fixes
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
2019-02-21 14:18:33 +01:00
fbsanchez fd77b94f96 Fix regexp Supervisor
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
2019-02-21 14:16:17 +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 Fraguas a54903d9c6 Merge branch 'ent-3279-planned-downtime-creation-api-cli' into 'develop'
API/CLI: fixed planned downtime creation

See merge request artica/pandorafms!2184

Former-commit-id: 84f21e2c9762af3a1c1c04c24dc6e35848c0f437
2019-02-21 13:32:15 +01:00
daniel d9e0f2ea42 Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
daniel dc4d5b1bd7 fixed error in widget
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +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 4148387c50 Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
Daniel Rodriguez ba87d6a9b8 Merge branch 'ent-3214-exact-oid-matches' into 'develop'
Add support for exact matches to SNMP alerts.

See merge request artica/pandorafms!2090

Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
manuel c385a3191f minor fixes
Former-commit-id: ffb62390a5edaa158507f253cf7fb23c690f8fcf
2019-02-21 11:21:56 +01:00
manuel ad3e2b88bf Minor fixes Wiz.Discovery
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
Alejandro Fraguas bb7be444f4 Merge branch '3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo' into 'develop'
Fixed error user edit tocken filter events not set.

See merge request artica/pandorafms!2188

Former-commit-id: d293fbdebaf2a1300b4a2082c75d9b92c37cf87b
2019-02-21 09:49:47 +01:00
artica 1156b29743 Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
fbsanchez 6a43536b33 Discovery. Added App.VMw
Former-commit-id: 18a9300f37163048bd99109c08c1228231426a59
2019-02-20 19:30:25 +01:00
fbsanchez 08c6d782a4 Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24: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
fermin831 0ed6c6d620 Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
fermin831 f49b26692e Fixes on wizards
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
2019-02-20 16:47:29 +01:00
fbsanchez 93a73bc8c8 Merge branch 'ent-3394-discovery-applications' into 'ent-3430-discovery'
Ent 3394 discovery applications

See merge request artica/pandorafms!2183

Former-commit-id: 1e6092ad224bc2ec5e058f7a6b2e2f43f1f1674c
2019-02-20 16:43:49 +01:00
fbsanchez 219ad87bda Merge branch 'ent-3431-discovery-host-devices' into 'ent-3430-discovery'
Ent 3431 discovery host devices

See merge request artica/pandorafms!2170

Former-commit-id: a6b76549bbc925fa6c48a01b88e57895a8aa9f3e
2019-02-20 16:41:54 +01:00
Daniel Rodriguez 8266c716e8 Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
Cambiar alert por dialog

See merge request artica/pandorafms!2178

Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
Daniel Rodriguez 9419e68aef Merge branch 'ent-3499-Numero_de_respuestas_de_eventos_masivas' into 'develop'
add new tocken max events responses

See merge request artica/pandorafms!2180

Former-commit-id: c8b7deddcaa8f290d1b3065158606e21504d2dae
2019-02-20 16:11:34 +01:00