Commit Graph

4557 Commits

Author SHA1 Message Date
artica 240bab48ec Auto-updated build strings. 2022-11-10 01:00:19 +01:00
artica dfe35f2819 Auto-updated build strings. 2022-11-09 01:00:21 +01:00
artica 94ba216f81 Updated version and build strings. 2022-11-08 13:01:55 +01:00
artica 778501d4bf Auto-updated build strings. 2022-11-08 01:00:31 +01:00
artica 883b2067db Auto-updated build strings. 2022-11-07 01:00:19 +01:00
artica f05015ab16 Auto-updated build strings. 2022-11-06 01:00:18 +01:00
artica 5c7862c4e1 Auto-updated build strings. 2022-11-05 01:00:22 +01:00
Daniel Barbero 65ac6b38fb fixed CLI add comments pandora_enterprise#9721 2022-11-04 12:36:44 +01:00
artica dce2b3f915 Auto-updated build strings. 2022-11-04 01:00:24 +01:00
artica 08f0d416cd Auto-updated build strings. 2022-11-03 01:00:24 +01:00
artica 42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica 91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Maya 8971dba9c5 #9447 uncomment 2022-10-31 17:16:08 +01:00
Daniel Maya f4693b3cba #9447 Added check_value 2022-10-31 16:59:38 +01:00
Daniel Rodriguez 7baed1dffd Merge branch 'ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves' into 'develop'
Ent 9712 pandora db no se ejecuta cuando pasan politicas pero si al reves

See merge request artica/pandorafms!5234
2022-10-31 11:56:42 +00:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Daniel Rodriguez 92b99d0154 Merge branch 'ent-9659-optimizacion-pandora_db' into 'develop'
Query performance improvements in pandora_db.

See merge request artica/pandorafms!5211
2022-10-31 10:54:31 +00:00
Ramon Novoa a7331c5603 Merge branch 'ent-test-pandoradb-lock' into ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves 2022-10-31 10:52:58 +01:00
Ramon Novoa 5cd601b999 Improve the locking mechanism of pandora_db. 2022-10-31 10:16:17 +01:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 4594fb17e2 Merge branch 'ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos' into 'develop'
synch cli with nodes pandora_enterprise#9500

pandora_enterprise#9500

See merge request artica/pandorafms!5198
2022-10-28 01:30:22 +00:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
Daniel Maya 548308405c #9447 WIP 2022-10-27 09:40:33 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
Daniel Rodriguez c98c58c157 Merge branch 'ent-9377-14016-inestabilidad-y-borrado-incorrecto-netflow' into 'develop'
Fix pandoradb deleting old netflow data

See merge request artica/pandorafms!5055
2022-10-26 12:39:50 +00:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Ramon Novoa d493eaea12 Query performance improvements in pandora_db. 2022-10-25 12:35:22 +02:00
Diego Muñoz-Reja a8902fed18 Merge branch 'ent-9316-bug-relacionado-con-los-permisos-en-ruta-de-log-tentacle' into 'develop'
Update copies of the Tentacle Server. Small fixes.

See merge request artica/pandorafms!5187
2022-10-25 09:26:47 +00:00
artica ce4fc25209 Auto-updated build strings. 2022-10-25 01:00:22 +02:00
artica 204d711b30 Auto-updated build strings. 2022-10-24 01:00:19 +02:00
artica bd0f136dc0 Auto-updated build strings. 2022-10-23 01:00:17 +02:00
artica 4118f7656b Auto-updated build strings. 2022-10-22 01:00:24 +02:00
artica e31699eed7 Auto-updated build strings. 2022-10-21 01:00:25 +02:00
artica 61b3bc724a Auto-updated build strings. 2022-10-20 01:00:21 +02:00
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Daniel Barbero 82a3fc1063 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos
Conflicts:
	pandora_server/util/pandora_manage.pl
2022-10-18 16:22:53 +02:00
Daniel Barbero e79394c235 synch cli with nodes pandora_enterprise#9500 2022-10-18 16:14:35 +02:00
Jimmy Olano 9d912c2a6d Merge branch 'ent-8956-derivado-del-trabajo-q-a-762-lts-cli-perl-al-crear-usuario-inserta-entidades-html-en' into 'develop'
Ent 8956 derivado del trabajo q a 762 lts cli perl al crear usuario inserta entidades html en

