763 Commits

Author SHA1 Message Date
Tatiana Llorente
19f07b9b9e Changed id_agent for id_tagent 2020-02-10 17:01:36 +01:00
Tatiana Llorente
6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Alejandro Fraguas
ec98d861b2 Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop'
Fixed bug with API access list - #4622

See merge request artica/pandorafms!2724
2020-02-05 10:44:42 +01:00
marcos
8695e1aa4b Restore reverted changes 2019-12-19 17:45:38 +01:00
Luis
6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
vgilc
aadb2ea783 Merge branch 'ent-4427-Funcion-API-validate_event_by_id' into 'develop'
Ent 4427 funcion api validate event by

See merge request artica/pandorafms!2639
2019-12-10 11:51:37 +01:00
Daniel Rodriguez
76d9ca9db5 Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop'
Ent 4853 set module data no funciona api

See merge request artica/pandorafms!2841
2019-11-06 17:19:51 +01:00
Daniel Rodriguez
5a34ec51d2 Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop'
Added recursion to api_get_all_agents

See merge request artica/pandorafms!2753
2019-11-06 10:38:17 +01:00
Luis Calvo
dab4676a33 Resolved merge conflict and fixed bugs 2019-11-05 13:57:13 +01:00
Luis Calvo
64e80e6fee Fixed error message 2019-10-29 10:32:59 +01:00
Luis Calvo
7f01f3d014 Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli 2019-10-29 10:23:46 +01:00
Tatiana Llorente
32da1d287b Fixed API function set_module_data 2019-10-28 15:19:39 +01:00
alejandro-campos
b16ef248d6 minor fixes in cli and api functions 2019-10-28 09:48:52 +01:00
alejandro-campos
a4988fe9af modified get_events functions in functions_api 2019-10-24 13:18:26 +02:00
alejandro-campos
f2dbcea183 fix indentation 2019-10-21 09:55:39 +02:00
alejandro-campos
6cf08dde1e Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-21 09:43:43 +02:00
Luis Calvo
4638915c70 Fixed minor bugs 2019-10-18 12:48:38 +02:00
Luis Calvo
85dff93f41 Added strict option 2019-10-18 12:22:20 +02:00
alejandro-campos
3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +02:00
Jose Gonzalez
4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Luis Calvo
bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
Tatiana Llorente
948227d7c7 Change defined metaconsole to is_metaconsole function in api - #4771 2019-10-09 09:54:35 +02:00
Jose Gonzalez
5fdf65c440 Modified the mode of creation of agents with API 2019-09-26 17:33:51 +02:00
Luis Calvo
c93c29fd59 Added recursion to api_get_all_agents 2019-09-24 16:37:53 +02:00
Tatiana Llorente
515521cd00 Fixed bug with API access list - #4622 2019-09-12 14:13:42 +02:00
Tatiana Llorente
2c79d5a61e Added acl and fixed in meta - #4427 2019-08-07 10:45:49 +02:00
alejandro-campos
a10945d209 fix bug in api function that removes an agent from a policy 2019-07-04 18:33:12 +02:00
alejandro-campos
6dea559ab9 fix api return message 2019-06-25 17:06:11 +02:00
alejandro-campos
005540fef3 Merge remote-tracking branch 'origin/develop' into ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola 2019-06-25 11:46:52 +02:00
alejandro-campos
7daf4863fe create api functions to allow removing an agent from a policy based on either agent id or agent name in both metaconsole and console 2019-06-24 18:40:21 +02:00
alejandro-campos
13e53e5b10 modified api function for adding agent to policy to make it available on meta 2019-06-20 13:05:19 +02:00
Luis Calvo
701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Luis Calvo
29529f18cd API events in process state validation 2019-06-04 17:06:47 +02:00
marcos.alconada
1ffc6bd028 Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
Alejandro Fraguas
11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
marcos.alconada
e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
marcos.alconada
8ce3aa0b93 Se añade el valor a assigned by con el usuario de configuracion global
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
2019-04-24 13:31:43 +02:00
marcos.alconada
e7995b988e Se arregla nombre de la funcion insert
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
marcos.alconada
062a68fdaf Ultimas modificaciones
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
marcos.alconada
8987a60755 restauro functions api
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
marcos.alconada
014aaffc0d Se normaliza codigo
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
marcos.alconada
732b3e83d4 Se añaden las modificaciones
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
marcos.alconada
ad4dfc7624 Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
marcos.alconada
51541c8d2c Atucalizacion de rama
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
marcos.alconada
5de38e204f Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
marcos.alconada
293b025c7f Se elimina error de sintaxis
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
marcos.alconada
5c2ebf0976 Camprobaciones en local para functiones
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
Marcos Alconada
bda67d56c4 Update functions_api.php
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
Marcos Alconada
c8af83b112 Update with validations and type return data functions_api.php
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
marcos.alconada
3dafe2d66d changed querys and refactor methods
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +02:00