Commit Graph

5058 Commits

Author SHA1 Message Date
artica 7d8eb2a4e7 Auto-updated build strings. 2023-11-21 01:00:23 +01:00
artica 838ba785da Auto-updated build strings. 2023-11-20 01:00:19 +01:00
artica 4293669702 Auto-updated build strings. 2023-11-19 01:00:18 +01:00
artica 1649585929 Auto-updated build strings. 2023-11-18 01:00:23 +01:00
artica f386274dc0 Auto-updated build strings. 2023-11-17 01:00:20 +01:00
artica e80b590214 Auto-updated build strings. 2023-11-16 01:00:22 +01:00
artica c7a746ea41 Auto-updated build strings. 2023-11-15 01:00:24 +01:00
artica 92bd8019a3 Auto-updated build strings. 2023-11-14 01:00:11 +01:00
daniel d49c5e4954 delete agents pandora_db pandora_enterprise#12293 2023-11-13 15:12:55 +01:00
artica 257a45d178 Auto-updated build strings. 2023-11-13 01:00:17 +01:00
artica 4835231286 Auto-updated build strings. 2023-11-12 01:00:17 +01:00
artica 61759da3e0 Auto-updated build strings. 2023-11-11 01:00:21 +01:00
artica 2ba09b4b48 Auto-updated build strings. 2023-11-10 01:00:18 +01:00
artica ea0a0969b8 Auto-updated build strings. 2023-11-09 01:01:09 +01:00
artica 2d3f30974f Auto-updated build strings. 2023-11-08 01:00:25 +01:00
artica e516db1ef1 Auto-updated build strings. 2023-11-07 01:00:29 +01:00
artica 96d8fe33f3 Auto-updated build strings. 2023-11-06 01:00:19 +01:00
artica f0d0ad540f Auto-updated build strings. 2023-11-05 01:00:18 +01:00
artica cc954ab471 Auto-updated build strings. 2023-11-04 01:00:23 +01:00
artica d05ffaac56 Auto-updated build strings. 2023-11-03 01:00:22 +01:00
artica 5265ecbe9c Updated version and build strings. 2023-11-02 11:54:37 +01:00
artica 20ac3cca46 Auto-updated build strings. 2023-11-02 01:00:20 +01:00
artica 07a0a41ad9 Auto-updated build strings. 2023-11-01 01:00:29 +01:00
artica b5098ab0e5 Auto-updated build strings. 2023-10-31 01:00:26 +01:00
artica 9cc5937c96 Auto-updated build strings. 2023-10-30 01:00:18 +01:00
artica d43b7d14fa Auto-updated build strings. 2023-10-29 01:00:20 +02:00
artica 2f07f59a7b Auto-updated build strings. 2023-10-28 01:00:20 +02:00
artica c97d62ff0e Auto-updated build strings. 2023-10-27 01:00:24 +02:00
Calvo 763f656822 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-26 14:31:22 +02:00
artica 3a00e47c82 Auto-updated build strings. 2023-10-26 01:00:22 +02:00
artica d50f545858 Auto-updated build strings. 2023-10-25 01:00:25 +02:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Daniel Rodriguez 3c59c40b4c Merge branch 'ent-10268-pandora_db-refactorizacion-del-sistema-de-compactacion-de-datos' into 'develop'
Changes on compact db

Closes pandora_enterprise#10268

See merge request artica/pandorafms!6343
2023-10-24 11:04:33 +00:00
artica 9a74b74b98 Auto-updated build strings. 2023-10-24 01:00:23 +02:00
artica 46ce3073db Auto-updated build strings. 2023-10-23 01:00:18 +02:00
artica 2a1dcb2aea Auto-updated build strings. 2023-10-22 01:00:18 +02:00
artica 9c18352629 Auto-updated build strings. 2023-10-21 01:00:23 +02:00
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
artica 6247bd52c1 Auto-updated build strings. 2023-10-20 01:00:21 +02:00
felix.suarez 276e42949b Remove use 2023-10-19 14:39:35 -06:00
Félix Suárez 66b614d631 Changes on compact db 2023-10-19 14:02:32 -06:00
artica d5193615f9 Auto-updated build strings. 2023-10-19 01:00:19 +02:00
artica bd2ae54d8c Auto-updated build strings. 2023-10-18 01:00:23 +02:00
artica 14bc896f0f Auto-updated build strings. 2023-10-17 01:00:22 +02:00
artica a47748a2db Auto-updated build strings. 2023-10-16 01:00:15 +02:00
artica 5480de361d Auto-updated build strings. 2023-10-15 01:00:15 +02:00
artica e9beb22030 Auto-updated build strings. 2023-10-14 01:01:35 +02:00
artica 4727829e90 Auto-updated build strings. 2023-10-13 01:00:20 +02:00
artica e266f7e6d0 Auto-updated build strings. 2023-10-12 01:00:26 +02:00
Ramon Novoa 35db83647a Integrate MADE with Pandora FMS. 2023-10-11 13:31:13 +02:00
artica f4487dee5a Auto-updated build strings. 2023-10-11 01:00:28 +02:00
artica bbcc8ee7ef Auto-updated build strings. 2023-10-10 01:00:24 +02:00
artica 64a17cb59d Auto-updated build strings. 2023-10-09 01:00:21 +02:00
artica b41ec6f30b Auto-updated build strings. 2023-10-08 01:00:19 +02:00
artica a21f85276c Auto-updated build strings. 2023-10-07 01:00:27 +02:00
artica c616d2cf49 Auto-updated build strings. 2023-10-06 01:00:29 +02:00
artica 8225384e55 Auto-updated build strings. 2023-10-05 01:00:25 +02:00
artica b9f94050a2 Auto-updated build strings. 2023-10-04 01:00:26 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
miguel angel rasteu 578dba8207 #12138 Clean code server 2023-10-03 11:42:17 +02:00
artica 19821c4a40 Auto-updated build strings. 2023-10-03 01:00:30 +02:00
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
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +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
Jonathan 538cb4f04d #11705 cli function update_event_custom_id 2023-09-25 13:12:07 +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
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +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
Rafael Ameijeiras 483076c1ee Merge branch 'ent-12014-anadir-a-docker-de-desarrollo-licencia-de-200-agentes-carga-de-agentes-automatica-por' into 'develop'
12014 set agents to 150