#8956

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8956

See merge request artica/pandorafms!5163
2022-10-18 13:35:09 +00:00
Daniel Barbero 4b3376057c Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 13:41:25 +02:00
Jimmy Olano 0612bb05db Merge branch 'ent-9098-13503-creacion-llamada-insert_gis_data-cli' into 'develop'
Ent 9098 13503 creacion llamada insert gis data cli

#9098

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9098

See merge request artica/pandorafms!5132
2022-10-18 11:26:51 +00:00
Daniel Barbero 697abced4e synch cli with nodes pandora_enterprise#9500 2022-10-18 12:49:51 +02:00
Daniel Barbero 15b07a9a09 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 08:01:32 +02:00
artica ed8b6678cd Auto-updated build strings. 2022-10-18 01:00:21 +02:00
Daniel Barbero c6783f9a10 synch cli with nodes pandora_enterprise#9500 2022-10-17 16:04:45 +02:00
artica b79b7e5d57 Auto-updated build strings. 2022-10-17 01:00:17 +02:00
artica 92f0e4b709 Auto-updated build strings. 2022-10-16 01:00:17 +02:00
artica b31240a3cc Auto-updated build strings. 2022-10-15 01:00:23 +02:00
Jimmy Olano 9c413b355d Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop'
remove tmetaconsole_history token pandora_enterprise#9579

pandora_enterprise#9579

See merge request artica/pandorafms!5161
2022-10-14 08:33:26 +00:00
artica f871654e60 Auto-updated build strings. 2022-10-14 01:00:23 +02:00
Jimmy Olano 4c8f7745b6 Merge branch 'ent-9396-derivado-del-trabajo-q-a-764-fe-de-errata-en-la-ayuda-de-la-cli-pfms-agent_update_custom_fields' into 'develop'
Ent 9396 derivado del trabajo q a 764 fe de errata en la ayuda de la cli pfms agent update custom fields

#9396

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9396

See merge request artica/pandorafms!5125
2022-10-13 16:23:25 +00:00
artica b98b0f3ab3 Auto-updated build strings. 2022-10-13 01:00:17 +02:00
artica ccd578690b Auto-updated build strings. 2022-10-12 01:00:22 +02:00
Ramon Novoa 83a669b1bc Update copies of the Tentacle Server. Small fixes. 2022-10-11 11:48:02 +02:00
edu.corral 2262754eaf ent 9098 insert_gis_data 2022-10-11 11:46:02 +02:00
artica e5bdceee78 Auto-updated build strings. 2022-10-11 01:00:22 +02:00
artica 7a2f8fdef0 Auto-updated build strings. 2022-10-10 01:00:16 +02:00
artica 771fa9e099 Auto-updated build strings. 2022-10-09 01:00:17 +02:00
artica 92aa05ddb4 Auto-updated build strings. 2022-10-08 01:00:20 +02:00
artica 4e665b180f Auto-updated build strings. 2022-10-07 01:00:20 +02:00
artica fa3f224325 Auto-updated build strings. 2022-10-06 01:00:20 +02:00
artica 29e49f9ae0 Auto-updated build strings. 2022-10-05 01:00:20 +02:00
artica a313678dca Auto-updated build strings. 2022-10-04 01:00:17 +02:00
edu.corral 63349973e8 ent 8956 cli create user 2022-10-03 09:34:35 +02:00
artica 42434b16a9 Auto-updated build strings. 2022-10-03 01:00:16 +02:00
artica 9ca27ab588 Auto-updated build strings. 2022-10-02 01:00:16 +02:00
artica b1e499f336 Auto-updated build strings. 2022-10-01 01:00:17 +02:00
artica 07de764545 Updated version and build strings. 2022-09-30 12:00:00 +02:00
edu.corral f367e852d1 ent 8956 cli create user comment entities 2022-09-30 11:06:28 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
artica af7cbc5901 Auto-updated build strings. 2022-09-30 01:00:20 +02:00
artica 2855e6ac48 Auto-updated build strings. 2022-09-29 01:00:21 +02:00
artica dde27c12b1 Auto-updated build strings. 2022-09-28 01:00:20 +02:00
Diego Muñoz-Reja 35ee6936d6 Merge branch 'ent-9124-paradas-planificadas-no-se-borran-de-db' into 'develop'
Delete old data from tplanned_downtime.

