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

458 Commits

Author SHA1 Message Date
enriquecd 15c03217db Merge branch 'develop' into 2756-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-2 
Conflicts:
	pandora_console/include/functions_api.php
 2018-11-30 15:04:27 +01:00
vgilc ce8e33ba29 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop' 
2517 api listar y crear perfiles de usuario en meta 6168 eucomm

See merge request artica/pandorafms!1905
 2018-11-30 12:22:37 +01:00
vgilc b8b43b33d7 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop' 
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm

See merge request artica/pandorafms!1896
 2018-11-30 10:50:59 +01:00
samucarc dc7176585e new API get_all_alerts_command 2018-11-29 16:57:17 +01:00
samucarc f0ff20fda1 Add commands alert 2018-11-28 21:38:02 +01:00
fbsanchez b2ed4a9d2c standby software agent while disabling 2018-11-16 14:26:11 +01:00
vgilc c7a54182a3 Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop' 
Added check for the creation of planned downtimes by pandora manage

See merge request artica/pandorafms!1936
 2018-11-07 08:48:48 +01:00
samucarc a80c7e493e Added check for the creation of planned downtimes by pandora manage 2018-11-06 16:42:03 +01:00
fbsanchez 8fe82add30 ondemand pluginTools, pandora_df inodes, cde functions_api cluster options 2018-10-30 17:53:57 +01:00
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +01:00
fermin831 bf7cdcc7ff Added API function set update_user_profile_info 2018-10-29 12:45:03 +01:00
fermin831 4f02d72630 Added API function set create_user_profile_info 2018-10-29 12:22:08 +01:00
fermin831 c211433321 Added API function get user_profiles_info 2018-10-29 11:02:43 +01:00
enriquecd 7634a41e04 Api meta functions new,update,delete,get users - #2523 2018-10-25 20:01:04 +02:00
enriquecd 2849d62faa Add generic API functions set access control and traps functions - #2978 2018-10-25 19:48:23 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
fermin831 d70969e6e9 Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm 
Conflicts resolved:
	pandora_console/include/functions_api.php
 2018-10-25 15:45:16 +02:00
fermin831 f831e59ac3 Added documentation and minor fixes related with API event responses functions 2018-10-25 15:42:45 +02:00
fermin831 8cc68185d9 Added set delete_event_response to API 2018-10-25 15:34:02 +02:00
fermin831 1bd492307a Added set update_event_response to API 2018-10-25 15:25:27 +02:00
fermin831 6b93cba119 Added set create_event_response to API 2018-10-25 15:03:07 +02:00
vgilc 3c548f1c98 Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop' 
Fixed problems in scheduled downtime CLI

See merge request artica/pandorafms!1806
 2018-10-25 13:03:17 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
vgilc 48395acfaa Merge branch '2730-Fallo-políticas-desde-la-meta' into 'develop' 
Fixed bug in deleted policies from the metaconsole

See merge request artica/pandorafms!1774
 2018-10-25 12:03:24 +02:00
fermin831 c0afbf0b6f Added get event_responses to API 2018-10-25 11:49:39 +02:00
vgilc 5a551da1f8 Merge branch '2759-crear-iso-precargada-enterprise-para-demos' into 'develop' 
Minor fix in cde cluster api methods

See merge request artica/pandorafms!1864
 2018-10-25 10:34:39 +02:00
alejandro-campos aaa2c6aa10 fixed bug: calling api method create event not inserting agent name 2018-10-22 10:31:10 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
fbsanchez 7a44f9dcdd Minor fix in cde cluster api methods 2018-10-17 13:26:41 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
enriquecd 3d6451d64b Fix returnData - #2881 2018-10-09 20:03:49 +02:00
enriquecd 2083733329 Fix id for agent status - #2881 2018-10-09 16:33:07 +02:00
enriquecd f7700874a5 api function api_get_all_agents for meta - #2881 2018-10-08 16:45:44 +02:00
enriquecd 112b4e3097 Add get_group_id_by_name and get_timezone to api functions - #2756 2018-10-05 17:01:11 +02:00
enriquecd c0dd2bcab6 Add status data to get_all_agents API response - #2881 2018-10-05 12:57:25 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
vgilc d9a8e30229 Merge branch '2138-En-la-API-se-esta-usando-el-nombre-del-agente-para-filtrar-en-lugar-del-alias' into 'develop' 
Agent filtering by alias

