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

765 Commits

Author SHA1 Message Date
miguel angel rasteu cec9a263fe #11529 Fix base64 decode 2023-06-12 13:55:26 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Matias Didier 2db1eddc11 Merge branch 'ent-10326-bearer-token-permite-conectar-con-pandora1234-por-defecto' into 'develop' 
Ent 10326 bearer token permite conectar con pandora1234 por defecto

See merge request artica/pandorafms!5782
 2023-05-19 07:00:38 +00:00
Jonathan 66e1de90df #10861 change permisions api functions 2023-05-09 17:28:54 +02:00
Jorge Rincon 46ae13b4f9 #10645 Add agent name to nodo 2023-05-04 08:11:15 +02:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Daniel Cebrian d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
alejandro.campos@artica.es 4bb88080ea Keep In process status for new events with same extra id 2023-04-14 08:59:19 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Diego Muñoz-Reja 0f635c8206 Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop' 
Ent 10127 14800 anadir id nodo a llamada api validate events

See merge request artica/pandorafms!5479
 2023-02-27 16:53:01 +00:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Jimmy Olano c15fe41897 Merge branch 'ent-9473-derivado-del-trabajo-q-a-765-api-pfms-get-total_modules-no-devuelve-total-por-grupo-especifico' into 'develop' 
Ent 9473 derivado del trabajo q a 765 api pfms get total modules no devuelve total por grupo especifico

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9473

See merge request artica/pandorafms!5419
 2023-01-31 19:15:34 +00:00
Daniel Cebrian d49f1320f5 #10127 added param 'id_node' in set_validate_events for update from metaconsole 2023-01-31 12:37:55 +01:00
daniel df8cb7f481 fix api call server for module graph pandora_enterprise#10241 2023-01-26 14:17:54 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Jonathan 904b505803 #9473 total_modules all and id 2023-01-16 16:31:13 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Jonathan e311602520 #9440 Change permissions on planned_downtimes_additem to AR 2023-01-04 09:52:47 +01:00
Calvo 38838cd4e0 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-30 15:25:57 +01:00
Rafael Ameijeiras 2ac254961c Merge branch 'ent-9966-acceso-a-nodos-con-usuario-no-admin' into 'develop' 
Added metaconsole_access_node value to new_user API function

See merge request artica/pandorafms!5309
 2022-12-29 20:32:33 +00:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Calvo c14842a4f9 WIP:Api auth with bearer token 2022-12-29 17:20:34 +01:00
Rafael Ameijeiras 9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop' 
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
 2022-12-21 11:49:39 +00:00
Jonathan fa0a38b1a7 #1270 Not delete cascade for cluster modules 2022-12-21 11:54:41 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
Luis 0351886e1b ACL api get tree agents 2022-12-15 12:39:06 +01:00
Luis 7716157b8d Merge remote-tracking branch 'origin/develop' into ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api 2022-12-14 16:25:36 +01:00
Rafael Ameijeiras 44e22d1675 Merge branch 'ent-9498-14180-perfil-de-usuario-sin-grupo-asignado-en-llamada-por-api' into 'develop' 
Check group and profile exist on api add permission user to group

See merge request artica/pandorafms!5223
 2022-12-13 14:22:16 +00:00
Daniel Maya 198f539901 #10000 Fixed api call tree_agents 2022-12-12 16:39:14 +01:00
Rafael Ameijeiras 7ea46174c1 Merge branch 'ent-9496-14178-bug-api-validacion-valores-de-entrada' into 'develop' 
Fix module type validadion on api set create network module

See merge request artica/pandorafms!5224
 2022-12-12 08:14:08 +00:00
Enrique Martin c455059546 Added metaconsole_access_node value to new_user API function 2022-12-01 16:47:44 +01:00
alejandro.campos@artica.es a67e70f04e fixed api get events 2022-11-15 17:32:22 +01:00
Daniel Barbero e003d0d13a fixed get events API pandora_enterprise#9723 2022-11-11 08:55:20 +01:00
Daniel Barbero c16901a5e2 fixed get events API pandora_enterprise#9723 2022-11-10 09:19:32 +01:00
Daniel Barbero 7655c23637 fix api get events pandora_enterprise#9723 2022-11-02 13:40:23 +01:00
Calvo 8a43421b49 Fix module type validadion on api set create network module 2022-10-27 15:18:15 +02:00
Calvo eed8361621 Check group and profile exist on api add permission user to group 2022-10-27 15:03:50 +02:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop' 
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
 2022-10-26 11:02:42 +00:00
Calvo b8c2fe52b5 Added ACL to apì get tree agents plugin user and plugin pass 2022-10-25 15:33:22 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' 
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
 2022-10-24 15:19:21 +00:00
Daniel Rodriguez be7a5add28 Merge branch 'ent-9460-14121-Reducir-permisos-necesarios-para-set-module-data' into 'develop' 
change permissions

See merge request artica/pandorafms!5127
 2022-10-21 09:27:47 +00:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Daniel Rodriguez 3ffc3c2b74 Merge branch 'ent-9434-14108-Añadir-y-eliminar-agentes-a-paradas-planificadas-CLI' into 'develop' 
fixed api methods for creating and deleting scheduled downtimes agents

See merge request artica/pandorafms!5115
 2022-10-17 11:26:38 +00:00
Daniel Maya 3e9e04642d resolved conflict 2022-10-14 09:10:25 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
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