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

654 Commits

Author SHA1 Message Date
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Rodriguez 3092a00edb Merge branch 'ent-8532-widget-agent-modulos-no-muestra-modulos' into 'develop' 
Fix agentmodules widget conf style

See merge request artica/pandorafms!4693
 2022-02-22 11:47:55 +00:00
Daniel Barbero Martin 3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
Calvo 8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Calvo a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
Calvo e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez cc2685676a Merge branch 'ent-8486-datos-discovery-sap-al-reves' into 'develop' 
patterns for text inputs

See merge request artica/pandorafms!4655
 2022-02-08 16:17:38 +00:00
Daniel Barbero Martin 07ed6689d6 external alerts new filters pandora_enterprise#7933 2022-02-08 13:56:19 +01:00
Daniel Barbero Martin 1146afe94c bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 13:52:40 +01:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
fbsanchez e263d9a0c5 patterns for text inputs 2022-01-26 12:52:36 +01:00
Daniel Barbero Martin d76745cc9f chrome never autocomplete 2022-01-26 12:17:07 +01:00
Calvo 5b624fc388 Added searchbar to select multiple modules on custom graph 2022-01-26 11:52:49 +01:00
Daniel Barbero Martin 7b956d3ca1 select 2 never autocomplete 2022-01-26 09:14:19 +01:00
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
José González f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view' 
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
 2022-01-13 08:58:21 +00:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
fbsanchez 3b6f5bd02f services php8 2022-01-11 14:30:59 +01:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
Jose Gonzalez 8cdf1acd42 Fix issue with modules 2022-01-06 16:23:13 +01:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Jose Gonzalez 32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
Calvo 3cee99cbed Fix Cluster visual bugs 2021-12-30 18:26:59 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 
Conflicts:
	pandora_console/include/functions_html.php
 2021-11-24 08:39:03 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
Daniel Rodriguez 3fc8e0cf7f Merge branch 'ent-7994-carrefour-anadir-filtro-en-la-vista-de-custom-field-view-metaconsola' into 'develop' 
added search capacity to multiple select

See merge request artica/pandorafms!4459
 2021-11-17 15:14:31 +00:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
alejandro.campos@artica.es 21c1bacc0e added search capacity to multiple select 2021-10-07 17:12:00 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop' 
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
 2021-10-05 09:29:24 +00:00
Daniel Rodriguez 4cff768f4b Merge branch 'ent-7760-bug-visual-con-el-times-in-al-añadir-una-accion-a-una-alerta-de-correlacion' into 'develop' 
fixed visual error with time in action on ca

See merge request artica/pandorafms!4294
 2021-10-05 09:27:30 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop' 
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
 2021-09-24 07:12:52 +00:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop' 
Fix widgets style bugs

See merge request artica/pandorafms!4272
 2021-09-22 08:58:51 +00:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
marcos 83084f54bd fixed visual error with time in action on ca 2021-07-13 11:38:46 +02:00
marcos 640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00
Calvo cdf6c3972e Fix widgets style bugs 2021-07-07 12:09:47 +02:00
José González 1d468987d3 Added parameter onclick in anchors 2021-06-29 14:55:03 +02:00
marcos 26acac191f ad not condition on monitor detail 2021-06-25 09:37:26 +02:00
fbsanchez be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
fbsanchez bbbadff426 Minor style fixes - missed files - in massive services 2021-06-07 21:19:11 +02:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
marcos f1134c49fd fixed error time interval editor 2021-04-23 12:38:58 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Jose Gonzalez ee858280e1 Changed CSRF hidden function for allow return 2021-04-09 13:30:31 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Daniel Rodriguez 9813586f0d Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop' 
Added more clear message

Closes pandora_enterprise#6935

See merge request artica/pandorafms!3853
 2021-04-07 10:54:20 +00:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Daniel Rodriguez b244cd28b2 Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop' 
Added tips to large tags in module config

See merge request artica/pandorafms!3851
 2021-04-07 10:52:39 +00:00
Luis 36287188b4 Added tips to large tags in module config 2021-04-07 10:52:39 +00:00
Daniel Rodriguez f0870e6e08 Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' 
select2 on select items

See merge request artica/pandorafms!3836
 2021-04-07 10:52:07 +00:00
Daniel Rodriguez 7593fe9f81 Merge branch 'ent-4536-Quitar-el-autocompletado-de-los-campos-personalizados' into 'develop' 
Ent 4536 quitar el autocompletado de los campos personalizados

See merge request artica/pandorafms!3811
 2021-04-06 17:48:14 +00:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Jose Gonzalez 5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3911
 2021-03-22 12:46:58 +00:00
fbsanchez ddb58f56e9 errata fix 2021-03-18 11:48:52 +01:00
fbsanchez 38695482c0 Validate custom text 2021-03-18 10:35:41 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
marcos a0607e7230 fixed visual error 2021-03-18 10:03:52 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos 4c5f220264 fixed visual error 2021-03-15 17:55:54 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
 2021-03-11 17:47:27 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Jose Gonzalez dac99fa4c6 Added more clear message 2021-02-19 12:29:48 +01:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
fbsanchez 8049aabf5b select2 on select items 2021-02-16 13:35:04 +01:00
fbsanchez 2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
fbsanchez 7bb68abbad Wizard RC1 with filtering and improved comm 2021-02-04 18:19:35 +01:00
Daniel Maya 6a9587bff8 #4536 autocomplete = off by default 2021-02-01 13:54:57 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
fbsanchez 9fa16decfa Force language message validation (groups) 2021-01-11 13:53:52 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
fbsanchez 34374159de gcp reviewed 2020-12-03 18:00:20 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop' 
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
 2020-12-01 12:11:33 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales 
Merge with last updates
 2020-11-23 10:08:16 +01:00
Jose Gonzalez 22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
Jose Gonzalez 938860dff2 Added wrapper attributes 2020-11-03 17:15:01 +01:00
Daniel Maya bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
Daniel Rodriguez 4ed68fee56 Merge branch 'ent-6477-error-en-la-seleccion-de-grupos-de-dashboards' into 'develop' 
Minor fix all group empty label

See merge request artica/pandorafms!3542
 2020-10-29 12:20:35 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
fbsanchez 5842235846 Orphan service modules + control require argument select from sql 2020-10-26 13:37:05 +01:00
fbsanchez 3220217ec8 exclude branch from select_for_Groups given group_id 2020-10-21 18:31:10 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +02:00
fbsanchez 033dd531a8 Minor fix all group empty label 2020-10-20 17:47:35 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez 07ed5ac9d8 minor fix AJAX group selector in MC 2020-10-02 14:00:04 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez d4e837b7e6 Group all management, "all" selected instead "none" if included 2020-09-28 15:47:38 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
Luis Calvo 158cbc74e2 Fixed result div for string modules bug 2020-07-23 17:28:44 +02:00
Daniel Rodriguez f2f8debab6 Merge branch 'ent-5969-fallo-visual-en-reports-vista-html' into 'develop' 
fixed error

See merge request artica/pandorafms!3308
 2020-07-17 10:34:28 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00