Commit Graph

5408 Commits

Author SHA1 Message Date
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
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
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
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
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica 85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00
artica 223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
artica acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
Daniel Rodriguez a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00