tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,469 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

6771 Commits

Author SHA1 Message Date
artica d9f48426dd Auto-updated build strings. 2022-09-15 01:00:19 +02:00
artica 628c5e8bf7 Auto-updated build strings. 2022-09-14 01:00:19 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
artica e76e9e94de Auto-updated build strings. 2022-09-13 01:00:19 +02:00
Daniel Maya 193ef3171c #9167 Fixed macros 2022-09-12 13:54:23 +02:00
Daniel Maya 19998daf63 #9432 Fixed safe operation mode 2022-09-12 09:22:08 +02:00
artica 06be85e044 Auto-updated build strings. 2022-09-12 01:00:17 +02:00
artica 9adbaf1cd1 Auto-updated build strings. 2022-09-11 01:00:17 +02:00
artica f630b4efe6 Auto-updated build strings. 2022-09-10 01:00:18 +02:00
artica c927188b27 Auto-updated build strings. 2022-09-09 01:00:19 +02:00
Calvo 30ffe64abc Historic string data separated from normal data 2022-09-08 14:28:36 +02:00
Ramon Novoa 6d153dee54 Delete old data from tplanned_downtime. 2022-09-08 12:14:48 +02:00
artica 1abb4e275f Auto-updated build strings. 2022-09-08 01:00:22 +02:00
artica 3524cdac6c Auto-updated build strings. 2022-09-07 01:00:24 +02:00
artica 181b8d5d91 Auto-updated build strings. 2022-09-06 01:00:21 +02:00
Daniel Rodriguez d0024dd692 Merge branch 'ent-9130-Agente-en-modo-disable-sigue-recibiendo-información-por-XML' into 'develop' 
Fix disabled agents filling

See merge request artica/pandorafms!5080
 2022-09-05 14:53:42 +00:00
José González 4f0ba4cb64 Fix disabled agents filling 2022-09-05 13:53:08 +02:00
artica d16fd79207 Auto-updated build strings. 2022-09-05 01:00:18 +02:00
artica a729704cd9 Auto-updated build strings. 2022-09-04 01:00:17 +02:00
artica caaeda0c83 Auto-updated build strings. 2022-09-03 01:00:23 +02:00
Diego Muñoz-Reja deb7fa54ec Merge branch 'ent-7774-13106-Deshabilitar-modulos-mediante-paradas-planificada' into 'develop' 
implemented disable modules scheduled downtime

See merge request artica/pandorafms!5075
 2022-09-02 12:18:15 +00:00
Ramon Novoa 9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Ramon Novoa fa74a2f91f Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:05:45 +02:00
Diego Muñoz-Reja 5276236c41 Merge branch 'ent-5319-9412-mas-personalizacion-de-paradas-planificada' into 'develop' 
implemented cron based scheduled downtimes

See merge request artica/pandorafms!5061
 2022-09-02 10:32:26 +00:00
Ramon Novoa ed41e05c13 Add a heuristic based on DOT1DTPFDBPORT for connection detection. 2022-09-02 10:50:48 +02:00
artica d1b22e3f7e Auto-updated build strings. 2022-09-02 01:00:24 +02:00
Daniel Rodriguez bacf850cc3 Merge branch 'ent-8753-13366-analizar-posibles-vulnerabilidades' into 'develop' 
clean old dockerfiles open

See merge request artica/pandorafms!5062
 2022-09-01 11:34:31 +00:00
artica 855686772f Auto-updated build strings. 2022-09-01 01:00:21 +02:00
alejandro.campos@artica.es a479ab84f7 implemented disable modules scheduled downtime 2022-08-31 16:14:38 +02:00
Diego Muñoz-Reja 4f9399f1fb Merge branch 'ent-9118-entities-en-opcion-del-cli-disable-_group' into 'develop' 
Ent 9118 entities en opcion del cli disable  group

See merge request artica/pandorafms!5069
 2022-08-31 11:27:59 +00:00
artica 8efb8c46b1 Auto-updated build strings. 2022-08-31 01:00:17 +02:00
Diego Muñoz-Reja 56f5001541 Merge branch 'ent-8745-Tiempo_no_inicializados_entorno' into 'develop' 
Added control for clean not initialized modules

See merge request artica/pandorafms!5073
 2022-08-30 13:02:55 +00:00
