5109 Commits

Author SHA1 Message Date
artica
8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02:00
Daniel Rodriguez
0f5f41e97f Merge branch 'ent-7011-nexcon-se-sigue-generando-el-evento-de-alerta-cesada-aunque-esten-deshabilitados-los-eventos-de-la-alera' into 'develop'
Avoid events while ceasing alerts

See merge request artica/pandorafms!3827
2021-04-06 17:25:21 +00:00
artica
247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
artica
31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica
4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica
95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica
2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica
10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
Jose Gonzalez
14b364baec Fixed issue with execution without correct params 2021-03-31 12:37:02 +02:00
artica
321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
artica
8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
artica
96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
artica
3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica
cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica
e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
artica
c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez
c4b6f709c9 Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop'
Fix issue

Closes pandora_enterprise#6979

See merge request artica/pandorafms!3821
2021-03-25 11:54:45 +00:00
artica
1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
José González
9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2021-03-24 15:50:12 +00:00
Daniel Rodriguez
9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop'
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
2021-03-24 11:57:47 +00:00
fbsanchez
9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
artica
00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
José González
561060cdda Reverted change over mysqldriver 2021-03-23 20:37:28 +00:00
Jose Gonzalez
910154389e Fix 2021-03-23 16:15:57 +01:00
Jose Gonzalez
3cb504397f Solve issues for compilation 2021-03-23 15:15:07 +01:00
José González
6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-23 12:00:45 +00:00
artica
b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Jose Gonzalez
4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Daniel Rodriguez
a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +00:00
artica
49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica
2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica
db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica
3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
Daniel Rodriguez
3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop'
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
2021-03-18 16:02:56 +00:00
Jose Gonzalez
9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
Daniel Rodriguez
9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop'
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
2021-03-18 09:56:31 +00:00
artica
572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
fbsanchez
71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2021-03-17 10:11:58 +01:00
artica
610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00
artica
df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
artica
fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica
0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica
5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
alejandro.campos@artica.es
3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Rodriguez
d0234314a0 Merge branch 'ent-6052-revision-parametros-binario-server' into 'develop'
Solved issue with verbosity parameters

Closes pandora_enterprise#6052

See merge request artica/pandorafms!3790
2021-03-12 09:11:53 +00:00
artica
d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
José González
d79d1a1262 Merge branch 'develop' into 'ent-6052-revision-parametros-binario-server'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-11 08:16:50 +00:00
artica
74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Jose Gonzalez
d86bfa8e7a Updated 2021-03-10 14:00:29 +01:00
Jose Gonzalez
2d4577b23b Cleaned -v and -q options 2021-03-10 13:58:56 +01:00