tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 11:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,240 Commits 34 Branches 30 Tags
Commit Graph

365 Commits

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