tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,827 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

4173 Commits

Author SHA1 Message Date
manuel af2954d392 Changed controls in static graph vs 
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
 2019-02-20 11:46:32 +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
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
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
manuel 3d2ae47543 Added prepareBreadcrum function 
Former-commit-id: caf781a20bdd16bed7347bf755e2bf0da6ae7e99
 2019-02-20 08:41:15 +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
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 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
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
Ramon Novoa 7bd5851667 Add support for column macros. 
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
 2019-02-19 13:04:57 +01:00
daniel d116e4742a add new tocken max events responses 
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
 2019-02-19 12:14:42 +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
manuel 8ac1642dea Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices 
Former-commit-id: 7b45b6f2d34e1592b9898dc94c826d138e2b6e63
 2019-02-19 08:59:41 +01:00
manuel 938408ada9 Added wizard 
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
 2019-02-19 08:58:30 +01:00
fbsanchez 7f0b676e0f Discovery tasks. Extended events. Autoconfigure detected agents. 
Former-commit-id: da2282082606c970dbace453193eb0a7e4089731
 2019-02-18 19:50:13 +01:00
Alejandro Gallardo Escobar 9f6a96675e Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog 
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
 2019-02-18 17:34:24 +01:00
Daniel Rodriguez 4473762393 Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop' 
fix bug when updating path of ssl certificate in general setup

See merge request artica/pandorafms!2052

Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
 2019-02-18 17:18:46 +01:00
fbsanchez bb83f4ba4a avoid to show notification if disabled by user 
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
 2019-02-18 17:08:23 +01:00
fermin831 cb94692491 Added function addBreadcrum in Wizard main 
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
 2019-02-18 14:30:03 +01:00
fbsanchez 34cf0bd837 minor fix acl check in notifications 
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
 2019-02-18 14:01:17 +01:00
fbsanchez 46af41a2cc support for autoconfiguration 
Former-commit-id: 034ed513ed9cf7efbe22720b61e8ff431ebbbc84
 2019-02-18 14:00:55 +01:00
daniel e00ae31862 Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF 
Conflicts:
	pandora_console/install.php


Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0
 2019-02-18 13:16:43 +01:00
daniel efd65edefa fixed errors 
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
 2019-02-18 13:13:17 +01:00
Daniel Rodriguez 59cd0a43ea Merge branch '2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta' into 'develop' 
ent-2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta

See merge request artica/pandorafms!2111

Former-commit-id: b9770bc97e741d6e6d7b0ab111c195ac3fe440df
 2019-02-18 12:16:55 +01:00
fbsanchez a1a429aa52 H&D minor fixes and acl checks 
Former-commit-id: cec9ec899e648ab6e76716333c8ee09ca875023a
 2019-02-18 12:14:03 +01:00
manuel 29206eb3bb Added visual changes 
Former-commit-id: 33ac4873763e6b0e2cf3d2ad2b25492fe5b33583
 2019-02-18 11:42:55 +01:00
fermin831 a6bbd17423 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
 2019-02-18 10:24:35 +01:00
fermin831 a9caebbbf4 Put the list into a function 
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
 2019-02-18 10:24:19 +01:00
fermin831 2332001884 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Conflicts:
	pandora_console/godmode/servers/discovery.php

Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
 2019-02-18 08:50:54 +01:00
fbsanchez 912f0baace Discovery Tasks first tasks and some minor fixes 
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
 2019-02-15 18:42:44 +01:00
fbsanchez a5ad61f340 discovery delete task 
Former-commit-id: 8809067053aa6bebfa61498afb2108aea352f3d7
 2019-02-15 18:35:35 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes 
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
 2019-02-15 18:05:59 +01:00
fbsanchez 0f375d6a76 H&D minor fix group cannot be All 
Former-commit-id: 2feb42ce06bd379bbb3804a30fab744a4b01b1e1
 2019-02-15 16:37:48 +01:00
fbsanchez 45fd528e38 minor fixes H&D 
Former-commit-id: c3236b91b4b6a0f37af2d4da4955c711dd4ace43
 2019-02-15 16:02:55 +01:00
alejandro-campos 46de260573 Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta 
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
 2019-02-15 15:55:31 +01:00
alejandro-campos 337b846f48 Merge branch 'develop' into 3141-SQL-query-a-la-propia-metaconsola 
Former-commit-id: 16a42b43088f8f99b9c33fe05a53f220598b2135
 2019-02-15 15:35:57 +01:00
alejandro-campos 0c99fe279f Merge branch 'develop' into 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola 
Former-commit-id: 2b9c06e16291022e626c42503c45776193a0c5ce
 2019-02-15 15:13:45 +01:00
alejandro-campos 2c97708373 Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general 
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
 2019-02-15 14:56:20 +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 c62c01c4a0 H&D minor fix - visual 
Former-commit-id: 57d1e3c62192d9568bfa4db11658e31a8d811a3a
 2019-02-15 14:14:56 +01:00
manuel e04a61df98 Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices 
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
 2019-02-15 14:03:29 +01:00
manuel 32d34cd09b Changed styles in host and devices 
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
 2019-02-15 14:02:32 +01:00
fbsanchez ec672d6bfb H&D network scan 
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
 2019-02-15 13:57:33 +01:00
Fermin 6c485795c7 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
 2019-02-15 13:48:08 +01:00
Fermin c9c855da9a Added new Cloud Wizard class 
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
 2019-02-15 13:47:11 +01:00
