Commit Graph

4962 Commits

Author SHA1 Message Date
artica 60cfc49e3e Auto-updated build strings. 2023-11-27 01:00:19 +01:00
artica cdd00fcc68 Auto-updated build strings. 2023-11-26 01:00:18 +01:00
artica 18b337a8df Auto-updated build strings. 2023-11-25 01:00:21 +01:00
Enrique Martin 26e4b46b1f Removed agent_alias from agent_data 2023-11-24 12:26:59 +01:00
Enrique Martin cdc77b5f70 Added demo agents plugin 2023-11-24 10:24:46 +01:00
artica 558279e61b Auto-updated build strings. 2023-11-24 01:00:22 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
artica 2576303566 Auto-updated build strings. 2023-11-23 01:00:31 +01:00
artica 445514586a Auto-updated build strings. 2023-11-22 01:00:18 +01:00
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