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

16008 Commits

Author SHA1 Message Date
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
Daniel Maya 02fe08903c #8696 Fixed warning status 2022-03-07 15:07:06 +01:00
José González 89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
Calvo 433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop' 
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
 2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es 69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Calvo 05c283642f Addedd metaconsole tree view filter for disabled agents 2022-02-25 15:37:08 +01:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
Calvo 4f3c509bde Fix credential store ACL, only accces to PM or UM 2022-02-24 17:33:13 +01:00
José González 64ed03784b Fix several issues with mobile view 2022-02-24 11:04:18 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Calvo 3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Daniel Barbero Martin 5b0d3fe6d4 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:26:13 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +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 Rodriguez dcfe55f2dd Merge branch 'ent-8600-fallo-umbrales-creacion-modulo-snmp-interface' into 'develop' 
Quick fix

See merge request artica/pandorafms!4707
 2022-02-22 11:47:19 +00:00
José González 604633dd35 Fixed issues with interfaces view and limited to show only agents with ifaces 2022-02-22 12:37:01 +01:00
Daniel Barbero Martin 3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
artica 4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
Calvo b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
alejandro.campos@artica.es abae27e361 implement new netflow item 2022-02-21 15:27:41 +01:00
Calvo bacd0a616f Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-21 13:43:20 +01:00
alejandro.campos@artica.es 931477fcd5 implement new netflow item 2022-02-21 12:26:48 +01:00
alejandro.campos@artica.es 362898681e Implement new netflow item 2022-02-21 11:51:52 +01:00
alejandro.campos@artica.es 659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
artica 9ddc8768d4 Auto-updated build strings. 2022-02-21 01:00:18 +01:00
artica 2fe7227190 Auto-updated build strings. 2022-02-20 01:00:17 +01:00
artica db4540cdb5 Auto-updated build strings. 2022-02-19 01:00:22 +01:00
fbsanchez 3b99a95368 Quick fix 2022-02-18 13:48:23 +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
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
Daniel Rodriguez c460e20537 Merge branch 'ent-6802-super-8' into 'develop' 
Super 8

See merge request artica/pandorafms!4622
 2022-02-18 09:33:24 +00:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
Daniel Rodriguez 2d141a34dc Merge branch 'ent-8578-estilos-podridos-ehorus' into 'develop' 
Fix some styles

Closes pandora_enterprise#8578

See merge request artica/pandorafms!4698
 2022-02-18 08:17:07 +00:00
artica 5e69f1719e Auto-updated build strings. 2022-02-18 01:00:19 +01:00
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
fbsanchez d56fa44210 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-17 10:25:54 +01:00
artica d65eaed8ba Auto-updated build strings. 2022-02-17 01:00:08 +01:00
fbsanchez 4d1ddc2066 Force log check each based in configuration state 2022-02-16 19:04:41 +01:00
artica b27dd1c3ef Updated version and build strings. 2022-02-16 17:27:01 +01:00
Jose Gonzalez 7ee04bea49 Fix some styles 2022-02-16 15:26:56 +01:00
Calvo 3d02febd22 Fix local login with local user token enabled 2022-02-16 14:25:25 +01:00
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +01:00
fbsanchez 8099a91117 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-16 13:49:59 +01:00
Calvo 5b59cfc194 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-16 12:26:45 +01:00
Calvo a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
artica a6583e7010 Auto-updated build strings. 2022-02-16 01:00:21 +01:00
Calvo 9d4eda381b Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-15 17:44:34 +01:00
Calvo e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
Daniel Rodriguez d8d7e9e30f Merge branch 'ent-8516-Actualizar-traducciones' into 'develop' 
translates pandora_enterprise#8516

See merge request artica/pandorafms!4676
 2022-02-15 13:57:58 +00:00
fbsanchez 7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00
Daniel Rodriguez 6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
Daniel Rodriguez 2e1b8ee246 Merge branch 'ent-8563-tree-view-no-aparecen-agentes-no-inicializados' into 'develop' 
Treeview not showing notinit agents when filter enabled

See merge request artica/pandorafms!4696
 2022-02-15 10:18:12 +00:00
Daniel Rodriguez f19387e40a Merge branch 'ent-8570-Error-SQL-en-wizard-consolas-visuales' into 'develop' 
fix module name finish % pandora_enterprise#8570