artica 7d636b64d8 Auto-updated build strings. 2022-08-30 01:00:22 +02:00
José González 4fb691dc32 Added forgive param 2022-08-29 14:13:00 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
alejandro.campos@artica.es de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
artica 8b805e0ddf Auto-updated build strings. 2022-08-29 01:00:17 +02:00
artica 1b750d1437 Auto-updated build strings. 2022-08-28 01:00:18 +02:00
artica 4bab4dc653 Auto-updated build strings. 2022-08-27 01:00:21 +02:00
edu.corral c0227482db ent #9118 cli disable group entities 2022-08-26 11:46:35 +02:00
artica 7106547b38 Auto-updated build strings. 2022-08-26 01:00:22 +02:00
artica 0b68dcd8cd Auto-updated build strings. 2022-08-25 01:00:20 +02:00
Diego Muñoz-Reja 6edd361142 Merge branch 'ent-9201-mergeador-bloqueo-pandora_db' into 'develop' 
add check locked bbdd in merge process pandora_enterprise#9201

See merge request artica/pandorafms!5041
 2022-08-24 10:29:30 +00:00
KIKUCHI Koichiro 041e5c9962 fix GoliatLWP's get_content 2022-08-24 03:38:21 +00:00
artica f0911021ab Auto-updated build strings. 2022-08-24 01:00:21 +02:00
artica 59906ded78 Auto-updated build strings. 2022-08-23 01:00:18 +02:00
artica c4119fe0d3 Auto-updated build strings. 2022-08-22 01:00:17 +02:00
artica 58f3f3ab72 Auto-updated build strings. 2022-08-21 01:00:17 +02:00
artica fb751e7d24 Auto-updated build strings. 2022-08-20 01:00:18 +02:00
artica 96413af66e Auto-updated build strings. 2022-08-19 01:00:20 +02:00
Rafael Ameijeiras 2fdb4f0302 clean old dockerfiles open 2022-08-18 11:31:00 +02:00
artica 7e0b74be0c Auto-updated build strings. 2022-08-18 01:00:23 +02:00
artica 4c743e7565 Auto-updated build strings. 2022-08-17 01:00:18 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
artica a8e10e4c26 Auto-updated build strings. 2022-08-16 01:00:11 +02:00
artica 29e07520c8 Auto-updated build strings. 2022-08-15 01:00:09 +02:00
artica f2c8ddaf85 Auto-updated build strings. 2022-08-14 01:00:13 +02:00
artica 363b86271a Auto-updated build strings. 2022-08-13 01:00:07 +02:00
artica 42df214771 Updated version and build strings. 2022-08-12 12:44:29 +02:00
Calvo 3cd0e915e5 Fix golitat check string curl 2022-08-12 12:06:16 +02:00
Daniel Rodriguez 413206f83a Merge branch 'ent-9207-13837-problema-webserver-con-regex' into 'develop' 
Fix Goliat LWP

See merge request artica/pandorafms!5053
 2022-08-12 09:55:51 +00:00
Calvo dd0262b26c Fix pandoradb deleting old netflow data 2022-08-12 10:12:40 +02:00
artica ec33fdcd3e Auto-updated build strings. 2022-08-12 01:00:22 +02:00
Jimmy Olano e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Calvo 1585f846f5 Fix Goliat LWP 2022-08-11 13:41:09 +02:00
artica 815e466ee2 Auto-updated build strings. 2022-08-11 01:00:21 +02:00
Daniel Barbero 88252ebb42 Merge remote-tracking branch 'origin/develop' into ent-8756-ipam-desde-satelite 2022-08-10 13:37:13 +02:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
artica 1dcf52273e Auto-updated build strings. 2022-08-10 01:00:21 +02:00
artica 0579dc9162 Auto-updated build strings. 2022-08-09 01:00:20 +02:00
Ramon Novoa f198e37876 Add support for IPAM XML files. 
The Data Server can now process IPAM data coming from Satellite Servers
through XML files.
 2022-08-08 13:50:25 +02:00
Daniel Barbero d099420220 Merge remote-tracking branch 'origin/develop' into ent-9201-mergeador-bloqueo-pandora_db 2022-08-08 07:44:07 +02:00
artica ca73c60579 Auto-updated build strings. 2022-08-08 01:00:17 +02:00
artica 5ca696572a Auto-updated build strings. 2022-08-07 01:00:18 +02:00
artica 362a86740a Auto-updated build strings. 2022-08-06 01:00:19 +02:00
Diego Muñoz-Reja da1838d3bb Merge branch 'ent-8884-meter-os_version-cogiendo-de-recon-de-red' into 'develop' 
Add support for OS version detection via SNMP.

