Commit Graph

29860 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Rodriguez 62dfb718c9 Merge branch 'ent-8534-anadir-la-opcion-nigtlys-a-los-instaladores-online-para-instalar-un-entorno-de-pruebas' into 'develop'
adding beta package option to online installer

See merge request artica/pandorafms!4692
2022-02-16 16:18:49 +00:00
Jose Gonzalez 7ee04bea49 Fix some styles 2022-02-16 15:26:56 +01:00
rafael f84c37cee2 fixing timezonectl error on redhat 2022-02-16 15:24:15 +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 49a0283e63 some stuff 2022-02-16 13:57:30 +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
fbsanchez a6f8da46ae Uptaded testing 2022-02-16 10:42:20 +01:00
fbsanchez ba7660c330 Uptaded testing 2022-02-16 10:33:02 +01:00
fbsanchez b3aa0a51ee Uptaded testing 2022-02-16 10:20:40 +01:00
fbsanchez 261fbe0ba3 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-16 10:17:24 +01:00
artica a6583e7010 Auto-updated build strings. 2022-02-16 01:00:21 +01:00