See merge request artica/pandorafms!5091
2022-09-27 14:11:39 +00:00
artica fa8386194c Auto-updated build strings. 2022-09-27 01:00:21 +02:00
artica 4db9df6df5 Auto-updated build strings. 2022-09-26 01:00:17 +02:00
artica d7b4a8f248 Auto-updated build strings. 2022-09-25 01:00:16 +02:00
artica 0ce954af56 Auto-updated build strings. 2022-09-24 01:00:20 +02:00
artica d14bcfe616 Auto-updated build strings. 2022-09-23 01:00:20 +02:00
Diego Muñoz-Reja 0488eec00d Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop'
Historic string data separated from normal data

See merge request artica/pandorafms!5093
2022-09-22 14:47:23 +00:00
artica b7bef2dd58 Auto-updated build strings. 2022-09-22 01:00:20 +02:00
edu.corral 1e590728aa ent 9098 gis cli 2022-09-21 17:41:09 +02:00
artica 4c8b907590 Auto-updated build strings. 2022-09-21 01:00:21 +02:00
alejandro.campos@artica.es 9343796ae1 traps history 2022-09-20 17:26:29 +02:00
alejandro.campos@artica.es 230494ffca traps history 2022-09-20 16:03:13 +02:00
edu.corral ace3603b13 ent 9396 agent_update_custom_fields help 2022-09-20 14:31:48 +02:00
artica 9ae4c7ca67 Auto-updated build strings. 2022-09-20 01:00:21 +02:00
alejandro.campos@artica.es 91194155b0 implemented trap history 2022-09-19 11:15:22 +02:00
artica 4a7b11395a Auto-updated build strings. 2022-09-19 01:00:16 +02:00
artica 30395efe83 Auto-updated build strings. 2022-09-18 01:00:16 +02:00
artica 185498ac5b Auto-updated build strings. 2022-09-17 01:00:19 +02:00
artica e7d13c5e36 Auto-updated build strings. 2022-09-16 01:00:19 +02:00
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
artica e76e9e94de Auto-updated build strings. 2022-09-13 01:00:19 +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
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
artica d1b22e3f7e Auto-updated build strings. 2022-09-02 01:00:24 +02:00
artica 855686772f Auto-updated build strings. 2022-09-01 01:00:21 +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
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
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
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
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 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
artica 815e466ee2 Auto-updated build strings. 2022-08-11 01:00:21 +02: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
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
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
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
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
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
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
artica 99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
artica 47e28e283b Auto-updated build strings. 2022-07-14 01:00:14 +02:00
artica 85c66a390c Auto-updated build strings. 2022-07-13 01:00:19 +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
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
artica 45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +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
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
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
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
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +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
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 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
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
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 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
artica aa6977e4db Auto-updated build strings. 2022-06-01 01:00:20 +02:00
Ramon Novoa 5ac607c22a Move Metaconsole events to tevento. 2022-05-31 12:50:43 +02:00
artica a2e036d279 Auto-updated build strings. 2022-05-31 01:00:19 +02:00
artica 1e430f2f73 Auto-updated build strings. 2022-05-30 01:00:15 +02:00
artica df7a6bf73a Auto-updated build strings. 2022-05-29 01:00:18 +02:00
artica 4fb4dcdd62 Auto-updated build strings. 2022-05-28 01:00:18 +02:00
artica 1b62f0a3eb Auto-updated build strings. 2022-05-27 01:00:21 +02:00
artica c9ca52e5b9 Auto-updated build strings. 2022-05-26 01:00:46 +02:00
artica 79774dfb33 Auto-updated build strings. 2022-05-25 01:00:40 +02:00
José González 3623849ce4 Fix logrotate 2022-05-24 11:04:29 +02:00
José González 8d04570989 Set new mode for manage properly the restarting of snmptrap process 2022-05-24 10:59:41 +02:00
artica 3298f340b4 Auto-updated build strings. 2022-05-24 01:00:37 +02:00
artica 43bcc4465f Auto-updated build strings. 2022-05-23 01:00:17 +02:00
artica c915f6e766 Auto-updated build strings. 2022-05-22 01:00:38 +02:00
artica b80474db63 Auto-updated build strings. 2022-05-21 01:00:37 +02:00