See merge request artica/pandorafms!6429
2023-09-13 12:49:07 +00: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
rafael a78297c61b 12014 set agents to 150 2023-09-08 13:13:03 +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
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +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
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +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
artica 85c2cc507f Auto-updated build strings. 2023-08-28 01:00:17 +02:00
artica 2215b3cf5c Auto-updated build strings. 2023-08-27 01:00:19 +02:00
artica c21eac1fcd Auto-updated build strings. 2023-08-26 01:00:22 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
artica de204a055e Auto-updated build strings. 2023-08-25 01:00:21 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
artica 89b679c4a4 Auto-updated build strings. 2023-08-24 01:00:18 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
artica 4830cf21e6 Updated version and build strings. 2023-08-23 15:49:36 +02:00
Pablo Aragon 45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon 120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
rafael b0aa8f3fb2 adding autoinstall for tools and docs 2023-08-23 10:34:19 +02:00
rafael d85e122791 Merge branch 'develop' into 11757-revisar-y-cerrar-scripts-de-generacion-de-carga-en-pandora_server-util-load 2023-08-23 08:32:31 +02:00
artica 71ddd71146 Auto-updated build strings. 2023-08-23 01:00:53 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
artica d17ea9891b Auto-updated build strings. 2023-08-22 01:00:41 +02:00
artica b977a2b0cc Updated version and build strings. 2023-08-21 16:13:08 +02:00
Daniel Maya 021c579b2b #11906 Fixed pandora_db 2023-08-21 12:59:35 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
artica 8ce9d3aa31 Auto-updated build strings. 2023-08-21 01:00:55 +02:00
artica b031f4140c Auto-updated build strings. 2023-08-20 01:00:46 +02:00
artica a6b55c1580 Auto-updated build strings. 2023-08-19 01:01:10 +02:00
Rafael Ameijeiras debd44b7ca Merge branch 'ent-11715-errores-en-pandora_db' into 'develop'
Resolve "Errores en pandora_db"

Closes pandora_enterprise#11715

See merge request artica/pandorafms!6326
2023-08-18 06:48:59 +00:00
Rafael Ameijeiras 28d883fe24 Merge branch 'ent-11498-15743-cli-create_synthetic-no-toma-segundo-modulo-para-anadir-al-modulo-final' into 'develop'
Ent 11498-15743-cli-create_synthetic-no-toma-segundo-modulo-para-anadir-al-modulo-final

See merge request artica/pandorafms!6271
2023-08-18 06:41:31 +00:00
daniel b27867d504 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-18 08:28:06 +02:00
artica e54fc904b3 Auto-updated build strings. 2023-08-18 01:00:57 +02:00
artica 6e5f4ef20a Auto-updated build strings. 2023-08-17 01:00:37 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +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
Alejandro Sánchez 682494f51f remove clear line 2023-08-14 11:59:41 +00:00
alejandro 9c9467c2da fix in plugin output 2023-08-14 13:57:14 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +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
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +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
artica 9affc955e4 Auto-updated build strings. 2023-08-10 01:00:39 +02:00
Félix Suárez 890edd3199 Check for defined values on pandora_purgedb 2023-08-09 10:45:40 -06:00
artica 449d9fe3cb Auto-updated build strings. 2023-08-09 01:00:45 +02:00
artica 96710ed03f Auto-updated build strings. 2023-08-08 01:00:43 +02: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
Félix Suárez 3ecf171fdb Ignore disabled nodes 2023-08-01 18:14:11 -06: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
Félix Suárez 57eec94c42 Add OS, server and interval. 2023-07-28 09:32:30 -06: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
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +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
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
rafael 85194fe2be 11757 adding inventory demo data script to load util 2023-07-21 11:23:31 +02:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
Félix Suárez 1fb92e28f3 Change of comparison operator 2023-07-20 11:39:02 -06: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
slerena 6cb4709539 Upload New File 2023-07-20 11:18:03 +00:00
slerena 7f3a90df37 Upload New File 2023-07-20 11:17:45 +00:00
slerena 86b91c48d7 Upload New File 2023-07-20 11:17:30 +00:00
slerena 8a66b41280 Upload New File 2023-07-20 11:17:06 +00:00
slerena 4d83071f1c Add new directory 2023-07-20 11:02:02 +00:00