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

596 Commits

Author SHA1 Message Date
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
Daniel Maya 131a04a4ce Fixed api get all agents 2021-03-23 09:55:57 +01:00
Luis 085b5ece87 Fixed api agent delete and show correct message when called by meta wizard 2021-03-18 10:01:21 +00:00
Calvo 8ed48776ee Addded param to escape API url call raw_decode 2021-03-16 11:03:15 +01:00
fbsanchez 6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
Jose Gonzalez f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
Daniel Rodriguez 84da313641 Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop' 
Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
 2021-03-05 12:53:24 +00:00
fbsanchez cfded31e1b minor fix 2021-03-05 11:18:47 +01:00
fbsanchez bcde9f940e b64 2021-03-05 11:17:50 +01:00
fbsanchez ae3d54cedf B64 included in user options 2021-03-05 11:11:19 +01:00
fbsanchez 1534fd9c40 API module graph width 2021-03-05 10:30:14 +01:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop' 
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
 2021-03-04 10:47:20 +00:00
Daniel Rodriguez 0ff981e279 Merge branch 'ent-6364-bug-set-stop-downtime-api' into 'develop' 
Fixed api call set stop_downtime

See merge request artica/pandorafms!3704
 2021-03-01 10:46:33 +00:00
fbsanchez 9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
 2021-02-24 09:41:53 +01:00
Luis 0469c3c9a8 Pandora sendmail control write all data in socket 2021-02-12 15:30:44 +01:00
Junichi Satoh 5ce8d6dafc Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'. 2021-02-12 12:21:35 +09:00
Daniel Rodriguez 9b177272b5 Merge branch 'ent-improve-api-alert-template2' into 'develop' 
Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'.

See merge request artica/pandorafms!3755
 2021-02-09 12:47:39 +01:00
Junichi Satoh 83ac2a134a Fixed allowing invalid parameters in API 'set update_agent'. 2021-02-05 16:00:06 +09:00
fbsanchez f47eefdeec Minor fix 2021-02-02 15:55:01 +01:00
fbsanchez 28445e3dec API get license, get license_remaining 2021-02-02 15:45:47 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01:00
Daniel Maya 312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
fbsanchez 012ad2fb55 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-01-21 10:47:49 +01:00
Junichi Satoh 4311d1caac Fixed wrong behavior of special_day related APIs. 2021-01-20 18:06:46 +09:00
Jose Gonzalez 2bf6db3224 Added last modifies 2021-01-19 16:09:06 +01:00
Jose Gonzalez 260b2dbdf7 Community API functions file 2021-01-18 14:57:20 +01:00
fbsanchez e43e9f1239 minor changes 2021-01-18 10:50:56 +01:00
Jose Gonzalez 7de277f458 Added some changes 2021-01-14 12:40:57 +01:00
Jose Gonzalez e2dec1b0fa Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-12 16:58:15 +01:00
fbsanchez b2d1369717 Added with option for api_get_module_graph 2021-01-12 13:50:44 +01:00
Junichi Satoh 818766912f Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'. 2021-01-05 18:06:21 +09:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Luis Calvo 888d702f6e Fixed api call set stop_downtime 2020-12-10 09:32:20 +01:00
Daniel Rodriguez 9d5759e0f3 Merge branch 'ent-6762-10981-10968' into 'develop' 
fix api function show graph

See merge request artica/pandorafms!3636
 2020-12-04 09:44:39 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez a5883da41c Merge branch 'ent-6396-10757-api-get-module_data-no-obtiene-los-rangos-indicados-no-db-historico' into 'develop' 
uncompressing data before serving it api_get_module_data -absurd format kept-

See merge request artica/pandorafms!3575
 2020-11-26 18:14:55 +01:00
Daniel Barbero Martin 68ac02db70 fix api function show graph 2020-11-20 13:01:47 +01:00
alejandro-campos 2632256c10 fixed agent creation with unique ip condition 2020-11-11 17:45:21 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
Jose Gonzalez e300f2244d Adding delete_agent control for meta 2020-10-28 17:56:42 +01:00
fbsanchez 6d781bc961 uncompressing data before serving it api_get_module_data -absurd format kept- 2020-10-26 18:12:36 +01:00
Luis Calvo bfa8d703e7 Fixed api create_event autovalidation on meta 2020-10-22 11:35:07 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
marcos a1048301e8 add new acl on delete agent api/cli 2020-10-05 09:02:11 +02:00
fbsanchez 4f80eec179 recovered changes after merge request 2020-10-01 13:42:41 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
 2020-09-30 18:38:27 +02:00