See merge request artica/pandorafms!5038
 2022-08-05 12:58:53 +00:00
artica e9668c1746 Auto-updated build strings. 2022-08-05 01:00:20 +02:00
Daniel Barbero 638d073967 add check locked bbdd in merge process pandora_enterprise#9201 2022-08-04 15:11:51 +02:00
artica 56196b12c7 Auto-updated build strings. 2022-08-04 01:00:20 +02:00
Ramon Novoa 66a95adb0c Add support for OS version detection via SNMP. 
sysDescr is retrieved via SNMP if available and stored in
tagente.os_version. Ref. pandora_enterprise#8884.
 2022-08-03 13:32:42 +02:00
Diego Muñoz-Reja 4968101d59 Merge branch 'ent-8762-alert-server-token-para-controlar-encolado-de-alertas' into 'develop' 
Add an option to control alert queuing.

See merge request artica/pandorafms!5025
 2022-08-03 10:45:11 +00:00
artica 5ffd966c7a Auto-updated build strings. 2022-08-03 01:00:21 +02:00
artica 4d2f892160 Auto-updated build strings. 2022-08-02 01:00:21 +02:00
artica 59bb85e931 Auto-updated build strings. 2022-08-01 01:00:18 +02:00
artica f4c686844b Auto-updated build strings. 2022-07-31 01:00:16 +02:00
artica 04e9c8de43 Auto-updated build strings. 2022-07-30 01:00:20 +02:00
Luis 33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
artica 7d4ba6191c Auto-updated build strings. 2022-07-29 01:00:22 +02:00
artica e1bdde1aa9 Auto-updated build strings. 2022-07-28 01:00:20 +02:00
artica 95d369cca0 Auto-updated build strings. 2022-07-27 01:00:20 +02:00
artica e30eff5e6e Auto-updated build strings. 2022-07-26 01:00:17 +02:00
artica f9aa8676bc Auto-updated build strings. 2022-07-25 01:00:16 +02:00
artica 5bf282fe05 Auto-updated build strings. 2022-07-24 01:00:12 +02:00
artica f6aa9d64ae Auto-updated build strings. 2022-07-23 01:00:20 +02:00
Jimmy Olano 3a7ba1ecb4 Merge branch 'ent-9157-13709-bug-programacion-plantilla-de-alertas' into 'develop' 
Ent 9157 13709 bug programacion plantilla de alertas

#9157 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9157

See merge request artica/pandorafms!5010
 2022-07-22 13:18:58 +00:00
artica fa23c453a1 Auto-updated build strings. 2022-07-22 01:00:21 +02:00
artica b76dc9d062 Auto-updated build strings. 2022-07-21 01:00:17 +02:00
artica 385610fef6 Auto-updated build strings. 2022-07-20 01:00:21 +02:00
Ramon Novoa 6aca4be90c Add an option to control alert queuing. 
The alertserver_queue configuration option enables or disables alert
queuing for the local server. Ref. pandora_enterprise#8762.
 2022-07-19 11:29:47 +02:00
artica 672abbde79 Auto-updated build strings. 2022-07-19 01:00:18 +02:00
artica 00d4f66dc3 Auto-updated build strings. 2022-07-18 01:00:16 +02:00
artica 914c12465b Auto-updated build strings. 2022-07-17 01:00:17 +02:00
artica 72a86aca26 Auto-updated build strings. 2022-07-16 01:00:18 +02:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
artica 99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
Diego Muñoz-Reja 0f770edc13 Merge branch 'ent-8732-giss-13230-aplicar-reglas-de-autoconfiguracion-de-forma-programada' into 'develop' 
Ent 8732 giss 13230 aplicar reglas de autoconfiguracion de forma programada

See merge request artica/pandorafms!5011
 2022-07-14 10:35:52 +00:00
