91d11bd4cf
Controlled pandora_revent with id_agent 0
2021-05-18 16:37:05 +02:00
46e0cbca70
id_agent control for pandora_revent
2021-05-18 14:52:23 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
3a76d6e680
Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop'
...
Added comments header and improve code
Closes pandora_enterprise#7156
See merge request artica/pandorafms!3986
2021-05-13 11:14:44 +00:00
61dc2e833b
Ent 5680 llamada api set update agent field
2021-05-10 09:49:43 +00:00
12ccb680d6
Merge branch 'ent-7099-11462-Crear-grupo-de-agentes-con-contraseña-mediante-la-API' into 'develop'
...
Added new field in api call
See merge request artica/pandorafms!4040
2021-05-10 09:14:25 +00:00
6faefa4afa
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
...
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
1e0eabdbf7
Merge branch 'ent-7114-no-se-puede-realizar-llamada-api-add-user-profile-modo-all' into 'develop'
...
Fixed api add user profile with group all
See merge request artica/pandorafms!3974
2021-05-06 12:19:23 +00:00
f33384931e
Merge branch 'ent-7108-API-get-all-agents-no-filtra-por-alias' into 'develop'
...
Ent 7108 api get all agents no filtra por alias
See merge request artica/pandorafms!3944
2021-05-06 12:07:49 +00:00
371f87bcdf
Fixed bug on api call create_agent
2021-04-21 15:47:56 +02:00
c3313848bd
Added new field in api call
2021-04-20 11:36:26 +02:00
494666244d
Fixed stupid bug
2021-04-16 09:10:38 +02:00
0e12402469
Fixed message issue
2021-04-15 21:20:59 +02:00
3b4927e9b0
Fixed missed params to update max_agents
2021-04-12 13:20:21 +02:00
141daec1ab
Missed value for add
2021-04-12 10:42:13 +02:00
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
517d7378d4
Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop'
...
Addded param to escape API url call raw_decode
See merge request artica/pandorafms!3914
2021-04-07 10:54:47 +00:00
3ae93da065
Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop'
...
Ent 4475 validar alertas api cli
See merge request artica/pandorafms!3820
2021-04-06 17:21:56 +00:00
6dac9039d4
Ent 4475 validar alertas api cli
2021-04-06 17:21:56 +00:00
7a0139accd
Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop'
...
API get license, get license_remaining
See merge request artica/pandorafms!3814
2021-04-06 17:18:24 +00:00
e54e06b6ac
Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'
...
fixed errors sound events
See merge request artica/pandorafms!3916
2021-04-06 17:11:37 +00:00
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +00:00
a8e3c10846
Added comments header and improve code
2021-03-30 16:31:45 +02:00
bc7584f259
Fixed api add user profile with group all
2021-03-29 10:51:02 +02:00
ac1c3398fe
Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
2021-03-24 16:05:08 +01:00
131a04a4ce
Fixed api get all agents
2021-03-23 09:55:57 +01:00
085b5ece87
Fixed api agent delete and show correct message when called by meta wizard
2021-03-18 10:01:21 +00:00
8ed48776ee
Addded param to escape API url call raw_decode
2021-03-16 11:03:15 +01:00
6df9870f92
Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
...
Conflicts:
pandora_console/include/functions_api.php
visual_console_client/src/Item.ts
2021-03-11 14:37:06 +01:00
f0dd360786
Fixed merge
2021-03-09 12:56:59 +01:00
84da313641
Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop'
...
Added with option for api_get_module_graph
See merge request artica/pandorafms!3770
2021-03-05 12:53:24 +00:00
cfded31e1b
minor fix
2021-03-05 11:18:47 +01:00
bcde9f940e
b64
2021-03-05 11:17:50 +01:00
ae3d54cedf
B64 included in user options
2021-03-05 11:11:19 +01:00
1534fd9c40
API module graph width
2021-03-05 10:30:14 +01:00
6c2a353812
Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop'
...
Ent 6839 crear llamadas a la api para activar o parar una discovery task
See merge request artica/pandorafms!3798
2021-03-04 10:47:20 +00:00
0ff981e279
Merge branch 'ent-6364-bug-set-stop-downtime-api' into 'develop'
...
Fixed api call set stop_downtime
See merge request artica/pandorafms!3704
2021-03-01 10:46:33 +00:00
9f694e32f7
Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
2021-02-24 09:41:53 +01:00
0469c3c9a8
Pandora sendmail control write all data in socket
2021-02-12 15:30:44 +01:00
5ce8d6dafc
Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'.
2021-02-12 12:21:35 +09:00
9b177272b5
Merge branch 'ent-improve-api-alert-template2' into 'develop'
...
Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'.
See merge request artica/pandorafms!3755
2021-02-09 12:47:39 +01:00
83ac2a134a
Fixed allowing invalid parameters in API 'set update_agent'.
2021-02-05 16:00:06 +09:00
f47eefdeec
Minor fix
2021-02-02 15:55:01 +01:00
28445e3dec
API get license, get license_remaining
2021-02-02 15:45:47 +01:00
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
312a08219c
Added disable/enable for discovery task
2021-01-25 13:56:04 +01:00
012ad2fb55
Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
2021-01-21 10:47:49 +01:00
4311d1caac
Fixed wrong behavior of special_day related APIs.
2021-01-20 18:06:46 +09:00
2bf6db3224
Added last modifies
2021-01-19 16:09:06 +01:00
260b2dbdf7
Community API functions file
2021-01-18 14:57:20 +01:00
e43e9f1239
minor changes
2021-01-18 10:50:56 +01:00
7de277f458
Added some changes
2021-01-14 12:40:57 +01:00
e2dec1b0fa
Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente
2021-01-12 16:58:15 +01:00
b2d1369717
Added with option for api_get_module_graph
2021-01-12 13:50:44 +01:00
818766912f
Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'.
2021-01-05 18:06:21 +09:00
623b729001
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
888d702f6e
Fixed api call set stop_downtime
2020-12-10 09:32:20 +01:00
9d5759e0f3
Merge branch 'ent-6762-10981-10968' into 'develop'
...
fix api function show graph
See merge request artica/pandorafms!3636
2020-12-04 09:44:39 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
a5883da41c
Merge branch 'ent-6396-10757-api-get-module_data-no-obtiene-los-rangos-indicados-no-db-historico' into 'develop'
...
uncompressing data before serving it api_get_module_data -absurd format kept-
See merge request artica/pandorafms!3575
2020-11-26 18:14:55 +01:00
68ac02db70
fix api function show graph
2020-11-20 13:01:47 +01:00
2632256c10
fixed agent creation with unique ip condition
2020-11-11 17:45:21 +01:00
83233b6192
Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
...
groups_get_children and propagate update
See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
e300f2244d
Adding delete_agent control for meta
2020-10-28 17:56:42 +01:00
6d781bc961
uncompressing data before serving it api_get_module_data -absurd format kept-
2020-10-26 18:12:36 +01:00
bfa8d703e7
Fixed api create_event autovalidation on meta
2020-10-22 11:35:07 +02:00
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
a1048301e8
add new acl on delete agent api/cli
2020-10-05 09:02:11 +02:00
4f80eec179
recovered changes after merge request
2020-10-01 13:42:41 +02:00
b07d24ed25
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
...
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
4d9956f4c5
Merge branch 'ent-6327-10666-Llamada-a-la-API-add-cluster-agent-no-funciona' into 'develop'
...
fixed api calls
See merge request artica/pandorafms!3467
2020-09-23 14:08:18 +02:00
a0dad4812e
fixed error messages
2020-09-23 13:10:10 +02:00
86cf99ac81
fixed api call check when cluster id does not exist
2020-09-23 11:31:28 +02:00
57b06be302
fixed api calls
2020-09-18 09:33:10 +02:00
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00
e3e7f3b313
Fixed error message "Invalid argument supplied for foreach()" and "in_array() expects parameter 2 to be array"
2020-09-07 12:58:09 +02:00
195f09a7cf
fixed error on delete agent api
2020-08-21 09:40:24 +02:00
bd3fdeed25
Merge branch 'ent-4158-Bug-al-crear-evento-con-id_server-que-no-existe-desde-la-API-en-meta' into 'develop'
...
Ent 4158 bug al crear evento con id server que no existe desde la api en meta
See merge request artica/pandorafms!3330
2020-07-22 16:29:28 +02:00
10b2fe25ba
fixed error
2020-07-16 10:57:27 +02:00
a6a97d264e
changed event in progress method api refactored
2020-07-15 23:41:25 +02:00
9632b36551
changed event in progress method
2020-07-15 23:36:21 +02:00
26e0703617
Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso
2020-07-14 10:05:18 +02:00
865c2eb208
allowed service create propagate exceptions
2020-07-09 11:35:04 +02:00
0b42d1b61f
smart services API adjustments
2020-07-07 10:19:49 +02:00
ae0ac8dc8c
Merge branch 'ent-5832-10030-Faltan-campos-en-API-Events' into 'develop'
...
fixed bug in get_events_with_user call
See merge request artica/pandorafms!3213
2020-06-25 12:21:27 +02:00
9e449fe1c3
id server check in api event creation #4158
2020-06-24 13:05:40 +02:00
b2084e3a1e
Merge branch 'ent-5978-actualizacion-eventos-mediante-api' into 'develop'
...
Added api function for update events
Closes pandora_enterprise#5978
See merge request artica/pandorafms!3305
2020-06-16 10:23:09 +02:00
e3fa68aef6
Correct event get for metaconsole
2020-06-16 10:03:22 +02:00
370bd8e34f
Stablished correct invalid keys
2020-06-16 09:45:00 +02:00
40569d2092
Added change for metaconsole
2020-06-16 08:55:54 +02:00
1fd19802ac
Added api function for update events
2020-06-12 14:11:41 +02:00
b3a588d283
Merge branch 'ent-5827-llamada-a-la-api-de-crear-agentes' into 'develop'
...
add return error if group = 0 on new agent api
See merge request artica/pandorafms!3212
2020-06-11 11:38:26 +02:00
66e2006b27
fix alert_fired filter
2020-06-10 16:36:39 +02:00
e270776a01
create new api/cli function to set event on progress
2020-06-03 15:56:19 +02:00
7676852bd0
set event in progress on api
2020-06-02 17:26:43 +02:00
4d7341917c
Added cases when critical, warning or normal alert has been fired
2020-05-25 13:10:46 +02:00
ee55c1be85
fixed bug in get_events_with_user call
2020-05-18 12:40:43 +02:00
347f6b1bf3
add return error if group = 0 on new agent api
2020-05-18 10:15:20 +02:00
3db0f557c9
Merge branch 'ent-4852-api-get-the-mc-event-id-from-console-event-id' into 'develop'
...
Ent 4852 api get the mc event id from console event
See merge request artica/pandorafms!3151
2020-05-13 11:24:43 +02:00
d5a7d75169
update function get id_event from meta api
2020-04-13 11:00:11 +02:00
045f115d95
documented api function
2020-04-13 10:54:37 +02:00
db7eaaaf20
created function to get id_event from tmetaconsole_even api
2020-04-13 10:36:23 +02:00
9931b16793
add nombre in api_get_i_name_by_alias API method
2020-04-08 17:01:18 +02:00
9b1d8a52de
Fixed graph height when send email by alert
2020-04-02 14:58:03 +02:00
e0b69bbe3e
Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta
2020-03-20 12:34:58 +01:00
740dcdb35b
Changed id_agent for id_tagent
2020-02-10 17:10:39 +01:00
9a84c8c893
Changed id_agent for id_tagent
2020-02-10 17:05:03 +01:00
19f07b9b9e
Changed id_agent for id_tagent
2020-02-10 17:01:36 +01:00
6dd1ee24e5
Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola
2020-02-10 16:48:38 +01:00
ec98d861b2
Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop'
...
Fixed bug with API access list - #4622
See merge request artica/pandorafms!2724
2020-02-05 10:44:42 +01:00
8695e1aa4b
Restore reverted changes
2019-12-19 17:45:38 +01:00
6ba4a26564
Added timeoout option to command event responses
2019-12-10 11:54:30 +01:00
aadb2ea783
Merge branch 'ent-4427-Funcion-API-validate_event_by_id' into 'develop'
...
Ent 4427 funcion api validate event by
See merge request artica/pandorafms!2639
2019-12-10 11:51:37 +01:00
76d9ca9db5
Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop'
...
Ent 4853 set module data no funciona api
See merge request artica/pandorafms!2841
2019-11-06 17:19:51 +01:00
5a34ec51d2
Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop'
...
Added recursion to api_get_all_agents
See merge request artica/pandorafms!2753
2019-11-06 10:38:17 +01:00
dab4676a33
Resolved merge conflict and fixed bugs
2019-11-05 13:57:13 +01:00
64e80e6fee
Fixed error message
2019-10-29 10:32:59 +01:00
7f01f3d014
Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli
2019-10-29 10:23:46 +01:00
32da1d287b
Fixed API function set_module_data
2019-10-28 15:19:39 +01:00
b16ef248d6
minor fixes in cli and api functions
2019-10-28 09:48:52 +01:00
a4988fe9af
modified get_events functions in functions_api
2019-10-24 13:18:26 +02:00
f2dbcea183
fix indentation
2019-10-21 09:55:39 +02:00
6cf08dde1e
Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
2019-10-21 09:43:43 +02:00
4638915c70
Fixed minor bugs
2019-10-18 12:48:38 +02:00
85dff93f41
Added strict option
2019-10-18 12:22:20 +02:00
3a5bbb22bd
changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument
2019-10-17 11:14:42 +02:00
4a29057a1b
Solved issue with date_from and dato_to missing time data
2019-10-16 16:41:22 +02:00
bf19fbffd3
Added API and cli function get_agents_id_by_alias
2019-10-10 14:25:17 +02:00
948227d7c7
Change defined metaconsole to is_metaconsole function in api - #4771
2019-10-09 09:54:35 +02:00
5fdf65c440
Modified the mode of creation of agents with API
2019-09-26 17:33:51 +02:00
c93c29fd59
Added recursion to api_get_all_agents
2019-09-24 16:37:53 +02:00
515521cd00
Fixed bug with API access list - #4622
2019-09-12 14:13:42 +02:00
2c79d5a61e
Added acl and fixed in meta - #4427
2019-08-07 10:45:49 +02:00
a10945d209
fix bug in api function that removes an agent from a policy
2019-07-04 18:33:12 +02:00
6dea559ab9
fix api return message
2019-06-25 17:06:11 +02:00
005540fef3
Merge remote-tracking branch 'origin/develop' into ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola
2019-06-25 11:46:52 +02:00
7daf4863fe
create api functions to allow removing an agent from a policy based on either agent id or agent name in both metaconsole and console
2019-06-24 18:40:21 +02:00
13e53e5b10
modified api function for adding agent to policy to make it available on meta
2019-06-20 13:05:19 +02:00
701c11a457
Added event in process status validation when same extra id
2019-06-06 14:52:39 +02:00
29529f18cd
API events in process state validation
2019-06-04 17:06:47 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
11a16e4c2a
Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
...
Fixed wrong array index for id_group
See merge request artica/pandorafms!2286
Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
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
José González
Alejandro Campos
Daniel Rodriguez
Luis
Jose Gonzalez
daniel
fbsanchez
Daniel Maya
Junichi Satoh
marcos
Alejandro Fraguas
Tatiana Llorente
vgilc
Alejandro Gallardo Escobar
manuel.montes
samucarc
artica
Fermin
enriquecd