See merge request artica/pandorafms!1627
 2018-10-01 12:30:09 +02:00
tatiana.llorente@artica.es 9977f1ddf9 Added code for function api_get_agent_alias for the API of the metaconsole - #2708 2018-10-01 09:51:58 +02:00
vgilc 4d2413b39b Merge branch '2501-Crear-SO-con-la-API' into 'develop' 
added methods to api (metaconsole and node) to create and update operating systems

See merge request artica/pandorafms!1654
 2018-09-28 10:26:47 +02:00
fermin831 22b46e41f1 Added standby mode on disabled token of API function set update_agent 2018-09-25 15:59:33 +02:00
samucarc cc5104024d Fixed problems in scheduled downtime CLI 2018-09-25 13:33:10 +02:00
manuel.montes d0e7b86112 Fixed bug in deleted policies from the metaconsole 2018-09-18 09:41:05 +02:00
enriquecd f4551faff0 Add intracom generic functions - #2541 2018-09-03 18:02:18 +02:00
alejandro-campos 87296eb472 added methods to api (metaconsole and node) to create and update operating systems 2018-08-01 14:35:05 +02:00
daniel 9236285a98 remove functions api to api enterprise because policies is enterprise 2018-07-23 17:04:07 +02:00
manuel.montes f1938a0fdb Agent filtering by alias 2018-07-23 11:52:17 +02:00
daniel f05ba656e1 add functions api for policies node 2018-07-23 08:59:08 +02:00
fermin831 223d13edd5 Change the policy agents to work on serialized way 2018-07-18 14:50:09 +02:00
daniel 4c7c248671 Merge remote-tracking branch 'origin/develop' into 2226-Analisis_de_causa_raiz_en_alertas_mediante_los_servicios 2018-07-09 09:44:33 +02:00
vgilc 8d639b031e Merge branch 'ent-2405-recuento-y-paginado-vista-agent-detail' into 'develop' 
Fixed filter count in agent detail.

See merge request artica/pandorafms!1591
 2018-07-06 09:40:15 +02:00
danielmaya b186c82a7b Fixed json in functions_api 2018-07-04 15:57:08 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2018-06-26 13:44:16 +02:00
daniel 92fbc86ed9 add cascade protection in services 2018-06-22 14:59:17 +02:00
fermin831 1ccd7d1fd7 Modified set create_snmp_module to permit create remote_snmp_proc modules 2018-06-20 17:07:13 +02:00
nramon cf38c82653 Merge branch '2294-requisitos-api-cluster' into 'develop' 
Minor fixes in api responses

See merge request artica/pandorafms!1560
 2018-06-20 13:03:11 +02:00
fbsanchez d0796a3e09 Minor fixes in api responses 2018-06-20 12:58:46 +02:00
slerena 5efc2d220e Merge branch '2294-requisitos-api-cluster' into 'develop' 
Fixed some acl issues in cluster api methods

See merge request artica/pandorafms!1557
 2018-06-20 12:33:27 +02:00
