763 Commits

Author SHA1 Message Date
Jimmy Olano
d4bf526979 Merge branch 'ent-9522-14213-llamada-api-add_event_comment-en-metaconsola-no-funciona' into 'develop'
fixed api function add comment for metaconsole pandora_enterprise#9522

pandora_enterprise#9522

See merge request artica/pandorafms!5121
2022-10-13 16:15:45 +00:00
Diego Muñoz-Reja
326365e54b Merge branch 'ent-9324-meta-wizard-no-borra-agentes' into 'develop'
fixed wizard meta delete agent pandora_enterprise#9324

See merge request artica/pandorafms!5131
2022-10-11 14:50:50 +00:00
Diego Muñoz-Reja
4666e1abf0 Merge branch 'ent-9511-llamada-API-module_data-modifica-el-intervalo' into 'develop'
Fix interval definition

See merge request artica/pandorafms!5122
2022-10-11 14:37:54 +00:00
alejandro.campos@artica.es
5501e1f3d5 fix typo in code 2022-10-11 15:24:34 +02:00
Daniel Barbero
38dea9e01b Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-10 11:27:28 +02:00
Daniel Maya
c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Rodriguez
1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop'
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
2022-09-29 09:58:45 +00:00
Daniel Maya
c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
Daniel Barbero
9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Daniel Barbero
72040df7bb fixed wizard meta delete agent pandora_enterprise#9324 2022-09-21 13:37:51 +02:00
alejandro.campos@artica.es
927658448e change permissions 2022-09-20 18:03:29 +02:00
Daniel Maya
d46174adb8 #9527 Fixed new user 2022-09-20 17:40:20 +02:00
José González
a72900e57c Fix interval definition 2022-09-20 12:14:44 +02:00
Daniel Barbero
e3579f2b13 fixed api function add comment for metaconsole pandora_enterprise#9522 2022-09-20 11:53:56 +02:00
Daniel Maya
737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
alejandro.campos@artica.es
181a480b9d fixed api methods for creating and deleting scheduled downtimes agents 2022-09-19 10:44:25 +02:00
alejandro.campos@artica.es
3c5a55f058 implemented alert commands and actions to send report by email 2022-09-13 12:23:28 +02:00
alejandro.campos@artica.es
2ea9cebaad implemented alert commands and actions to send report by email 2022-09-13 12:18:53 +02:00
alejandro.campos@artica.es
d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
José González
b7be5912ba Fix total modules count 2022-08-29 10:54:55 +02:00
José González
ded27ce411 Backend changes 2022-06-28 17:24:22 +02:00
daniel
867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop'
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
2022-06-28 13:45:53 +00:00
Daniel Barbero Martin
58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin
c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin
9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Calvo
291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin
7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González
b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +02:00
Daniel Barbero Martin
acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/operation/events/events.php
2022-06-16 09:09:49 +02:00
Daniel Barbero Martin
b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
edu.corral
ae657ee018 8856 meta api functions 2022-06-09 17:22:00 +02:00
Daniel Rodriguez
336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop'
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
2022-06-09 07:34:40 +00:00
Daniel Maya
79e7753cc8 #9021 Added offspring check 2022-05-30 11:29:17 +02:00
Daniel Barbero Martin
d0a04177c0 add treshold pdf pandora_enterprise#1419 2022-05-18 17:17:31 +02:00
Calvo
e685cf7294 Api create agent meta support 2022-05-04 18:42:56 +02:00
José González
2ae66f7eb3 Fix x20; chars in alias when create agents with alias with spaces in API 2022-04-06 17:11:10 +02:00
Daniel Rodriguez
bcb4efe397 Merge branch 'ent-avoid-warnigs-with-php74' into 'develop'
Fixed some codes to avoid warnings with some php74 environment.

See merge request artica/pandorafms!4795
2022-04-05 15:17:47 +00:00
Junichi Satoh
e0d50facf0 Fixed some codes to avoid warnings with some php74 environment. 2022-04-04 16:31:22 +09:00
Daniel Maya
55e847a5c9 #8541 Added file customer_key 2022-03-31 16:52:50 +02:00
Daniel Rodriguez
64947b75cd Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop'
change storage format of custom data field in DB

See merge request artica/pandorafms!4766
2022-03-24 16:19:39 +00:00
alejandro.campos@artica.es
5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
alejandro.campos@artica.es
7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09: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
alejandro.campos@artica.es
931477fcd5 implement new netflow item 2022-02-21 12:26:48 +01:00
alejandro.campos@artica.es
659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
fbsanchez
4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez
83d8b5348f pol group api create agent auto-assign fix 2022-02-08 17:54:14 +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
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