Daniel Maya 8096ffebc1 #8732 Added autoconfiguration scheduled 4 2022-07-14 10:10:25 +02:00
artica 47e28e283b Auto-updated build strings. 2022-07-14 01:00:14 +02:00
Daniel Maya 8ffb247703 #8732 Added autoconfiguration scheduled 3 2022-07-13 13:04:15 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31:18 +02:00
artica 85c66a390c Auto-updated build strings. 2022-07-13 01:00:19 +02:00
Daniel Maya 26cfde6687 #8732 Added autoconfiguration scheduled 2 2022-07-12 12:37:22 +02:00
artica d601ca88ca Auto-updated build strings. 2022-07-12 01:00:19 +02:00
artica 92936b5267 Auto-updated build strings. 2022-07-11 01:00:52 +02:00
artica c72bf4fc9e Auto-updated build strings. 2022-07-10 01:00:19 +02:00
artica be923c8838 Auto-updated build strings. 2022-07-09 01:00:37 +02:00
artica 66cb2b42c2 Auto-updated build strings. 2022-07-08 01:00:24 +02:00
edu.corral 5ae50dfb64 ent-9157 alert templates 2022-07-07 15:07:38 +02:00
artica 6e30b7cc0e Auto-updated build strings. 2022-07-07 01:00:27 +02:00
artica 0421b3aebd Auto-updated build strings. 2022-07-06 01:00:31 +02:00
Diego Muñoz-Reja 6aa6815273 Merge branch 'ent-9174-nuevo-evento-pandora_db-del-sistema' into 'develop' 
Generate events for pandora_db related problems.

See merge request artica/pandorafms!4999
 2022-07-05 09:37:43 +00:00
artica 45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +02:00
Ramon Novoa c703c1995c Merge remote-tracking branch 'origin/develop' into ent-9174-nuevo-evento-pandora_db-del-sistema 2022-07-04 17:15:33 +02:00
artica 225da0dac5 Auto-updated build strings. 2022-07-04 01:00:25 +02:00
artica 5ad9178bc4 Auto-updated build strings. 2022-07-03 01:00:26 +02:00
artica a8a1069aaa Auto-updated build strings. 2022-07-02 01:00:31 +02:00
artica 219d82c230 Auto-updated build strings. 2022-07-01 01:00:22 +02:00
Ramon Novoa 6e8a4abaae Generate events for pandora_db related problems. 
Generate events if pandora_db has never been run or has not been run for
more than 24 hours.
 2022-06-30 19:22:01 +02:00
artica 87837d7c8f Auto-updated build strings. 2022-06-30 01:00:33 +02:00
artica 87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
artica 6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
artica beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica 036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
artica a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Rodriguez 13ed563b42 Merge branch 'ent-8896-discovery-y-satelite-cuando-detectamos-equipos-de-red-faltan-datos-basicos' into 'develop' 
Ent 8896 discovery y satelite cuando detectamos equipos de red faltan datos basicos

See merge request artica/pandorafms!4887
 2022-06-23 09:33:30 +00:00
Ramon Novoa 2e7c3e8969 Fix permissions for pandora_snmp_bandwidth.pl. 
pandora_snmp_bandwidth.pl was missing execute permissions.
 2022-06-23 11:20:03 +02:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
artica 7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
artica a17232fb86 Auto-updated build strings. 2022-06-22 01:00:51 +02:00
Daniel Rodriguez be49005441 Merge branch 'ent-8690-gestion-snmptraps-pandora_db' into 'develop' 
Set new mode for manage properly the restarting of snmptrap process

See merge request artica/pandorafms!4905
 2022-06-21 13:59:24 +00:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
José González 7ac9717536 Fix 2022-06-21 11:16:36 +02:00
Calvo 1330cb8881 Fix discovery snmp v3 bugs 2022-06-21 10:45:34 +02:00
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Ramon Novoa 9b5b4deb67 Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-20 10:25:22 +02:00
Daniel Barbero Martin ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica 7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02:00
José González 14edca5143 Merge remote-tracking branch 'origin' into ent-8690-gestion-snmptraps-pandora_db 2022-06-17 15:26:57 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Ramon Novoa 1d66d66cdf Merge remote-tracking branch 'origin/develop' into ent-test-corr 2022-06-17 10:41:20 +02:00
Ramon Novoa d53c2f8ed4 Merge remote-tracking branch 'origin/develop' into ent-test-corr 2022-06-17 10:37:42 +02:00
Ramon Novoa 7edd433566 Add recovery support for correlation alerts. 2022-06-17 10:21:06 +02:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
artica ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
Daniel Rodriguez 928ef28f20 Merge branch 'ent-8971-13608-definicion-de-umbrales-en-plugin-oracle-database-agente-no-funciona' into 'develop' 
8971-13608-definicion-de-umbrales-en-plugin-oracle-database-agente-no-funciona

