Commit Graph

728 Commits

Author SHA1 Message Date
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
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Rodriguez 4ba18dc52b Merge branch 'ent-8119-Llamada-a-la-API-nodo-centralizado' into 'develop'
implemented api method

See merge request artica/pandorafms!4659
2022-02-01 09:42:42 +00:00
alejandro.campos@artica.es 4cf312f88e implemented api method 2022-01-27 13:23:12 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc 6edc6c6d40 Merge branch 'ent-8437-SQL-Injection-en-API' into 'develop'
sanitize sql inputs

See merge request artica/pandorafms!4629
2022-01-25 10:30:01 +00:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Daniel Rodriguez c6e2e45260 Merge branch 'ent-8369-10666-GUARDIA-Problemas-cluster-consola' into 'develop'
fixed problems in clusters

See merge request artica/pandorafms!4583
2022-01-13 12:42:50 +00:00
alejandro.campos@artica.es bc8460dedc minor fix 2022-01-13 12:58:19 +01:00
alejandro.campos@artica.es c93a758111 sanitize sql inputs 2022-01-12 14:11:10 +01:00
alejandro.campos@artica.es 8123d9e44b fixed alias filter in get events api method (metaconsole) 2022-01-11 15:26:31 +01:00
fbsanchez 58ba683005 Super 8 2022-01-10 20:52:29 +01:00
alejandro.campos@artica.es 9390a25367 minor fix 2022-01-05 18:02:28 +01:00
alejandro.campos@artica.es c360a3a06c fixed get event api call 2021-12-15 15:22:40 +01:00
alejandro.campos@artica.es 847e50383a fixed problems in clusters 2021-12-14 12:07:22 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
fbsanchez d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +02:00
Daniel Rodriguez c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop'
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
2021-09-22 09:08:34 +00:00
Calvo 698ddd47df Fix api get group by id bug with or withouth url encode separator 2021-09-17 13:51:47 +02:00
Calvo 796f083730 Fix api get group by id bug 2021-09-17 11:52:30 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
fbsanchez d492b055da Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-11 09:25:26 +02:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
fbsanchez bba7123793 Merge branch 'ent-7074-Command-Center' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-14 10:05:59 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
fbsanchez ae562e5a7c Use node db directly to handle policy_agents 2021-07-08 21:06:38 +02:00
Junichi Satoh b74beb76df Fixed that plugin module related APIs did not work properly in some cases. 2021-07-06 14:40:40 +09:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
Daniel Barbero Martin f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
Daniel Barbero Martin b4e1c9d61f Wip command center, api call node 2021-06-10 14:15:36 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Maya 7eaaa1f371 Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas 2021-05-25 13:40:33 +00:00
Daniel Barbero Martin 73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop'
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
2021-05-19 16:02:34 +00:00
Daniel Barbero Martin 8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +02:00
José González 91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
José González 46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop'
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
2021-05-13 11:14:44 +00:00
Luis 61dc2e833b Ent 5680 llamada api set update agent field 2021-05-10 09:49:43 +00:00
Daniel Rodriguez 12ccb680d6 Merge branch 'ent-7099-11462-Crear-grupo-de-agentes-con-contraseña-mediante-la-API' into 'develop'
Added new field in api call

See merge request artica/pandorafms!4040
2021-05-10 09:14:25 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez 1e0eabdbf7 Merge branch 'ent-7114-no-se-puede-realizar-llamada-api-add-user-profile-modo-all' into 'develop'
Fixed api add user profile with group all

See merge request artica/pandorafms!3974
2021-05-06 12:19:23 +00:00
Daniel Rodriguez f33384931e Merge branch 'ent-7108-API-get-all-agents-no-filtra-por-alias' into 'develop'
Ent 7108 api get all agents no filtra por alias

See merge request artica/pandorafms!3944
2021-05-06 12:07:49 +00:00
Calvo 371f87bcdf Fixed bug on api call create_agent 2021-04-21 15:47:56 +02:00
alejandro.campos@artica.es c3313848bd Added new field in api call 2021-04-20 11:36:26 +02:00
Jose Gonzalez 494666244d Fixed stupid bug 2021-04-16 09:10:38 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +02:00
Jose Gonzalez 141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
Daniel Rodriguez 517d7378d4 Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop'
Addded param to escape API url call raw_decode

See merge request artica/pandorafms!3914
2021-04-07 10:54:47 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop'
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
Daniel Rodriguez 7a0139accd Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop'
API get license, get license_remaining

See merge request artica/pandorafms!3814
2021-04-06 17:18:24 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'
fixed errors sound events

See merge request artica/pandorafms!3916
2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Jose Gonzalez a8e3c10846 Added comments header and improve code 2021-03-30 16:31:45 +02:00
Calvo bc7584f259 Fixed api add user profile with group all 2021-03-29 10:51:02 +02:00
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