Commit Graph

3904 Commits

Author SHA1 Message Date
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
artica 323572a4c7 Auto-updated build strings. 2023-10-02 01:00:18 +02:00
artica f6fdd587e7 Auto-updated build strings. 2023-10-01 01:00:18 +02:00
artica 7a890d5820 Auto-updated build strings. 2023-09-30 01:00:22 +02:00
artica 477d3e62f8 Auto-updated build strings. 2023-09-29 01:00:27 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00
artica da935b6569 Auto-updated build strings. 2023-09-27 01:00:22 +02:00
artica fbeb616eb8 Auto-updated build strings. 2023-09-26 01:00:25 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
artica 8c19a075c3 Auto-updated build strings. 2023-09-25 01:00:18 +02:00
artica fa2e94eea3 Auto-updated build strings. 2023-09-24 01:00:19 +02:00
artica 7b3b1f9ccc Auto-updated build strings. 2023-09-23 01:00:21 +02:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00
artica 963664c1d8 Auto-updated build strings. 2023-09-21 01:00:30 +02:00
artica 92b8446110 Auto-updated build strings. 2023-09-20 01:00:27 +02:00
artica 1bb1bb11b2 Auto-updated build strings. 2023-09-19 01:00:29 +02:00
artica 2c055a4488 Auto-updated build strings. 2023-09-18 01:00:20 +02:00
artica 4450f4d5fe Auto-updated build strings. 2023-09-17 01:00:20 +02:00
artica 495780b8a8 Auto-updated build strings. 2023-09-16 01:00:25 +02:00
artica 95f9ddba01 Auto-updated build strings. 2023-09-15 01:00:29 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
artica 018938cb8e Auto-updated build strings. 2023-09-14 01:00:27 +02:00
artica a46a43fd89 Auto-updated build strings. 2023-09-13 01:00:30 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
artica 283bb1f571 Auto-updated build strings. 2023-09-12 01:00:27 +02:00
daniel fdaaf1a2e8 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-11 08:47:55 +02:00
artica 7af74d74b3 Auto-updated build strings. 2023-09-11 01:00:20 +02:00
artica 3a836c59dd Auto-updated build strings. 2023-09-10 01:00:20 +02:00
artica 2cc97b37fc Auto-updated build strings. 2023-09-09 01:00:23 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
artica 90d4bbf1be Auto-updated build strings. 2023-09-08 01:00:23 +02:00
Rafael Ameijeiras 0dc2a3492d Merge branch 'ent-11753-el-pandoradb-no-esta-borrando-los-datos-antiguos-de-netflow' into 'develop'
Fix pandoradb delete old netdlow data

See merge request artica/pandorafms!6394
2023-09-07 14:12:20 +00:00
Calvo 0811296f1b Added -w to 100 for expiring all data in time selected 2023-09-07 15:37:49 +02:00
Calvo 2638025652 Added -w to 100 for expiring all data in time selected 2023-09-07 15:20:36 +02:00
artica b1518fb6a6 Auto-updated build strings. 2023-09-07 01:00:24 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
artica cd4548d6ca Auto-updated build strings. 2023-09-06 01:00:23 +02:00
artica c4d51a86b5 Auto-updated build strings. 2023-09-05 01:00:25 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
artica d9e21b9471 Auto-updated build strings. 2023-09-04 01:00:18 +02:00
artica 153b2017d3 Auto-updated build strings. 2023-09-03 01:00:17 +02:00
artica e3ad3f6590 Auto-updated build strings. 2023-09-02 01:00:23 +02:00
Calvo d9bfa56e9a Fix pandoradb delete old netdlow data 2023-09-01 13:07:48 +02:00
artica 3e4aad7063 Auto-updated build strings. 2023-09-01 01:00:23 +02:00
artica beeacf0cf3 Auto-updated build strings. 2023-08-31 01:00:10 +02:00
artica d006028ce9 Updated version and build strings. 2023-08-30 09:18:04 +02:00
artica d63a304906 Auto-updated build strings. 2023-08-30 01:00:23 +02:00
artica ff37a940da Auto-updated build strings. 2023-08-29 01:00:21 +02:00