Commit Graph

7363 Commits

Author SHA1 Message Date
artica 6e5f4ef20a Auto-updated build strings. 2023-08-17 01:00:37 +02:00
artica 2f4174c0d3 Auto-updated build strings. 2023-08-16 01:00:55 +02:00
artica 4b98cc97a9 Auto-updated build strings. 2023-08-15 01:00:54 +02:00
artica 841f9fbee0 Auto-updated build strings. 2023-08-14 01:00:35 +02:00
artica 0c7de59b80 Auto-updated build strings. 2023-08-13 01:00:47 +02:00
artica d01416a771 Auto-updated build strings. 2023-08-12 01:00:15 +02:00
artica 30ef320d06 Updated version and build strings. 2023-08-11 11:53:42 +02:00
artica 8be7d85405 Auto-updated build strings. 2023-08-11 01:00:53 +02:00
Rafael Ameijeiras 74b54cebde Merge branch 'ent-11674-compilado-scripts-discovery-para-cicd' into 'develop'
Added discovery folder to server data_in installation

See merge request artica/pandorafms!6188
2023-08-10 11:42:10 +00:00
artica 9affc955e4 Auto-updated build strings. 2023-08-10 01:00:39 +02:00
Rafael Ameijeiras bfd505a538 Merge branch 'ent-11682-no-se-configuran-las-listas-de-dias-especiales' into 'develop'
Ent 11682 No se configuran las listas de dias especiales

See merge request artica/pandorafms!6220
2023-08-09 07:27:27 +00:00
artica 449d9fe3cb Auto-updated build strings. 2023-08-09 01:00:45 +02:00
Daniel Cebrian 131f78e21e #11682 fixed special days calendar 2023-08-08 18:04:30 +02:00
rafael 65245a947a 11066 set pandorawmic as default wmic binary by default 2023-08-08 14:10:36 +02:00
Matias Didier 16513cf52d Merge branch 'ent-10071-14719-Comprobacion-estado-previo-del-agente-ante-paradas-planificadas' into 'develop'
Ent 10071 14719 comprobacion estado previo del agente ante paradas planificadas

See merge request artica/pandorafms!6319
2023-08-08 10:29:36 +00:00
artica 96710ed03f Auto-updated build strings. 2023-08-08 01:00:43 +02:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Matias Didier e4aea936e0 Merge branch 'ent-10231-limpieza-de-codigo-del-server-transaccional' into 'develop'
Ent-10231 limpieza-de-codigo-del-server-transaccional

See merge request artica/pandorafms!6073
2023-08-07 08:18:07 +00:00
artica 5e588736ff Auto-updated build strings. 2023-08-07 01:00:15 +02:00
artica cb15459cb3 Auto-updated build strings. 2023-08-06 01:00:07 +02:00
artica 99317de9cf Auto-updated build strings. 2023-08-05 01:00:37 +02:00
artica eb104dd2e4 Auto-updated build strings. 2023-08-04 01:00:26 +02:00
artica ab0fda5a5d Auto-updated build strings. 2023-08-03 01:00:42 +02:00
artica d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
2023-07-27 10:27:55 +00:00
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop'
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
2023-07-27 07:24:09 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Rafael Ameijeiras 6045d92fa4 Merge branch 'ent-1495-que-el-pandora_server-error-muestre-timestamp-itwerke' into 'develop'
Ent-1495-que-el-pandora_server-error-muestre-timestamp-itwerke

Closes pandora_enterprise#1495

See merge request artica/pandorafms!6274
2023-07-26 05:03:24 +00:00
artica 244c717355 Auto-updated build strings. 2023-07-26 01:00:54 +02:00
Rafael Ameijeiras bb74aa13bd Merge branch 'ent-11672-cambiar-referencias-a-artica-st-por-pandora-fms' into 'develop'
Ent 11672 cambiar referencias a artica st por pandora fms

Closes pandora_enterprise#11672

See merge request artica/pandorafms!6198
2023-07-25 07:50:53 +00:00
artica 1de2fe9898 Auto-updated build strings. 2023-07-25 01:02:35 +02:00
Félix Suárez 60ed07dc1f Remove unused imports 2023-07-24 12:32:25 -06:00
Félix Suárez 93eb93b348 Change to handle as log blocks 2023-07-24 12:27:27 -06:00
Félix Suárez 1fc1c0e9a4 Add current date to error logs without date 2023-07-23 17:02:26 -06:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
slerena a1dcd52631 Upload New File 2023-07-20 11:18:45 +00:00
slerena eb70d65027 Upload New File 2023-07-20 11:18:32 +00:00
slerena 42f23e667b Upload New File 2023-07-20 11:18:18 +00:00