Commit Graph

5622 Commits

Author SHA1 Message Date
artica b1a5e9e473 Auto-updated build strings. 2023-04-18 01:00:17 +02:00
artica 3c01ffa27f Auto-updated build strings. 2023-04-17 01:00:12 +02:00
artica a493a9b0b4 Auto-updated build strings. 2023-04-16 01:00:39 +02:00
artica c4adfa7755 Auto-updated build strings. 2023-04-15 01:00:16 +02:00
artica c84e416f44 Auto-updated build strings. 2023-04-14 01:00:11 +02:00
artica 19bb879cfc Auto-updated build strings. 2023-04-13 01:01:23 +02:00
artica 01527dcc67 Auto-updated build strings. 2023-04-12 01:00:14 +02:00
artica 9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +02:00
artica 538f8266dc Auto-updated build strings. 2023-04-10 01:00:11 +02:00
artica c5cd6b08e8 Auto-updated build strings. 2023-04-09 01:00:13 +02:00
artica 33904e3ed7 Auto-updated build strings. 2023-04-08 01:00:11 +02:00
artica b1489c9245 Auto-updated build strings. 2023-04-07 01:00:14 +02:00
artica 86d6c24540 Auto-updated build strings. 2023-04-06 01:00:18 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop'
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
2023-04-05 11:55:20 +00:00
artica ce43cc9bb2 Auto-updated build strings. 2023-04-05 01:00:19 +02:00
Matias Didier e7d71cf99c Merge branch 'ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos' into 'develop'
Process inventory modules with correct xml and empty data

See merge request artica/pandorafms!5593
2023-04-04 07:24:44 +00:00
artica 0fb35a02fe Auto-updated build strings. 2023-04-04 01:00:15 +02:00
Calvo 9e20ce3ec7 Fix empty inventory module showing hash 2023-04-03 17:09:54 +02:00
Calvo 764823c93f Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 10:25:58 +02:00
artica 715cedb20f Auto-updated build strings. 2023-04-03 01:00:12 +02:00
artica 2bcd4de201 Auto-updated build strings. 2023-04-02 01:00:09 +02:00
artica 070105c766 Auto-updated build strings. 2023-04-01 01:00:17 +02:00
artica a0828ac25c Auto-updated build strings. 2023-03-31 01:00:22 +02:00
Calvo 307057f934 Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-03-30 15:29:55 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop'
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
2023-03-30 12:39:06 +00:00
artica 392139d22d Auto-updated build strings. 2023-03-30 01:00:16 +02:00
artica 5113117a39 Auto-updated build strings. 2023-03-29 01:00:25 +02:00
artica 061c9f8750 Auto-updated build strings. 2023-03-28 01:00:16 +02:00
artica 78bc8e4f50 Updated version and build strings. 2023-03-27 09:41:48 +02:00
artica 75af4a2ca9 Auto-updated build strings. 2023-03-27 01:00:39 +02:00
artica 9528f59af9 Auto-updated build strings. 2023-03-26 01:00:17 +01:00
artica bcf3f1ba1f Auto-updated build strings. 2023-03-25 01:00:19 +01:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
2023-03-24 07:25:52 +00:00
artica 8a14ec6725 Auto-updated build strings. 2023-03-24 01:00:23 +01:00
Rafael Ameijeiras 766664470d Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha

See merge request artica/pandorafms!5563
2023-03-23 12:58:53 +00:00
Ramon Novoa 96a9063196 Fix a typo. 2023-03-23 12:27:19 +01:00
artica cbbddd1ac6 Auto-updated build strings. 2023-03-23 01:00:18 +01:00
Calvo 6c8337de8c Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' of brutus.artica.es:artica/pandorafms into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 14:27:25 +01:00
Ramon Novoa 7c85b530ad Add support for the Enterprise Netflow Server. 2023-03-22 12:49:39 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
#   pandora_console/install.php
2023-03-22 08:23:07 +00:00
artica 6e8eb9800f Auto-updated build strings. 2023-03-22 01:00:23 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
artica f896eceb47 Auto-updated build strings. 2023-03-21 01:00:19 +01:00
artica 37940a2565 Auto-updated build strings. 2023-03-20 01:00:08 +01:00
artica e64d9e2b7b Auto-updated build strings. 2023-03-19 01:00:12 +01:00
artica 426f756d16 Auto-updated build strings. 2023-03-18 01:00:23 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +01:00
artica 6b14fc0205 Auto-updated build strings. 2023-03-17 01:00:38 +01:00
Daniel Maya 1d4aeef893 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-16 10:10:16 +01:00