fbsanchez 1f06a15d7c Fixed get_cluster_status 2018-06-20 12:20:34 +02:00
fbsanchez b75ee89397 Fixed some acl issues in cluster api methods 2018-06-20 11:49:15 +02:00
fermin831 85f84f4211 [API ACL] Fixed meta create_event 2018-06-20 11:46:57 +02:00
fermin831 56042f596d [ACL API] Fixed groups in event validations 2018-06-19 19:53:54 +02:00
fermin831 0d2ee35e0f [API ACL] Fixed the rest of reopened node API ACL fails 2018-06-19 17:05:23 +02:00
fermin831 2fc6b86251 [ACL API] Undo refix 2018-06-19 16:14:25 +02:00
fermin831 c11a8b3d2e Merge branch 'develop' into 2290-seguridad-en-la-api-3 2018-06-19 13:38:13 +02:00
fermin831 a5112929fd [API ACL] Fixed get agent_module_last_value (and related) and get policies 2018-06-19 13:37:37 +02:00
fbsanchez e0fa002cd2 Modified functions api 2018-06-18 21:11:53 +02:00
fermin831 d3c0b0473f Fixed module functions ACL check 2018-06-14 16:04:50 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
enriquecd fd368aec86 Add mode 1 and empty ip on create agent by API new_cluster, and get cluster items by API - #2294 2018-06-12 12:08:57 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
fermin831 2150f58ec0 [API ACL] Metaconsole functions 2018-06-11 18:39:19 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
fermin831 e3fbef309b [API ACL] Added ACL to set functions 2018-06-11 15:39:58 +02:00
fermin831 eda5898031 [API ACL] More setters 2018-06-08 15:20:15 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
Fermin 054b915846 [ACL API] Fixed get planned_downtimes_items and added ACL to more the rest of get functions 2018-06-07 13:11:40 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
fermin831 b3bdd5d492 [API ACL] More get functions (2) 2018-06-06 19:39:57 +02:00
fermin831 7f2d583f63 [API ACL] More get functions 2018-06-06 19:04:06 +02:00
daniel 867e00c50d fixed minor error 2018-06-06 18:00:44 +02:00
daniel ea6f96e96b fixed minor error api 2018-06-06 17:53:52 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc 900f6ba609 Merge branch '2294-Requisitos-API-cluster-2' into 'develop' 
Add cluster and API get functions - #2294

See merge request artica/pandorafms!1495
 2018-06-04 10:13:28 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
enriquecd dbafab2ae7 Add cluster and API get functions - #2294 2018-05-23 19:13:47 +02:00
fbsanchez a82299f1cf PluginTools minor changes 
API cluster minor changes
 2018-05-21 18:08:36 +02:00
fbsanchez 2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
fermin831 8a1f5c87ec [Rebranding] Open API 2018-05-10 18:56:59 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
enriquecd 676835ddc8 Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-API 
Conflicts:
	pandora_console/include/functions_api.php
 2018-04-20 10:10:33 +02:00
enriquecd 9bb7ba475e Fix api collection function include - #2110 2018-03-26 18:34:52 +02:00
enriquecd dcb33e08b7 Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-03-22 11:11:01 +01:00
enriquecd d21ca7eb5f Add API cluster functions - #2007 2018-03-21 18:20:59 +01:00
daniel c8118c2e08 fixed minor error 2018-03-12 19:31:24 +01:00
daniel 1f3b95f6d1 check problems migration 2018-03-08 12:09:03 +01:00
enriquecd 3ee2f8615f API and CLI apply template components - #983 2018-02-26 19:10:53 +01:00
vgilc 61ce7237c3 Merge branch '1688-Error-en-API-al-habilitar-alertas' into 'develop' 
Add new function enable alert by alias - #1688

See merge request artica/pandorafms!1177
 2018-01-29 13:25:54 +01:00
danielmaya c2a467064e Added string graph in mail 2018-01-12 13:17:57 +01:00
vgilc 6ac8571b2d Merge branch '979-CLI/API-Para-sincronizar-la-metaconsola' into 'develop' 
Metaconsole synchronization for api - #979

See merge request artica/pandorafms!1057
 2017-12-21 11:00:09 +01:00
enriquecd e4cc09e09c Add new function enable alert by alias - #1688 2017-12-13 13:57:38 +01:00
enriquecd 2f9f2ddf90 Metaconsole synchronization for api - #979 2017-11-13 16:37:08 +01:00
Daniel Maya 5a2a97e94c Fixed function api_set_disable_alert 2017-10-27 12:25:00 +02:00
daniel 8a7b0a0f79 fixed errors in new macro graph treshold 2017-09-08 13:55:03 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
vgilc 901a163c84 Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop' 
Fixed meta event table in cli and api functions

