Commit Graph

535 Commits

Author SHA1 Message Date
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
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
Daniel Maya 312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +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
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