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

259 Commits

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