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

290 Commits

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