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

21382 Commits

Author SHA1 Message Date
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
Daniel Rodriguez a6f2b364f6 Merge branch 'ent-7281-Aumentar-carácteres-de-la-caja-de-consulta-SQL-en-Informes' into 'develop' 
Ent 7281 aumentar carácteres de la caja de consulta sql en informes

See merge request artica/pandorafms!4014
 2021-04-12 14:44:33 +00:00
Daniel Maya 8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Jose Gonzalez 3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez 9184d2b11f Merge branch 'ent-6857-implementar-control-de-descarga-csv-del-log-viewer-en-metaconsola' into 'develop' 
Ent 6857 implementar control de descarga csv del log viewer en metaconsola

See merge request artica/pandorafms!3917
 2021-04-12 08:48:16 +00:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Jose Gonzalez 141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Daniel Rodriguez 558ba562ee Merge branch 'ent-7292-bug-creacion-grupos' into 'develop' 
Added boolean casting for check acl

Closes pandora_enterprise#7292

See merge request artica/pandorafms!4016
 2021-04-12 08:17:34 +00:00
Daniel Barbero Martin 319a329aec Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-12 08:04:04 +02:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
Daniel Barbero Martin 37fe9bfafb WIP command center 2021-04-09 14:27:12 +02:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Daniel Rodriguez bcb0832309 Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' 
Avoid file 0 with log in pandora_console

See merge request artica/pandorafms!3863
 2021-04-09 11:53:26 +00:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez a203a6e80d Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' 
fixed size box log sources status

See merge request artica/pandorafms!4006
 2021-04-09 09:35:50 +00:00
Daniel Rodriguez ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez 040fdbae01 Merge branch 'ent-7262-fondo-de-la-grafica-de-acceso-no-es-transparente-casca-en-blactheme' into 'develop' 
set black theme on agent access rate flot

See merge request artica/pandorafms!3997
 2021-04-09 09:29:26 +00:00
Marcos Alconada a1fceb2e81 set black theme on agent access rate flot 2021-04-09 09:29:26 +00:00
Daniel Rodriguez bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00
Daniel Rodriguez 1b9916c6e9 Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop' 
fixed error with label reporting views

See merge request artica/pandorafms!3938
 2021-04-09 09:24:44 +00:00
Daniel Rodriguez 1fb259c35f Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop' 
fixed error on bulk operations edit agents

See merge request artica/pandorafms!3995
 2021-04-09 09:21:36 +00:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
Daniel Barbero Martin a80b6664d4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-09 08:04:03 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
Daniel Barbero Martin 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +02:00
Daniel Rodriguez 4adb9827cb Merge branch 'ent-7278-no-se-despliegan-agentes-en-templates-wizard-ni-en-generacion-dinamica-de-reports-desde' into 'develop' 
minor fix while empty search condition

See merge request artica/pandorafms!4012
 2021-04-08 07:49:16 +00:00
artica 2e27cebad2 Auto-updated build strings. 2021-04-08 01:00:37 +02:00
fbsanchez c64f05dc17 minor fix while empty search condition 2021-04-07 20:31:24 +02:00
fbsanchez 201d3194de Some inclusions in mobile view (MC) and minor fixes 2021-04-07 18:17:08 +02:00
fbsanchez cf6ad584d4 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 2021-04-07 17:46:43 +02:00
Daniel Rodriguez b62dc5c0c2 Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' 
fixed visual error report wizard

See merge request artica/pandorafms!3896
 2021-04-07 15:10:32 +00:00
daniel d78c276721 fixed visual error report wizard 2021-04-07 15:10:32 +00:00
Daniel Rodriguez 1f61161e6f Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop' 
General report exponent prefix shows with blankspace

See merge request artica/pandorafms!3924
 2021-04-07 13:15:38 +00:00
marcos 4395f21e4e add black theme style on visual map 2021-04-07 13:27:24 +02:00
Jose Gonzalez 34b01fdf51 Merge 2021-04-07 13:10:52 +02:00
Jose Gonzalez d4d3350c8c Reverted failed change 2021-04-07 13:03:18 +02:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez 517d7378d4 Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop' 
Addded param to escape API url call raw_decode

See merge request artica/pandorafms!3914
 2021-04-07 10:54:47 +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 08fa353682 Merge branch 'ent-7034-button-go-back-remote-components-do-not-work' into 'develop' 
Fixed reomte components search bugs and button go back

See merge request artica/pandorafms!3998
 2021-04-07 10:51:35 +00:00
Luis 97879d1c71 Fixed reomte components search bugs and button go back 2021-04-07 10:51:35 +00:00
Daniel Barbero Martin fcf449439b WIP command center 2021-04-07 12:43:04 +02:00
marcos 7a5125ea8c fixed size box log sources status 2021-04-07 11:52:57 +02:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
fbsanchez 1ac6ed35cf Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 10:23:33 +02:00
Daniel Barbero Martin 216410946e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-07 10:20:46 +02:00
fbsanchez 4920dc9621 Revert "Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop'" 
This reverts merge request !3860
 2021-04-07 10:17:32 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
artica 8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02: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
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
Daniel Rodriguez aaded121a4 Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop' 
restricted action creation on alerts created from policy

