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

339 Commits

Author SHA1 Message Date
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
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
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
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 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