See merge request artica/pandorafms!4694
 2022-02-15 10:17:22 +00:00
artica bcde7814af Auto-updated build strings. 2022-02-15 01:00:20 +01:00
Luis 4b1c93d7b3 Treeview not showing notinit agents when filter enabled 2022-02-14 17:55:29 +01:00
Daniel Barbero Martin bc9bb070df fix module name finish % pandora_enterprise#8570 2022-02-14 08:55:14 +01:00
Daniel Barbero Martin f4ac71eb31 Merge remote-tracking branch 'origin/develop' into ent-8570-Error-SQL-en-wizard-consolas-visuales 2022-02-14 08:05:11 +01:00
artica 06321f438b Auto-updated build strings. 2022-02-14 01:00:20 +01:00
artica 33f256e9b5 Auto-updated build strings. 2022-02-13 01:00:15 +01:00
artica c40b4bbe9b Auto-updated build strings. 2022-02-12 01:00:21 +01:00
Daniel Barbero Martin 362c1d2a51 fix module name finish % pandora_enterprise#8570 2022-02-11 13:22:35 +01:00
Calvo 4fc73cd7b7 Fix agentmodules widget conf style 2022-02-11 12:01:41 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Barbero Martin aa2dac1373 new item report agent/modules status pandora_enterprise#7653 2022-02-11 09:28:28 +01:00
Daniel Barbero Martin e8d5c77f3c Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-02-11 08:20:49 +01:00
artica a39232f227 Auto-updated build strings. 2022-02-11 01:00:23 +01:00
Daniel Rodriguez 0fe50cf938 Merge branch 'ent-8568-error-sql-cargar-filtro-eventos' into 'develop' 
Fix issue with filters in SQL query

Closes pandora_enterprise#8568

See merge request artica/pandorafms!4690
 2022-02-10 18:41:24 +00:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Daniel Barbero Martin 2a37503f2e new item report agent/modules status pandora_enterprise#7653 2022-02-10 16:33:58 +01:00
Jose Gonzalez 034329d96d Fix issue with filters in SQL query 2022-02-10 16:09:53 +01:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Daniel Rodriguez 3f5b9a21f9 Merge branch 'ent-8552-fallo-subida-pspz-y-pspz2' into 'develop' 
Ent 8552 fallo subida pspz y pspz2

See merge request artica/pandorafms!4684
 2022-02-10 14:10:36 +00:00
Daniel Rodriguez 8f59f4158f Merge branch 'ent-8435-11626-Vulnerabilidad-JQuery' into 'develop' 
Ent 8435 11626 vulnerabilidad j query

See merge request artica/pandorafms!4683
 2022-02-10 11:05:53 +00:00
Jose Gonzalez 1e1ae95635 Fix issue with collapse icon 2022-02-10 10:28:43 +01:00
artica 1d86c1ea48 Auto-updated build strings. 2022-02-10 01:00:21 +01:00
Daniel Barbero Martin b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Jose Gonzalez b13b2b144b Added some fixes 2022-02-09 12:30:48 +01:00
artica 98fc41c385 Auto-updated build strings. 2022-02-09 01:00:22 +01:00
fbsanchez e26aca338a Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-08 22:08:37 +01:00
Jose Gonzalez 3d4146c926 Minor fix 2022-02-08 17:54:37 +01:00
fbsanchez 83d8b5348f pol group api create agent auto-assign fix 2022-02-08 17:54:14 +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 1dd9ff568e Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2022-02-08 14:34:59 +01:00
Daniel Barbero Martin 07ed6689d6 external alerts new filters pandora_enterprise#7933 2022-02-08 13:56:19 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Daniel Rodriguez f659016c6f Merge branch 'ent-3943-Plantillas-de-alerta-con-varios-horarios' into 'develop' 
WIP #3943

Closes pandora_enterprise#3943

See merge request artica/pandorafms!4595
 2022-02-08 11:29:34 +00:00
Luis 4eade30e48 Merge remote-tracking branch 'origin/develop' into ent-8552-fallo-subida-pspz-y-pspz2 2022-02-08 10:03:31 +01:00
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Daniel Barbero Martin ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
artica b47003a7b4 Auto-updated build strings. 2022-02-08 01:00:17 +01:00
fbsanchez 3f52679969 removed policy stuff from api update_agent_field 2022-02-07 18:56:58 +01:00
fbsanchez d6b6357e98 removed policy stuff from api update_agent 2022-02-07 18:54:24 +01:00
Daniel Rodriguez 3fbbaf031c Merge branch 'ent-8273-modificar-item-last-value-en-reports' into 'develop' 
Report item last value shows last value on selected interval

