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

89 Commits

Author SHA1 Message Date
alejandro.campos@artica.es d7ad90dabf fixed api call 2023-07-27 12:58:57 +02:00
Daniel Maya 89f55fd24e resolved conflict 2023-07-17 08:28:38 +02:00
Félix Suárez 356a3cc9c3 Modify aditional user/pass on core. 2023-07-12 08:31:52 -06:00
Félix Suárez d17d3bd3eb Use server UID to authorize instead of user/pass. 2023-07-11 14:38:14 -06:00
Diego Muñoz-Reja 6456238d14 Merge branch 'ent-11343-15661-se-pueden-crear-modulos-no-monitorizables-a-traves-de-api' into 'develop' 
Ent 11343 15661 se pueden crear modulos no monitorizables a traves de api

See merge request artica/pandorafms!6092
 2023-07-10 14:23:32 +00:00
miguel angel rasteu c91a25d9cb #11343 Fix api created modules 2023-06-13 12:53:06 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Calvo c608ef6fcf Api auth bearer token 2022-12-30 15:55:46 +01:00
Calvo c14842a4f9 WIP:Api auth with bearer token 2022-12-29 17:20:34 +01:00
José González ded27ce411 Backend changes 2022-06-28 17:24:22 +02:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 52ba314612 Fixed API access 2021-09-08 14:28:48 +02:00
fbsanchez 98e9f8344f Avoid certain cirumstances while retrieving parameters API 2021-07-08 21:08:13 +02:00
Daniel Barbero Martin f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
fbsanchez 4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +02:00
fbsanchez 86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
fbsanchez f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
Daniel Barbero Martin b4e1c9d61f Wip command center, api call node 2021-06-10 14:15:36 +02:00
fbsanchez 5b9098b7b0 Allow API access to nodes registered into the MC 2021-06-09 19:23:17 +02:00
Daniel Barbero Martin 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +02:00
Daniel Rodriguez 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
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
Daniel Rodriguez 68a8c37545 Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' 
Fixed session close on api

See merge request artica/pandorafms!3749
 2021-04-06 17:18:53 +00:00
Daniel Barbero Martin 9364428346 WIP command center 2021-03-31 15:50:41 +02:00
Calvo 8ed48776ee Addded param to escape API url call raw_decode 2021-03-16 11:03:15 +01:00
fbsanchez 28445e3dec API get license, get license_remaining 2021-02-02 15:45:47 +01:00
Luis Calvo 4fe9bdb9a5 Fixed session close on api 2020-12-30 18:39:56 +01:00
José González 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
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin 68ac02db70 fix api function show graph 2020-11-20 13:01:47 +01:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
Jose Gonzalez 1fd19802ac Added api function for update events 2020-06-12 14:11:41 +02:00
fbsanchez 9edb77d288 proper logout (api) 2019-10-22 20:48:45 +02:00
fbsanchez ccfd944ad7 Fix and control API sessions 
Conflicts:
	pandora_console/include/lib/User.php

	modified:   pandora_console/include/api.php
	modified:   pandora_console/include/chart_generator.php
	new file:   pandora_console/include/lib/User.php
	modified:   pandora_console/include/load_session.php
	modified:   pandora_console/include/web2image.js
 2019-10-22 17:33:50 +02:00
marcos.alconada 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
marcos.alconada 062a68fdaf Ultimas modificaciones 
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
 2019-04-24 12:01:04 +02:00
marcos.alconada 58d2abbdae restauro api 
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
 2019-04-23 15:37:54 +02:00
marcos.alconada 6f709cbae3 Retoque en api php 
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
 2019-04-17 17:28:48 +02:00
marcos.alconada 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
marcos.alconada 51541c8d2c Atucalizacion de rama 
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
 2019-04-17 15:06:25 +02:00
marcos.alconada 985726d5a2 modificaciones en api.php 
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
 2019-04-17 12:44:23 +02:00
marcos.alconada 985fc952e1 actualizacion 
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
 2019-04-16 16:10:25 +02:00
marcos.alconada 31aa5b6d67 Comprobaciones en local 
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
 2019-04-16 16:06:17 +02:00
marcos.alconada 83934100ef change api 
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
 2019-04-16 09:24:11 +02:00
marcos.alconada 86ff1accbd Sintax problems resolved on Api.php 
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
 2019-04-15 17:18:16 +02:00