Commit Graph

29775 Commits

Author SHA1 Message Date
Daniel Rodriguez a4b6c996d1 Merge branch 'ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos' into 'develop'
UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages

See merge request artica/pandorafms!4701
2022-02-24 09:54:19 +00:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +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
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Rodriguez e2d6b30d51 Merge branch 'ent-7821-pandora-db-historico-solo-ejecute-funciones-historico' into 'develop'
Run only a subset of maintenance tasks on the history DB.

See merge request artica/pandorafms!4675
2022-02-23 08:38:31 +00:00
Daniel Rodriguez 9f96c4e287 Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop'
Moved migrate fielename

See merge request artica/pandorafms!4708
2022-02-23 08:25:09 +00:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Daniel Rodriguez 4c31e4cda3 Merge branch 'ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server' into 'develop'
Alert server improved

See merge request artica/pandorafms!4673
2022-02-22 17:03:12 +00: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 ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop'
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
2022-02-22 12:08:46 +00: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
Daniel Rodriguez c1d5eb2d68 Merge branch 'ent-8606-Fallos-en-nuevas-bulk-operations' into 'develop'
fixed select2 multiple pandora_enterprise#8606

See merge request artica/pandorafms!4710
2022-02-22 11:46:57 +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 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
fbsanchez 6817278c2f Allow both behaviours in alert time slots 2022-02-22 11:58:53 +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
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
Calvo b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +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
fbsanchez 6bd5624a81 Moved migrate fielename 2022-02-21 10:41:43 +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
José González e2621f6230 Increased field size 2022-02-18 11:18:01 +01: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
Kike 5458cd7a44 Set min permissions to errorlog_file 2022-02-18 10:09:18 +01: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
fbsanchez 82cd2dbaff Some stuff 2022-02-17 14:23:51 +01:00
Jose Gonzalez 7d71c60237 Fix reports view 2022-02-17 14:20:24 +01:00
fbsanchez 734f623c80 Uptaded testing 2022-02-17 14:16:42 +01:00
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
fbsanchez 934be2eaf4 Updated testing and swap messages 2022-02-17 14:07:46 +01:00
fbsanchez 6434095be5 UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages 2022-02-17 13:41:40 +01:00
fbsanchez e885af19f9 minor code style change 2022-02-17 11:39:49 +01:00