Commit Graph

5688 Commits

Author SHA1 Message Date
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
Daniel Maya fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 16c40c3ed4 Merge branch '7027-log-rotate-para-el-log-de-snmpd-de-las-traps' into 'develop'
Add a comment regarding snmp_logfile.

See merge request artica/pandorafms!4122
2021-05-12 15:56:45 +00:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop'
Backup upload

See merge request artica/pandorafms!3936
2021-05-12 13:10:48 +00:00
Daniel Rodriguez 6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop'
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
2021-05-12 12:54:37 +00:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
Ramon Novoa 3cfb07a36f Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:18:30 +02:00
Ramon Novoa 83822395f6 Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:01:52 +02:00
José González 90573feb1b Issue with Perl5 paths 2021-05-12 09:35:35 +02:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
Ramon Novoa 47c73518bd Add a comment regarding snmp_logfile.
There's an entry for pandora_snmptrap.log in
/etc/logrotate.d/pandora_server which should be updated if snmp_logfile
is changed in pandora_server.conf. Ref. pandora_enterprise#7027.
2021-05-11 17:40:15 +02:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2021-05-11 13:11:51 +00:00
Daniel Rodriguez fc4d3b7d23 Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop'
Fixed encoding ampersand on mail alerts

See merge request artica/pandorafms!4035
2021-05-11 09:44:15 +00:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
Ramon Novoa 6939ec4d44 Unify the format of product version messages. 2021-05-10 17:58:17 +02:00
Daniel Rodriguez 847b567f5c Merge branch 'ent-7516-warnings-en-ejecuccion-de-vmware-plugin-pl' into 'develop'
avoid warnings in old perl versions

See merge request artica/pandorafms!4114
2021-05-10 11:06:45 +00:00
Daniel Rodriguez c6068a8544 Merge branch 'ent-7113-warning-ejecucion-erronea-pandora_server' into 'develop'
Fixed issue with execution without correct params

Closes pandora_enterprise#7113

See merge request artica/pandorafms!3989
2021-05-10 08:53:21 +00:00
artica dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica 68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
fbsanchez a5c5a30bde avoid warnings in old perl versions 2021-05-07 14:01:42 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +02:00
Daniel Rodriguez 4951552d1d Merge branch 'ent-7413-filtro-log-agent-alertas-correladas-logs-no-funciona-correctamente' into 'develop'
Fix locating agent while correlating logs

See merge request artica/pandorafms!4074
2021-04-29 12:05:10 +00:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
Daniel Rodriguez 2930306767 Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop'
Improved business logic for cron

See merge request artica/pandorafms!4080
2021-04-28 15:24:47 +00:00
Daniel Rodriguez 9b90039fe2 Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop'
fixed error with meta create vent cli

See merge request artica/pandorafms!4079
2021-04-28 14:19:21 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 24976c4860 Disable timezone offset while setting timestamp from server 2021-04-27 17:58:20 +02:00
Daniel Rodriguez 2787a1f64c Merge branch 'ent-7385-no-se-actualizan-los-hilos-del-servidor-transaccional' into 'develop'
Removed token trasnsactional_threads as manager only runs 1 thread

See merge request artica/pandorafms!4075
2021-04-27 14:25:36 +00:00
fbsanchez 2ef9743d5b Added elastic_query_size 2021-04-27 14:59:59 +02:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop'
fixed count in several views

See merge request artica/pandorafms!4052
2021-04-27 11:47:43 +00:00
Daniel Rodriguez 5aea0d17f0 Merge branch 'ent-7347-no-funciona-envio-de-mails-desde-servidor-con-sendgrid' into 'develop'
Make sure encode_base64 does not break auth strings.

See merge request artica/pandorafms!4059
2021-04-27 11:43:06 +00:00
José González d0c3174d8c Improved business logic for cron 2021-04-27 12:19:20 +02:00
marcos 9edfe43cb7 fixed error with meta create vent cli 2021-04-27 12:14:32 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00