e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
8ce3aa0b93
Se añade el valor a assigned by con el usuario de configuracion global
...
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
2019-04-24 13:31:43 +02:00
e7995b988e
Se arregla nombre de la funcion insert
...
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
062a68fdaf
Ultimas modificaciones
...
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
8987a60755
restauro functions api
...
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
014aaffc0d
Se normaliza codigo
...
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
732b3e83d4
Se añaden las modificaciones
...
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
ad4dfc7624
Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
...
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
51541c8d2c
Atucalizacion de rama
...
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
5de38e204f
Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
...
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
5c2ebf0976
Camprobaciones en local para functiones
...
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
bda67d56c4
Update functions_api.php
...
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
c8af83b112
Update with validations and type return data functions_api.php
...
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
3dafe2d66d
changed querys and refactor methods
...
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +02:00
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
1e7fb2f375
concatenation
...
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
2019-04-12 11:37:12 +02:00
2ec72c4d78
Changed query
...
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
2019-04-12 11:10:42 +02:00
0afc699b2b
Add concatenation to user variable in filter user group function
...
Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619
2019-04-11 10:15:00 +02:00
c313629080
Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
...
flip flop keep counters
See merge request artica/pandorafms!2308
Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
351b7218ee
Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
...
Removed unnecesary io_safe_inpunt on from functions_api.php
See merge request artica/pandorafms!2256
Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
33db6d2f0c
If is metaconsole, param meta is setted to true
...
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
2019-04-04 18:13:29 +02:00
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +02:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
1f02159a43
Commit para revisar progreso
...
Former-commit-id: f51d1e10ad320772c77d41aa2da3a1e4eded146a
2019-03-26 12:06:54 +01:00
ce49a45d2a
Commit para revisar progreso
...
Former-commit-id: e1e07ad590624f958e0e8cc31b18d6f936df485e
2019-03-26 11:03:36 +01:00
e163c27b43
Commit para revisar progreso
...
Former-commit-id: 498b7c6a44a18c075c431853d8bf6875e92945f9
2019-03-25 17:59:12 +01:00
3b4cea9962
Fixed wrong array index for id_group
...
Former-commit-id: d902ec0901657035519912262ab55e5c1e6858e4
2019-03-25 12:21:31 +01:00
45b0392d8d
Removed unnecesary io_safe_inpunt on from functions_api.php
...
Former-commit-id: 3120967c09d6629f0c1a1197d122a7e11788fbb7
2019-03-12 15:12:43 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
582b8a70da
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
196de9ae3d
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
...
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
2019-02-15 13:54:28 +01:00
99c0da3a06
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
2019-02-11 11:11:56 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
48eea4ab87
Added centralized error code to API
...
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
5d8360860d
fixed error include in API not necessary
...
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +01:00
0f29d6461e
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
bd48c96de4
Fixed duplicated function module group synch in API
...
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
2019-01-21 15:03:02 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
1dbbc820ad
Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf
2019-01-21 11:31:36 +01:00
f8ac525281
Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop'
...
implemented api functions to create/update/delete/list event filters
See merge request artica/pandorafms!2093
Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611
2019-01-21 10:31:17 +01:00
344589494a
Fixed minor error
...
Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457
2019-01-18 17:33:29 +01:00
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
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
e316977d4b
Refactorize and add two new fields to api_get_groups api function
...
Former-commit-id: 2d59091279c284d549c09744ee61c8fee1e33564
2019-01-16 12:23:19 +01:00
aabcf73210
Fixed bug in functions_api
...
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
2019-01-15 16:33:52 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
1865cc954c
Revert "Merge branch…"
...
This reverts merge request !1899
Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
2019-01-11 12:12:51 +01:00
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
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
ccb4778217
implemented api functions to create/update/delete/list event filters
...
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
2018-12-17 18:18:17 +01:00
a9d3d81757
Fixed api function
...
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
2018-12-17 17:56:01 +01:00
58289e73bc
Added new functionality for CLI to delete policy agents.
...
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
632d67095b
List alert actions in nodes with CLI and API
...
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +01:00
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
484d79d974
Fixed synch error
...
Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688
2018-12-10 16:06:25 +01:00
3a80a0467b
synchronize group of modules from the meta console
...
Former-commit-id: 172cd23a0f0f2fa12ad4d37893cae6d22951ee54
2018-12-10 15:55:09 +01:00
2bde6ac6ce
Create module group API
...
Former-commit-id: a2da223ae925935bcc449ee151597fd035b453e2
2018-12-07 15:36:13 +01:00
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
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
517cb85547
Added new features in CLI to create and view alert commands
2018-12-03 17:38:57 +01:00
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
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
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
dc7176585e
new API get_all_alerts_command
2018-11-29 16:57:17 +01:00
f0ff20fda1
Add commands alert
2018-11-28 21:38:02 +01:00
b2ed4a9d2c
standby software agent while disabling
2018-11-16 14:26:11 +01:00
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
a80c7e493e
Added check for the creation of planned downtimes by pandora manage
2018-11-06 16:42:03 +01:00
8fe82add30
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options
2018-10-30 17:53:57 +01:00
c7a624000e
Added API function set delete_user_profile_info
2018-10-29 13:34:30 +01:00
bf7cdcc7ff
Added API function set update_user_profile_info
2018-10-29 12:45:03 +01:00
4f02d72630
Added API function set create_user_profile_info
2018-10-29 12:22:08 +01:00
c211433321
Added API function get user_profiles_info
2018-10-29 11:02:43 +01:00
7634a41e04
Api meta functions new,update,delete,get users - #2523
2018-10-25 20:01:04 +02:00
2849d62faa
Add generic API functions set access control and traps functions - #2978
2018-10-25 19:48:23 +02:00
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
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
f831e59ac3
Added documentation and minor fixes related with API event responses functions
2018-10-25 15:42:45 +02:00
8cc68185d9
Added set delete_event_response to API
2018-10-25 15:34:02 +02:00
1bd492307a
Added set update_event_response to API
2018-10-25 15:25:27 +02:00
6b93cba119
Added set create_event_response to API
2018-10-25 15:03:07 +02:00
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
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
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
c0afbf0b6f
Added get event_responses to API
2018-10-25 11:49:39 +02:00
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
aaa2c6aa10
fixed bug: calling api method create event not inserting agent name
2018-10-22 10:31:10 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
7a44f9dcdd
Minor fix in cde cluster api methods
2018-10-17 13:26:41 +02:00
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
3d6451d64b
Fix returnData - #2881
2018-10-09 20:03:49 +02:00
2083733329
Fix id for agent status - #2881
2018-10-09 16:33:07 +02:00
f7700874a5
api function api_get_all_agents for meta - #2881
2018-10-08 16:45:44 +02:00
112b4e3097
Add get_group_id_by_name and get_timezone to api functions - #2756
2018-10-05 17:01:11 +02:00
c0dd2bcab6
Add status data to get_all_agents API response - #2881
2018-10-05 12:57:25 +02:00
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
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
9977f1ddf9
Added code for function api_get_agent_alias for the API of the metaconsole - #2708
2018-10-01 09:51:58 +02:00
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
22b46e41f1
Added standby mode on disabled token of API function set update_agent
2018-09-25 15:59:33 +02:00
cc5104024d
Fixed problems in scheduled downtime CLI
2018-09-25 13:33:10 +02:00
d0e7b86112
Fixed bug in deleted policies from the metaconsole
2018-09-18 09:41:05 +02:00
f4551faff0
Add intracom generic functions - #2541
2018-09-03 18:02:18 +02:00
87296eb472
added methods to api (metaconsole and node) to create and update operating systems
2018-08-01 14:35:05 +02:00
9236285a98
remove functions api to api enterprise because policies is enterprise
2018-07-23 17:04:07 +02:00
f1938a0fdb
Agent filtering by alias
2018-07-23 11:52:17 +02:00
f05ba656e1
add functions api for policies node
2018-07-23 08:59:08 +02:00
223d13edd5
Change the policy agents to work on serialized way
2018-07-18 14:50:09 +02:00
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
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
b186c82a7b
Fixed json in functions_api
2018-07-04 15:57:08 +02:00
d1eaef6f6d
Fixed filter count in agent detail.
2018-07-03 13:22:23 +02:00
1b1bc4aa2e
add new column evaluate_sla into table tservice
2018-06-28 13:34:55 +02:00
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
92fbc86ed9
add cascade protection in services
2018-06-22 14:59:17 +02:00
1ccd7d1fd7
Modified set create_snmp_module to permit create remote_snmp_proc modules
2018-06-20 17:07:13 +02:00
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
d0796a3e09
Minor fixes in api responses
2018-06-20 12:58:46 +02:00
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
1f06a15d7c
Fixed get_cluster_status
2018-06-20 12:20:34 +02:00
b75ee89397
Fixed some acl issues in cluster api methods
2018-06-20 11:49:15 +02:00
85f84f4211
[API ACL] Fixed meta create_event
2018-06-20 11:46:57 +02:00
56042f596d
[ACL API] Fixed groups in event validations
2018-06-19 19:53:54 +02:00
0d2ee35e0f
[API ACL] Fixed the rest of reopened node API ACL fails
2018-06-19 17:05:23 +02:00
2fc6b86251
[ACL API] Undo refix
2018-06-19 16:14:25 +02:00
c11a8b3d2e
Merge branch 'develop' into 2290-seguridad-en-la-api-3
2018-06-19 13:38:13 +02:00
a5112929fd
[API ACL] Fixed get agent_module_last_value (and related) and get policies
2018-06-19 13:37:37 +02:00
e0fa002cd2
Modified functions api
2018-06-18 21:11:53 +02:00
d3c0b0473f
Fixed module functions ACL check
2018-06-14 16:04:50 +02:00
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
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
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
2150f58ec0
[API ACL] Metaconsole functions
2018-06-11 18:39:19 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
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
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
e3fbef309b
[API ACL] Added ACL to set functions
2018-06-11 15:39:58 +02:00
eda5898031
[API ACL] More setters
2018-06-08 15:20:15 +02:00
9bf6102ac6
[ACL API] Added ACL in some set functions
2018-06-07 19:45:54 +02:00
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
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
b3bdd5d492
[API ACL] More get functions (2)
2018-06-06 19:39:57 +02:00
7f2d583f63
[API ACL] More get functions
2018-06-06 19:04:06 +02:00
867e00c50d
fixed minor error
2018-06-06 18:00:44 +02:00
ea6f96e96b
fixed minor error api
2018-06-06 17:53:52 +02:00
d7da009804
fixed errors in graphs
2018-06-06 17:23:32 +02:00
0afd436cea
[ACL API] Added ACL to some get api calls and refactorized agent count
2018-06-06 15:04:30 +02:00
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
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
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
a8b8f309e6
fixed graphs
2018-05-30 17:45:17 +02:00
dbafab2ae7
Add cluster and API get functions - #2294
2018-05-23 19:13:47 +02:00
a82299f1cf
PluginTools minor changes
...
API cluster minor changes
2018-05-21 18:08:36 +02:00
2ab45d28b8
Added api_get_agent_id (API) updated plugintools
2018-05-21 14:42:27 +02:00
8a1f5c87ec
[Rebranding] Open API
2018-05-10 18:56:59 +02:00
d92dc1a2b0
Change API and flags in cluster manager - #2007
2018-04-27 11:06:29 +02:00
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
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
9bb7ba475e
Fix api collection function include - #2110
2018-03-26 18:34:52 +02:00
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
d21ca7eb5f
Add API cluster functions - #2007
2018-03-21 18:20:59 +01:00
c8118c2e08
fixed minor error
2018-03-12 19:31:24 +01:00
1f3b95f6d1
check problems migration
2018-03-08 12:09:03 +01:00
3ee2f8615f
API and CLI apply template components - #983
2018-02-26 19:10:53 +01:00
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
c2a467064e
Added string graph in mail
2018-01-12 13:17:57 +01:00
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
e4cc09e09c
Add new function enable alert by alias - #1688
2017-12-13 13:57:38 +01:00
2f9f2ddf90
Metaconsole synchronization for api - #979
2017-11-13 16:37:08 +01:00
5a2a97e94c
Fixed function api_set_disable_alert
2017-10-27 12:25:00 +02:00
8a7b0a0f79
fixed errors in new macro graph treshold
2017-09-08 13:55:03 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
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
6e45b3cd9e
add threshold graph send for mail
2017-08-02 11:48:37 +02:00
dd5cb8088c
added service functions in the API
2017-08-01 10:39:02 +02:00
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
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
bec023dc4d
Fixed meta event table in cli and api functions
2017-07-18 11:36:57 +02:00
9b1338b4c2
fixed autovalidate event in pandora_revent with extra_id
2017-06-27 10:51:35 +02:00
d3a0c4b52b
fixed errors in pandora revent
2017-06-21 14:34:06 +02:00
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
d85ec51220
fixed errors caase sensitive servername
2017-06-13 12:42:21 +02:00
463c393c00
Added changes to encrypt custom values with a new token
2017-05-29 11:48:50 +02:00
e5c0440d0b
fixed errors in mail module_graph
2017-03-09 08:58:53 +01:00
d1302731b6
Added alias when creating and modifying agent
2017-03-07 15:36:04 +01:00
4b8ec8e5ae
Added alias in api
2017-03-07 10:31:23 +01:00
0b943fcf08
Remove debug traces
2017-03-03 13:27:02 +01:00
ec515db179
Fixed get module_data to get url_encode_separator
2017-03-01 15:30:40 +01:00
938dc40f77
Fixed api get module data. Ticket #385
2017-02-27 14:58:40 +01:00
fc7e2f69b7
Fixed exception in datetime object. Functions api get_module_data. Ticket #378
2017-02-27 11:05:23 +01:00
cb7ab827d2
Fixed module type chart selected in conf. Ticket #345
2017-02-21 16:36:46 +01:00
3c8bc86ab7
Added cascade protection by module (agent, massive and api). Ticket #187
2017-01-25 13:59:14 +01:00
196da4098e
Added new options to api module data function. Ticket #4283
2016-12-22 15:58:45 +01:00
d9b60534b6
added function db_uncompress_module_data
2016-11-30 16:01:22 +01:00
653da41402
Ticket integria:3621 fixed image in mail #75
2016-09-19 16:43:46 +02:00
0cc2ffa928
Added new API 'delete_group'.
2016-09-02 12:55:16 +09:00
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
b63567bf3b
Modified error messages and warnings. Ticket #3206 .
2016-08-24 15:32:29 +02:00
3a7e5fcf2f
Added the handling of agent's address list at new_agent/update_agent API call.
2016-07-21 17:15:22 +09:00
9abcfbf1b3
Fixed that API couldn't create snmp module with module group id > 17.
2016-06-30 17:39:00 +09:00
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
5c713e15f7
New feature domain names. Ticket #3130 .
2016-06-21 16:15:57 +02:00
0035b74f47
new macro in CLI and API get_module_id. Ticket #3525 .
2016-06-17 08:50:30 +02:00
0696bccdcd
policy_linked in set_update_*_module added. Ticket #3292 .
2016-06-15 10:15:14 +02:00
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
2ff36cc245
Add lost variable in funtion
2016-02-09 10:22:40 +01:00
3315b732f8
Fixed problems with create syntethic module with API.
2016-02-09 10:20:42 +01:00
c817d96937
Cleaned source code.
2016-01-27 15:58:54 +01:00
fe8300655d
Cleaned source code.
2016-01-27 13:08:11 +01:00
7eab842adc
Blocks nonexistent id_agent when updating modules with api #3191
2016-01-13 18:22:30 +01:00
1e9f086cae
Fixes for the management groups in the API. TICKET: #3119
...
(cherry picked from commit f9ee9a7032
2016-01-05 12:17:46 +01:00
fea29a84a0
Add new function of locate agent in servers. Tiquet: #3119
...
(cherry picked from commit 4c6451372b
2015-12-30 13:43:15 +01:00
e91dc72885
add new function to use in metaconsole
...
(cherry picked from commit a93ca7ec0e
2015-12-30 13:17:52 +01:00
d916ed55ea
Add CLI/API new function of create modules synthetic. Tiquet: #3034
...
(cherry picked from commit c0563a54ed
2015-12-21 15:42:45 +01:00
2c1fd62374
had planned_downtimes_created API accept date with time for date_from/to params.
2015-12-16 19:37:32 +09:00
89fcaec748
Fixed functions of cli/pai of planned downtime. Tiquet: #3020
2015-12-03 11:54:08 +01:00
4ef2b08f09
Change form of send dates in planned downtimes
2015-12-02 17:08:42 +01:00
4fd6a2a47b
Add new functions in API calls about planned downtimes. Tiquet: #3020
2015-12-01 17:15:29 +01:00
6bc0928c32
Added {critical,warning}_inverse to return values of get_tree_agents and get_module_properties APIs.
2015-12-01 16:06:31 +09:00
157abf68d2
Added new params {critical,warning}_inverse to set {create,update}_{network,plugin,data}_module APIs.
2015-12-01 15:52:09 +09:00
587f4c98c9
Fixed to allow empty descripcion/module_macros at create/update plugin/data/network modules APIs.
2015-12-01 15:25:43 +09:00
c4af25cf34
Add to API/CLI new function: Create planned downtimes and items to this planned. Fixed error in creation items. Tiquet: #2972
2015-11-23 09:21:35 +01:00
add2e74e2b
Added new function in functions_api to set cache agent value.
2015-08-28 15:57:53 +02:00
3498e9e1e7
Killing some unicorns and magic numbers.
2015-06-29 16:49:48 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
7574f6ed09
Clean the source code style.
2015-06-08 13:13:09 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
c95f70dde7
Error fixes related with the improved oracle compatibility
2015-05-04 18:27:23 +02:00
2798b2230a
Fixed. Added lost result message in the api call create tag
2015-03-10 12:35:31 +01:00
e32e563447
Minor changes on the module_graph function
2015-02-06 14:09:57 +01:00
d3151557f7
Now the api can return a string with a module graph encoded in base64
2015-02-06 13:48:59 +01:00
1fe60927b0
Added new APIs: get_module_properties and get_module_properties_by_name.
...
These functions share the field name tables with get_tree_agents.
2015-02-05 14:44:23 +09:00
0956132e39
changed the way of returning the data in the all_agents api function.
2015-01-19 13:24:51 +01:00
95873d9356
Added api for metaconsole. Ticket: #1474
2014-12-15 19:39:05 +01:00
d78461a92c
Working in the improvements. Incident#1574
2014-12-12 15:01:50 +01:00
8633186b0e
Working in the improvements. Incident#1574
2014-12-12 15:00:21 +01:00
303b4f148f
Added feature to set bbcode links in agents description and custom fields. Ticket #1404
2014-12-02 16:38:07 +01:00
4f3a9c4187
Added new API (delete_module_template_by_names).
2014-11-05 17:35:08 +09:00
89a5f3dee1
Updated get tree_agents API to get group_description, group_contact and group_other.
2014-10-14 11:42:39 +09:00
723e68a9ed
Updated that add_event API can support newline literally.
2014-10-07 15:23:49 +09:00
marcos.alconada
Daniel Rodriguez
Alejandro Fraguas
Daniel Barbero
Luis Calvo
Alejandro Gallardo Escobar
Tatiana Llorente
alejandro-campos
manuel.montes
samucarc
artica
Fermin
enriquecd
Enrique Camargo
vgilc
fbsanchez
manuel.montes
danielmaya
nramon
slerena
daniel
Arturo Gonzalez
m-lopez-f
Hirofumi Kosaka
mdtrooper
Alejandro Gallardo Escobar