Tatiana Llorente 6c9ce7e65b Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica 
Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/styles/pandora.css
	pandora_console/install.php


Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
 2019-02-15 13:18:10 +01:00
fbsanchez efdc17b801 WIP: H&D 
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
 2019-02-15 13:08:44 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov 
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
 2019-02-15 10:00:23 +01:00
fbsanchez 96fccc578c WIP: H&D 
Former-commit-id: 82a6c84a2c896a08f420a89dc3fe6cd79d8ff3bb
 2019-02-14 17:56:10 +01:00
fbsanchez 3995874176 WIP: H&D: merge 
Former-commit-id: c1e04b80a49fb0a9870676dc8f59732cd595fbc0
 2019-02-14 17:19:20 +01:00
fbsanchez 7df9d4f78b WIP: H&D merge 
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
 2019-02-14 17:14:01 +01:00
Daniel Rodriguez 52c4b3dab1 Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop' 
add params setup historic database

See merge request artica/pandorafms!2154

Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
 2019-02-14 17:00:56 +01:00
fermin831 0d7ea0d056 Added CSV report and copy a lot of not revisted code 
Former-commit-id: 005362b157450862501963770df3fd0419bc573a
 2019-02-14 16:56:03 +01:00
Daniel Barbero 624d804168 Fixed minor error 
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
 2019-02-14 16:53:01 +01:00
Daniel Barbero d9ba3af358 Fixed errors in setup performances 
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
 2019-02-14 16:31:19 +01:00
Alejandro Fraguas 4c94956b91 Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop' 
Fixed slow query in template item

See merge request artica/pandorafms!2151

Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
 2019-02-14 16:15:01 +01:00
fbsanchez 8acb658266 WIP: H&D 
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
 2019-02-14 13:27:49 +01:00
fbsanchez 070db506b8 WIP: H&D 
Former-commit-id: 8f66bccf64b219df20d19d72eb41bec8acdd9bbc
 2019-02-14 11:53:06 +01:00
fbsanchez 685d8c04c2 WIP H&D base structure 
Former-commit-id: dace1164c5a568adbb98c187106838d25334f934
 2019-02-14 11:32:07 +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 6ff357595d Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices 
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
 2019-02-14 10:58:26 +01:00
fbsanchez 0db88817a9 WIP H&D 
Former-commit-id: c3b0b6f56ff0591f8c5839d61144bbb72ddd7033
 2019-02-14 10:56:25 +01:00
fermin831 57991495e4 Use the CSV extension to import CSV on host and devices 
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
 2019-02-14 10:30:01 +01:00
Daniel Barbero 0fb61444f6 Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/include/functions_api.php
	pandora_console/install.php


Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
 2019-02-14 08:01:23 +01:00
Daniel Rodriguez c0dd81cab5 Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop' 
Fixed WMI passwords when encrypted

See merge request artica/pandorafms!2164

Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
 2019-02-13 18:33:11 +01:00
Samuel Carcases 812382a47f Update manage_network_components_form.php 
Former-commit-id: 17e3faf98a33bb6f7e21e805085f366944e51ea4
 2019-02-13 16:51:22 +01:00
Alejandro Fraguas 8abb1b90dc Merge branch 'ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI' into 'develop' 
Changed popup windows by tooltips

See merge request artica/pandorafms!2106

Former-commit-id: 5682d4f7088be60279aaf33a9756b306a23ea4d8
 2019-02-13 16:08:01 +01:00
Daniel Rodriguez f7134b6d81 Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop' 
Ent 3377 bug manager update online de la version open source

See merge request artica/pandorafms!2171

Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
 2019-02-13 15:56:19 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer 
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
 2019-02-13 14:56:10 +01:00
manuel 40419ea587 Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI 
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php


Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
 2019-02-13 14:55:21 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue 
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
 2019-02-13 14:43:55 +01:00
samucarc 6a9e69adb1 Added changes 
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
 2019-02-13 12:21:31 +01:00
manuel b11d1a6687 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte 
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php


Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
 2019-02-13 12:03:46 +01:00
fermin831 fe50d6caff Open toasts and messages into new window 
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
 2019-02-13 11:09:15 +01:00
samucarc f00266bc86 Merge branch 'develop' into 3145-Fallback_to_local_and_save_password 
Former-commit-id: d3a7766ee87b4e1484d55b14abd69d7fe2ee709e
 2019-02-12 18:55:48 +01:00
samucarc 28a932148e Fixed tooltip 
Former-commit-id: 565813260edd865433afba59e8ecad824d549c77
 2019-02-12 18:55:36 +01:00
samucarc bcaccf31bc fixed encryptation in network componet modules 
Former-commit-id: b4d64e4562add1b9853bfa888556a4495c4177ed
 2019-02-12 17:55:58 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX 
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
 2019-02-12 16:25:59 +01:00
fermin831 105341e553 Removed unwanted traces (again) 
Former-commit-id: c6453610177b1894bc9d65c8297cd4f8ee01092d
 2019-02-12 16:01:24 +01:00
fermin831 325f5e8775 Added onclik con notification toasts 
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
 2019-02-12 15:27:14 +01:00
Ramon Novoa fa7f519d34 Merged from develop. 
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
 2019-02-12 14:52:18 +01:00
manuel 27da41c7da WIP Host&devices 
Former-commit-id: cc18e55a30f72c606bb5b5736a5fa771987e0a45
 2019-02-12 14:39:01 +01:00