See merge request artica/pandorafms!4660
 2022-02-07 17:22:11 +00:00
Jose Gonzalez 351b8fcb97 Fix 2022-02-07 16:44:21 +01:00
fbsanchez 838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
fbsanchez 849ab9820e php72 fallback compat 2022-02-07 13:58:42 +01:00
fbsanchez 331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
fbsanchez 412104300c php8 incompatibility fixes 2022-02-07 13:38:45 +01:00
fbsanchez aa2b08f516 php8 incompatibility fixes 2022-02-07 13:35:00 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Maya 816bbf4d00 #8435 Added jquery mobile 1.5 2022-02-07 12:29:57 +01:00
Daniel Barbero Martin dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
Daniel Barbero Martin 4dbd7731c6 Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 2022-02-07 08:03:12 +01:00
artica 11dc01c0c8 Auto-updated build strings. 2022-02-07 01:00:13 +01:00
artica c092748d0a Auto-updated build strings. 2022-02-06 01:00:16 +01:00
artica 2fc9625741 Auto-updated build strings. 2022-02-05 01:00:21 +01:00
fbsanchez e88152f596 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-04 13:53:48 +01:00
Daniel Barbero Martin d47190c234 report SLA services to metaconsole pandora_enterprise#7063 2022-02-04 13:44:20 +01:00
Jose Gonzalez 2d715827d2 Improve doc 2022-02-04 13:18:34 +01:00
Jose Gonzalez 46b115dc3c Audit log improved in Config 2022-02-04 13:13:42 +01:00
Daniel Barbero Martin 6f15d26af2 minor fix pandora_enterprise#3943 2022-02-04 09:48:10 +01:00
artica 887162322c Auto-updated build strings. 2022-02-04 01:00:21 +01:00
fbsanchez a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +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 Rodriguez 1ba89e521e Merge branch 'ent-7301-mejora-informacion-console-task' into 'develop' 
Ent 7301 mejora informacion console task

Closes pandora_enterprise#7301

See merge request artica/pandorafms!4667
 2022-02-03 12:40:05 +00:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
Jose Gonzalez 2f356541ea Fixed alert management log 2022-02-03 12:54:50 +01:00
Daniel Rodriguez 3ef5c57c9e Merge branch 'ent-8501-Error-Metaconsola-y-consolas-visuales' into 'develop' 
minor fix

See merge request artica/pandorafms!4672
 2022-02-03 10:19:45 +00:00
artica 7d405d8ded Auto-updated build strings. 2022-02-03 01:00:20 +01:00
Calvo 7fc62b4a2c Fix last value meta and status bug 2022-02-02 18:11:53 +01:00
Daniel Barbero Martin ee6ccb0757 translates pandora_enterprise#8516 2022-02-02 16:26:15 +01:00
Jose Gonzalez a438f2b1d3 Improved information console task 2022-02-02 15:04:07 +01:00
Daniel Barbero Martin c971ed6dd5 alert template schedule pandora_enterprise#3943 2022-02-02 13:18:16 +01:00
Daniel Barbero Martin 3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Jose Gonzalez bc6175abad Added audit log in massive operations 2022-02-02 12:45:43 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Daniel Rodriguez 3e24773efa Merge branch 'ent-8441-12953-Estado-de-mapas-de-red-linkados' into 'develop' 
Ent 8441 12953 estado de mapas de red linkados

See merge request artica/pandorafms!4658
 2022-02-02 09:39:20 +00:00
Calvo f1dca5e525 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-02 10:38:53 +01:00
Daniel Rodriguez 77289f1775 Merge branch 'ent-8412-Bug-visual-en-item-Group-consolas-visuales' into 'develop' 
Ent 8412 bug visual en item group consolas visuales

See merge request artica/pandorafms!4664
 2022-02-02 09:38:23 +00:00
Daniel Rodriguez 6500358ffe Merge branch 'ent-8258-Conteo-erroneo-de-modulos-not-init-en-metaconsola' into 'develop' 
fixed metaconsole count of not init modules

See merge request artica/pandorafms!4648
 2022-02-02 09:37:53 +00:00