6083 Commits

Author SHA1 Message Date
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
fbsanchez
340c3026c2 Fix capitalization issues in wmi windows env 2020-12-01 12:36:24 +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
artica
e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez
b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez
b1d2e7bba0 Merge branch 'ent-5572-9625-añadir-configuración-periodo-de-silencio-trap-storm-protection' into 'develop'
Ent 5572 9625 añadir configuración periodo de silencio trap storm protection

See merge request artica/pandorafms!3580
2020-11-30 14:26:23 +01:00
fbsanchez
0eab0c3a18 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows 2020-11-30 10:06:04 +01:00
fbsanchez
3f8123e879 Merge remote-tracking branch 'origin/develop' into ent-6787-plugin-server-timeout-no-funciona-correctamente 2020-11-30 10:05:19 +01:00
artica
863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica
9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica
66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
fbsanchez
f4c17087c5 minor fixes in pluginserver 2020-11-27 13:54:58 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
artica
935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
artica
f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Daniel Rodriguez
b2fb9898f2 Merge branch 'ent-4868-poner-la-version-de-producto-en-pandora_ha-anda' into 'develop'
Export product VERSION from Tools.pm

See merge request artica/pandorafms!3641
2020-11-25 18:40:07 +01:00
artica
b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
fbsanchez
04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
artica
1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
artica
7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica
b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica
87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
artica
f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
Daniel Rodriguez
1df3c4f595 Merge branch 'ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada' into 'develop'
Avoid host latency "fake" value 0

See merge request artica/pandorafms!3509
2020-11-19 14:51:16 +01:00
artica
e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
Jose Gonzalez
31f23a7994 Fix bug with macro fields 2020-11-18 13:16:04 +01:00
fbsanchez
952de36aab Merge remote-tracking branch 'origin/develop' into ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada 2020-11-18 12:02:17 +01:00
artica
ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
Jose Gonzalez
ef899ef529 Fix error 2020-11-17 15:21:38 +01:00
artica
9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
Daniel Rodriguez
26006fe33b Merge branch 'ent-6493-provisioning-server-autoconfiguracion-de-agentes-no-es-funcional' into 'develop'
Ent 6493 provisioning server autoconfiguracion de agentes no es funcional

See merge request artica/pandorafms!3600
2020-11-16 18:51:08 +01:00
artica
810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica
efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica
26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
artica
6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
artica
834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
artica
33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
fbsanchez
b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
artica
2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica
767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica
4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica
5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
artica
2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00