See merge request !665
 2017-08-18 12:50:19 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
Daniel Maya dd5cb8088c added service functions in the API 2017-08-01 10:39:02 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Arturo Gonzalez bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36:57 +02:00
daniel 9b1338b4c2 fixed autovalidate event in pandora_revent with extra_id 2017-06-27 10:51:35 +02:00
daniel d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
daniel d85ec51220 fixed errors caase sensitive servername 2017-06-13 12:42:21 +02:00
Arturo Gonzalez 463c393c00 Added changes to encrypt custom values with a new token 2017-05-29 11:48:50 +02:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
Daniel Maya d1302731b6 Added alias when creating and modifying agent 2017-03-07 15:36:04 +01:00
Daniel Maya 4b8ec8e5ae Added alias in api 2017-03-07 10:31:23 +01:00
m-lopez-f 0b943fcf08 Remove debug traces 2017-03-03 13:27:02 +01:00
fermin831 ec515db179 Fixed get module_data to get url_encode_separator 2017-03-01 15:30:40 +01:00
Arturo Gonzalez 938dc40f77 Fixed api get module data. Ticket #385 2017-02-27 14:58:40 +01:00
Arturo Gonzalez fc7e2f69b7 Fixed exception in datetime object. Functions api get_module_data. Ticket #378 2017-02-27 11:05:23 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
Arturo Gonzalez 196da4098e Added new options to api module data function. Ticket #4283 2016-12-22 15:58:45 +01:00
Daniel Maya d9b60534b6 added function db_uncompress_module_data 2016-11-30 16:01:22 +01:00
daniel 653da41402 Ticket integria:3621 fixed image in mail #75 2016-09-19 16:43:46 +02:00
Hirofumi Kosaka 0cc2ffa928 Added new API 'delete_group'. 2016-09-02 12:55:16 +09:00
fbsanchez b644f15d00 Ticket Integria: 3951 Changed workaround to generate api module graphs #31 
(cherry picked from commit 95b162f63a)
 2016-08-25 20:22:11 +02:00
Daniel Maya b63567bf3b Modified error messages and warnings. Ticket #3206. 2016-08-24 15:32:29 +02:00
Hirofumi Kosaka 3a7e5fcf2f Added the handling of agent's address list at new_agent/update_agent API call. 2016-07-21 17:15:22 +09:00
Hirofumi Kosaka 9abcfbf1b3 Fixed that API couldn't create snmp module with module group id > 17. 2016-06-30 17:39:00 +09:00
Ramon Novoa 98420e4c06 Fixed a regexp in functions_api.php. Sometimes img tags are not properly 
closed!

(cherry picked from commit c22ea46899)
 2016-06-27 13:38:37 +02:00
Daniel Maya 5c713e15f7 New feature domain names. Ticket #3130. 2016-06-21 16:15:57 +02:00
Daniel Maya 0035b74f47 new macro in CLI and API get_module_id. Ticket #3525. 2016-06-17 08:50:30 +02:00
Daniel Maya 0696bccdcd policy_linked in set_update_*_module added. Ticket #3292. 2016-06-15 10:15:14 +02:00
Hirofumi Kosaka 1ca151fa03 Fixed get_plugins API that had returned values in wrong order if updated from ver 4.x. 2016-02-18 16:58:01 +09:00
m-lopez-f 2ff36cc245 Add lost variable in funtion 2016-02-09 10:22:40 +01:00
m-lopez-f 3315b732f8 Fixed problems with create syntethic module with API. 2016-02-09 10:20:42 +01:00
mdtrooper c817d96937 Cleaned source code. 2016-01-27 15:58:54 +01:00
mdtrooper fe8300655d Cleaned source code. 2016-01-27 13:08:11 +01:00
fermin831 7eab842adc Blocks nonexistent id_agent when updating modules with api #3191 2016-01-13 18:22:30 +01:00