7184 Commits

Author SHA1 Message Date
artica
732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica
ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica
b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica
2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez
1f7a68cacc Added group_password to print_agent 2021-01-07 16:37:13 +01:00
fbsanchez
3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +01:00
fbsanchez
6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
artica
1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica
b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez
705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop'
added additional check for token

See merge request artica/pandorafms!3757
2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es
84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez
40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +01:00
artica
93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica
a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica
dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica
740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica
dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica
35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica
de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica
1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica
66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica
7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica
223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica
57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
artica
91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Daniel Rodriguez
b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez
60f43dadb9 Merge branch 'ent-6719-mensaje-error-server-open' into 'develop'
Fix error

Closes pandora_enterprise#6719

See merge request artica/pandorafms!3623
2020-12-23 17:05:38 +01:00
Daniel Rodriguez
1324725263 Merge branch 'ent-6856-Warning-feo-server' into 'develop'
Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
2020-12-23 16:06:24 +01:00
Daniel Rodriguez
ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop'
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
2020-12-23 16:04:53 +01:00
José González
02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
artica
71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
artica
1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
artica
da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica
42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica
37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
fbsanchez
bc3616e6c5 visual console mobile wip 2020-12-18 13:40:00 +01:00
alejandro-campos
f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica
87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
artica
2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica
b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
Jose Gonzalez
430457b30a Deleted logstash references 2020-12-15 13:12:00 +01:00
Rafael
c06940c181 add fping as dependencie for pandora server open rpms 2020-12-15 12:57:48 +01:00
Jose Gonzalez
397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
Jose Gonzalez
13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
artica
fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +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
Luis Calvo
c4eb3dd088 Added log on deleting tgraph_source data in pandora_db 2020-12-14 10:52:12 +01:00
artica
f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica
d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica
37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00