tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-26 04:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

772 Commits

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