Daniel Rodriguez 4d9956f4c5 Merge branch 'ent-6327-10666-Llamada-a-la-API-add-cluster-agent-no-funciona' into 'develop' 
fixed api calls

See merge request artica/pandorafms!3467
 2020-09-23 14:08:18 +02:00
alejandro-campos a0dad4812e fixed error messages 2020-09-23 13:10:10 +02:00
alejandro-campos 86cf99ac81 fixed api call check when cluster id does not exist 2020-09-23 11:31:28 +02:00
alejandro-campos 57b06be302 fixed api calls 2020-09-18 09:33:10 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
Jose Gonzalez e3e7f3b313 Fixed error message "Invalid argument supplied for foreach()" and "in_array() expects parameter 2 to be array" 2020-09-07 12:58:09 +02:00
marcos 195f09a7cf fixed error on delete agent api 2020-08-21 09:40:24 +02:00
Daniel Rodriguez bd3fdeed25 Merge branch 'ent-4158-Bug-al-crear-evento-con-id_server-que-no-existe-desde-la-API-en-meta' into 'develop' 
Ent 4158 bug al crear evento con id server que no existe desde la api en meta

See merge request artica/pandorafms!3330
 2020-07-22 16:29:28 +02:00
marcos 10b2fe25ba fixed error 2020-07-16 10:57:27 +02:00
marcos a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos 9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
marcos 26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
fbsanchez 0b42d1b61f smart services API adjustments 2020-07-07 10:19:49 +02:00
Daniel Rodriguez ae0ac8dc8c Merge branch 'ent-5832-10030-Faltan-campos-en-API-Events' into 'develop' 
fixed bug in get_events_with_user call

See merge request artica/pandorafms!3213
 2020-06-25 12:21:27 +02:00
Daniel Maya 9e449fe1c3 id server check in api event creation #4158 2020-06-24 13:05:40 +02:00
Alejandro Fraguas b2084e3a1e Merge branch 'ent-5978-actualizacion-eventos-mediante-api' into 'develop' 
Added api function for update events

Closes pandora_enterprise#5978

See merge request artica/pandorafms!3305
 2020-06-16 10:23:09 +02:00
Jose Gonzalez e3fa68aef6 Correct event get for metaconsole 2020-06-16 10:03:22 +02:00
Jose Gonzalez 370bd8e34f Stablished correct invalid keys 2020-06-16 09:45:00 +02:00
Jose Gonzalez 40569d2092 Added change for metaconsole 2020-06-16 08:55:54 +02:00
Jose Gonzalez 1fd19802ac Added api function for update events 2020-06-12 14:11:41 +02:00
Daniel Rodriguez b3a588d283 Merge branch 'ent-5827-llamada-a-la-api-de-crear-agentes' into 'develop' 
add return error if group = 0 on new agent api

See merge request artica/pandorafms!3212
 2020-06-11 11:38:26 +02:00
alejandro-campos 66e2006b27 fix alert_fired filter 2020-06-10 16:36:39 +02:00
marcos e270776a01 create new api/cli function to set event on progress 2020-06-03 15:56:19 +02:00
marcos 7676852bd0 set event in progress on api 2020-06-02 17:26:43 +02:00
alejandro-campos 4d7341917c Added cases when critical, warning or normal alert has been fired 2020-05-25 13:10:46 +02:00
alejandro-campos ee55c1be85 fixed bug in get_events_with_user call 2020-05-18 12:40:43 +02:00
marcos 347f6b1bf3 add return error if group = 0 on new agent api 2020-05-18 10:15:20 +02:00
Alejandro Fraguas 3db0f557c9 Merge branch 'ent-4852-api-get-the-mc-event-id-from-console-event-id' into 'develop' 
Ent 4852 api get the mc event id from console event

See merge request artica/pandorafms!3151
 2020-05-13 11:24:43 +02:00
marcos d5a7d75169 update function get id_event from meta api 2020-04-13 11:00:11 +02:00
marcos 045f115d95 documented api function 2020-04-13 10:54:37 +02:00
marcos db7eaaaf20 created function to get id_event from tmetaconsole_even api 2020-04-13 10:36:23 +02:00
marcos 9931b16793 add nombre in api_get_i_name_by_alias API method 2020-04-08 17:01:18 +02:00
Daniel Maya 9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Tatiana Llorente e0b69bbe3e Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta 2020-03-20 12:34:58 +01:00
Tatiana Llorente 740dcdb35b Changed id_agent for id_tagent 2020-02-10 17:10:39 +01:00
Tatiana Llorente 9a84c8c893 Changed id_agent for id_tagent 2020-02-10 17:05:03 +01:00
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