See merge request artica/pandorafms!4926
 2022-06-16 11:23:55 +00:00
Daniel Rodriguez ba5693a961 Merge branch 'ent-8517-13067-Prefijo-en-módulo-Oracle-connection' into 'develop' 
Ent 8517 13067 prefijo en módulo oracle connection

See merge request artica/pandorafms!4881
 2022-06-16 10:15:29 +00:00
Calvo f03b76a3ad Merge remote-tracking branch 'origin/develop' into ent-8896-discovery-y-satelite-cuando-detectamos-equipos-de-red-faltan-datos-basicos 2022-06-16 11:12:32 +02:00
Calvo c46f1ac31a SNMP Bandwith modules on discovery task 2022-06-16 11:11:04 +02:00
Daniel Rodriguez 6a72479771 Merge branch 'ent-9141-dependencias-que-faltan-para-instaladores' into 'develop' 
Adding dependencies to pandorafms rpm packages

See merge request artica/pandorafms!4961
 2022-06-16 07:16:49 +00:00
Daniel Rodriguez 28cc684c18 Merge branch 'ent-8871-GUARDIA-13422-Problema-con-timestamp-del-agente-datalist' into 'develop' 
minor fix

See merge request artica/pandorafms!4847
 2022-06-16 07:16:07 +00:00
Daniel Barbero Martin acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-16 09:09:49 +02:00
artica 592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Barbero Martin 080c10aad7 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-15 08:50:00 +02:00
artica 3ee1ba0bbc Auto-updated build strings. 2022-06-15 01:00:16 +02:00
Rafael Ameijeiras 26038b6aaa Adding dependencies to pandorafms rpm packages 2022-06-14 16:55:25 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
artica c7b8c55284 Auto-updated build strings. 2022-06-14 01:00:42 +02:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica 85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica 62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica 46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
artica 32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
Ramon Novoa 5e33df93ac Auto-assign Satellite Servers to agents when possible. 2022-06-09 13:29:43 +02:00
artica 9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
artica 8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Rodriguez 6d2e1a5e95 Merge branch 'ent-8844-delete-group-en-cli-meta' into 'develop' 
Fix CLI delete group on meta

See merge request artica/pandorafms!4842
 2022-06-07 11:18:52 +00:00
Daniel Rodriguez efac993111 Merge branch 'ent-8843-disabled-group-en-cli-meta' into 'develop' 
Meta disable groups CLI

See merge request artica/pandorafms!4833
 2022-06-07 11:14:56 +00:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
artica 9712cf6c0f Auto-updated build strings. 2022-06-06 01:00:16 +02:00
artica 05b97a3dbc Auto-updated build strings. 2022-06-05 01:00:16 +02:00
artica 44925ef341 Auto-updated build strings. 2022-06-04 01:00:22 +02:00
Daniel Rodriguez 3c9c41942a Merge branch 'ent-8853-fe-de-erratas-en-mensajes-a-los-clientes-en-utilidad-pandora_manage-pl' into 'develop' 
Fix pandora_manage typo

See merge request artica/pandorafms!4863
 2022-06-03 09:16:42 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
artica 21399593dd Auto-updated build strings. 2022-06-03 01:00:22 +02:00
Daniel Rodriguez 3b91d182f0 Merge branch 'ent-8354-parametro-update_parent-repetido-pandora_server.conf' into 'develop' 
Fix duplicated parameters

See merge request artica/pandorafms!4836
 2022-06-02 11:18:14 +00:00
Daniel Barbero Martin 2cef931272 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-02 08:35:38 +02:00
artica e47b8ee657 Auto-updated build strings. 2022-06-02 01:00:20 +02:00
Daniel Barbero Martin d278fb3acb Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-01 08:03:31 +02:00
Rafael Ameijeiras 86d04395a6 8971-13608-definicion-de-umbrales-en-plugin-oracle-database-agente-no-funciona 2022-06-01 05:32:52 +02:00