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

503 Commits

Author SHA1 Message Date
marcos.alconada 1f02159a43 Commit para revisar progreso 
Former-commit-id: f51d1e10ad320772c77d41aa2da3a1e4eded146a
 2019-03-26 12:06:54 +01:00
marcos.alconada ce49a45d2a Commit para revisar progreso 
Former-commit-id: e1e07ad590624f958e0e8cc31b18d6f936df485e
 2019-03-26 11:03:36 +01:00
marcos.alconada e163c27b43 Commit para revisar progreso 
Former-commit-id: 498b7c6a44a18c075c431853d8bf6875e92945f9
 2019-03-25 17:59:12 +01:00
Luis Calvo 3b4cea9962 Fixed wrong array index for id_group 
Former-commit-id: d902ec0901657035519912262ab55e5c1e6858e4
 2019-03-25 12:21:31 +01:00
Luis Calvo 45b0392d8d Removed unnecesary io_safe_inpunt on from functions_api.php 
Former-commit-id: 3120967c09d6629f0c1a1197d122a7e11788fbb7
 2019-03-12 15:12:43 +01:00
Alejandro Gallardo Escobar 68afc9289d Documentation improvements 
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
 2019-02-19 14:51:40 +01:00
Tatiana Llorente 582b8a70da Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows 
Conflicts:
	pandora_console/install.php


Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
 2019-02-18 09:22:48 +01:00
alejandro-campos 196de9ae3d Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups 
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
 2019-02-15 13:54:28 +01:00
manuel.montes 99c0da3a06 Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos 
Conflicts:
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php


Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
 2019-02-11 11:11:56 +01:00
samucarc fcb9275d11 Fixed conflict 
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
 2019-02-06 19:09:09 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
Alejandro Fraguas 11456bcfbb Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop' 
Add commands alert

See merge request artica/pandorafms!2025

Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
 2019-01-29 18:26:56 +01:00
samucarc a3c71f4bca Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm 
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
 2019-01-29 11:57:19 +01:00
samucarc cf2b9c5798 Fixed conflicts 
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
 2019-01-28 15:35:37 +01:00
Alejandro Fraguas 042bf1c6e7 Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop' 
List alert actions in nodes with CLI and API

See merge request artica/pandorafms!2085

Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
 2019-01-28 12:56:28 +01:00
daniel 61c9603ae8 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
 2019-01-25 09:55:09 +01:00
Fermin 48eea4ab87 Added centralized error code to API 
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
 2019-01-23 19:21:02 +01:00
daniel 5d8360860d fixed error include in API not necessary 
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
 2019-01-23 17:06:31 +01:00
daniel 0f29d6461e Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
 2019-01-22 08:57:59 +01:00
daniel 2c208b5e29 fixed errors php7 mysqli and warning include 
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
 2019-01-22 08:57:48 +01:00
samucarc da7e8e5487 Fixed conflict 
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
 2019-01-21 19:03:32 +01:00
samucarc bd48c96de4 Fixed duplicated function module group synch in API 
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
 2019-01-21 15:03:02 +01:00
samucarc 367c9fc6fc Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API 
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
 2019-01-21 11:41:57 +01:00
samucarc 1dbbc820ad Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API 
Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf
 2019-01-21 11:31:36 +01:00
Alejandro Fraguas f8ac525281 Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop' 
implemented api functions to create/update/delete/list event filters

See merge request artica/pandorafms!2093

Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611
 2019-01-21 10:31:17 +01:00
samucarc 344589494a Fixed minor error 
Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457
 2019-01-18 17:33:29 +01:00
samucarc 0c9446fceb Added new functionality in CLI and API to update module counts and alert counts 
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
 2019-01-18 17:24:32 +01:00
Daniel Rodriguez 92aafb5953 Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop' 
Add traps, and other intracom API functions - #2978

See merge request artica/pandorafms!2119

Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049
 2019-01-17 12:08:03 +01:00
alejandro-campos e316977d4b Refactorize and add two new fields to api_get_groups api function 
Former-commit-id: 2d59091279c284d549c09744ee61c8fee1e33564
 2019-01-16 12:23:19 +01:00
manuel.montes aabcf73210 Fixed bug in functions_api 
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
 2019-01-15 16:33:52 +01:00
enriquecd 5ead23014d Add traps, and other intracom API functions - #2978 
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
 2019-01-11 12:33:22 +01:00
Enrique Camargo 1865cc954c Revert "Merge branch…" 
This reverts merge request !1899

Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
 2019-01-11 12:12:51 +01:00
enriquecd ae9b595edd Merge branch 'develop' into 2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado 
Conflicts:
	pandora_console/include/functions_api.php


Former-commit-id: 5a5debe1ed66000fb8569ec589c84cad8e8dfe63
 2019-01-11 12:04:50 +01:00
samucarc 5ecc9276e0 Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm 
# Conflicts:
#	pandora_console/include/functions_api.php


Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
 2019-01-03 16:25:40 +01:00
alejandro-campos ccb4778217 implemented api functions to create/update/delete/list event filters 
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
 2018-12-17 18:18:17 +01:00
samucarc a9d3d81757 Fixed api function 
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
 2018-12-17 17:56:01 +01:00
samucarc 58289e73bc Added new functionality for CLI to delete policy agents. 
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
 2018-12-17 17:51:30 +01:00
samucarc 632d67095b List alert actions in nodes with CLI and API 
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
 2018-12-14 17:20:46 +01:00
samucarc 7f99a8f9f4 List and synchronize group of modules of the meta console with CLI 
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
 2018-12-11 14:43:27 +01:00
samucarc 484d79d974 Fixed synch error 
Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688
 2018-12-10 16:06:25 +01:00
samucarc 3a80a0467b synchronize group of modules from the meta console 
Former-commit-id: 172cd23a0f0f2fa12ad4d37893cae6d22951ee54
 2018-12-10 15:55:09 +01:00
samucarc 2bde6ac6ce Create module group API 
Former-commit-id: a2da223ae925935bcc449ee151597fd035b453e2
 2018-12-07 15:36:13 +01:00
vgilc 1526aa6eee Merge branch '2501-Crear-SO-con-la-API-2' into 'develop' 
added success and error messages to api functions api_set_create_os and api_set_update_os

See merge request artica/pandorafms!2043

Former-commit-id: aaa52d060a7e61f1ed3bb3530c5b452db1c0def6
 2018-12-05 08:34:56 +01:00
alejandro-campos 795620f90f added success and error messages to api functions api_set_create_os and api_set_update_os 2018-12-04 15:55:39 +01:00
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +01:00
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