See merge request artica/pandorafms!3891
 2021-04-06 17:46:47 +00:00
Daniel Rodriguez 43cfa383ac Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop' 
Add pagination to commands view

See merge request artica/pandorafms!3919
 2021-04-06 17:44:54 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Daniel Rodriguez e6ad284b80 Merge branch 'ent-6999-No-aparece-la-cabecera-en-la-vista-de-clusterssi-no-hay-cluster-creado' into 'develop' 
add deafult header

See merge request artica/pandorafms!3829
 2021-04-06 17:32:31 +00:00
Daniel Rodriguez 58d5c2bc69 Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop' 
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules

See merge request artica/pandorafms!3881
 2021-04-06 17:30:27 +00:00
Daniel Rodriguez bec22b5825 Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop' 
Fixed user/profile newline on users_list

See merge request artica/pandorafms!3982
 2021-04-06 17:24:20 +00:00
Daniel Rodriguez 32527863cb Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop' 
fixed error tree groups agent edition metaconsole

See merge request artica/pandorafms!3904
 2021-04-06 17:23:18 +00:00
Daniel Rodriguez 8b817c63c7 Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop' 
unsort template items

See merge request artica/pandorafms!3810
 2021-04-06 17:22:33 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
Daniel Rodriguez 68a8c37545 Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' 
Fixed session close on api

See merge request artica/pandorafms!3749
 2021-04-06 17:18:53 +00:00
Daniel Rodriguez 7a0139accd Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop' 
API get license, get license_remaining

See merge request artica/pandorafms!3814
 2021-04-06 17:18:24 +00:00
Daniel Rodriguez a70a74fb47 Merge branch 'ent-7241-ventana-de-newsletter-con-errores-visuales' into 'develop' 
fixed lost icon

See merge request artica/pandorafms!3984
 2021-04-06 17:15:41 +00:00
Marcos Alconada f2efb6a39b fixed lost icon 2021-04-06 17:15:41 +00:00
Daniel Rodriguez dc692dbf2c Merge branch 'ent-6332-aadcm-anadir-buscador-de-modulos-en-vista-de-agente-consola-movil' into 'develop' 
Added a searchbox for module list in mobile/agent

See merge request artica/pandorafms!3962
 2021-04-06 17:14:49 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Daniel Rodriguez 1e90b0d300 Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop' 
Modules alphabetically sorted in Discovery review

See merge request artica/pandorafms!3907
 2021-04-06 17:09:28 +00:00
Daniel Rodriguez 1de0f6060c Merge branch 'ent-4228-system-uptime-always-shows-data-formatted-as-date' into 'develop' 
Fixed data always formatting to date in sys uptime snmp modules

See merge request artica/pandorafms!3857
 2021-04-06 17:08:40 +00:00
Daniel Rodriguez 1eba5f8e6c Merge branch 'ent-7072-mensaje-erroneo-module-management-meta' into 'develop' 
Fixed centralized management warnin on module management meta

See merge request artica/pandorafms!3880
 2021-04-06 17:06:40 +00:00
Luis 4944820aed Fixed centralized management warnin on module management meta 2021-04-06 17:06:40 +00:00
Daniel Rodriguez 29bf07d96c Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Fixed issue with URLs

Closes pandora_enterprise#7040

See merge request artica/pandorafms!3860
 2021-04-06 17:05:17 +00:00
Daniel Rodriguez 7756056755 Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop' 
restored bell and module icon with plus on agent edition view

See merge request artica/pandorafms!3988
 2021-04-06 17:03:19 +00:00
Daniel Rodriguez 9c7eebc638 Merge branch 'ent-7195-errores-visuales-consola-movil' into 'develop' 
Added missing classes to main.css mobile

See merge request artica/pandorafms!3970
 2021-04-06 17:02:20 +00:00
Daniel Rodriguez c192a1681b Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' 
Fixed task edit url when nof fully defined (custom-script)

See merge request artica/pandorafms!3906
 2021-04-06 17:00:49 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop' 
fixed error events reports

See merge request artica/pandorafms!3902
 2021-04-06 16:59:42 +00:00
Daniel Rodriguez 1b32ad83ff Merge branch 'ent-7052-entities-en-nombre-de-eventos' into 'develop' 
remove entities when add comment

See merge request artica/pandorafms!3839
 2021-04-06 16:58:05 +00:00
Marcos Alconada 654a4ebbd0 remove entities when add comment 2021-04-06 16:58:05 +00:00
Daniel Rodriguez 6adc987f72 Merge branch 'ent-7035-enlace-modulos-rotos-module-library' into 'develop' 
Fixed module library download links

See merge request artica/pandorafms!3834
 2021-04-06 16:56:37 +00:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
Daniel Barbero Martin 0e30f1bc4f WIP command center 2021-04-06 17:22:34 +02:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 38a6d65f60 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-04-06 11:01:20 +02:00
marcos 7d3dc7e3a6 fixed error on bulk operations edit agents 2021-04-06 08:55:06 +02:00
Daniel Barbero Martin 74afdf9510 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-06 08:03:40 +02:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
Daniel Barbero Martin 846b601a3c WIP command center 2021-04-05 17:32:19 +02:00