Commit Graph

5156 Commits

Author SHA1 Message Date
artica dd252daaf2 Auto-updated build strings. 2024-01-24 01:00:32 +01:00
Rafael Ameijeiras 36de621fed Merge branch 'ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde' into 'develop'
Ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde

Closes pandora_enterprise#12454

See merge request artica/pandorafms!6805
2024-01-23 07:20:01 +00:00
artica d4c5d2f316 Auto-updated build strings. 2024-01-23 01:00:29 +01:00
Diego Muñoz-Reja 9bdcfb4b4d Merge branch 'ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api' into 'develop'
Ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api

Closes pandora_enterprise#12519

See merge request artica/pandorafms!6769
2024-01-22 15:49:32 +00:00
artica 895684238e Auto-updated build strings. 2024-01-22 01:00:15 +01:00
artica 91e072e384 Auto-updated build strings. 2024-01-21 01:00:15 +01:00
artica f67c9185f8 Auto-updated build strings. 2024-01-20 01:00:29 +01:00
Rafael Ameijeiras 11e8b9942f Merge branch 'ent-12514-error-el-ejecutar-comandos-en-la-cli' into 'develop'
Ent-12514-error-el-ejecutar-comandos-en-la-cli

Closes pandora_enterprise#12514

See merge request artica/pandorafms!6760
2024-01-19 08:18:06 +00:00
artica 2400c110b1 Auto-updated build strings. 2024-01-19 01:01:35 +01:00
Calvo cb1f1b1ff2 Merge remote-tracking branch 'origin/develop' into ent-10847-modo-standby-en-vista-ha 2024-01-18 08:13:49 +01:00
artica 49f15c354c Auto-updated build strings. 2024-01-18 01:01:27 +01:00
Calvo 50e6a44002 Merge remote-tracking branch 'origin/develop' into ent-10847-modo-standby-en-vista-ha 2024-01-17 16:36:08 +01:00
artica f33865542c Auto-updated build strings. 2024-01-17 01:01:47 +01:00
artica a16fa51922 Auto-updated build strings. 2024-01-16 01:01:13 +01:00
artica 616af6450b Auto-updated build strings. 2024-01-15 01:00:21 +01:00
artica 2e45362944 Auto-updated build strings. 2024-01-14 01:01:50 +01:00
artica e2b837186c Auto-updated build strings. 2024-01-13 01:00:46 +01:00
artica 3a509b9415 Auto-updated build strings. 2024-01-12 01:02:06 +01:00
artica 62d7adec39 Auto-updated build strings. 2024-01-11 01:00:34 +01:00
artica 353c7e1fa1 Auto-updated build strings. 2024-01-10 01:00:40 +01:00
artica 6930631c66 Auto-updated build strings. 2024-01-09 01:00:36 +01:00
artica d9b400d4ee Auto-updated build strings. 2024-01-08 01:00:21 +01:00
artica 6db5e5b728 Auto-updated build strings. 2024-01-07 01:00:19 +01:00
artica bb94bf2c6c Auto-updated build strings. 2024-01-06 01:00:33 +01:00
artica 8395597605 Auto-updated build strings. 2024-01-05 01:00:33 +01:00
artica 200298a0f6 Auto-updated build strings. 2024-01-04 01:00:56 +01:00
artica 4786a9260c Auto-updated build strings. 2024-01-03 01:00:26 +01:00
artica 0efa911300 Auto-updated build strings. 2024-01-02 01:00:19 +01:00
artica bf905c1ab7 Auto-updated build strings. 2024-01-01 01:00:19 +01:00
artica dfe134b39c Auto-updated build strings. 2023-12-31 01:00:20 +01:00
artica 72dcbf95c4 Auto-updated build strings. 2023-12-30 01:00:24 +01:00
artica 58c9cc5b93 Auto-updated build strings. 2023-12-29 01:00:24 +01:00
artica 12e95f9920 Auto-updated build strings. 2023-12-28 01:00:27 +01:00
artica 415682611a Auto-updated build strings. 2023-12-27 01:00:27 +01:00
felix.suarez 251bf60d5e Add warning time to CLI create 2023-12-26 15:47:42 -06:00
artica bc7ae01e13 Auto-updated build strings. 2023-12-26 01:00:19 +01:00
artica 2efc95587f Auto-updated build strings. 2023-12-25 01:00:19 +01:00
artica 7e91d94faa Auto-updated build strings. 2023-12-24 01:00:17 +01:00
artica 3a5fe1acb0 Auto-updated build strings. 2023-12-23 01:00:25 +01:00
artica 2d06d5f94d Auto-updated build strings. 2023-12-22 01:00:27 +01:00
felix.suarez f36d36a34f Modify the place where maintenance lines are added 2023-12-21 11:20:57 -06:00
artica 82bc2c3f98 Updated version and build strings. 2023-12-21 17:13:20 +01:00
artica ffec658ee8 Auto-updated build strings. 2023-12-21 01:00:28 +01:00
artica e947ac4f00 Auto-updated build strings. 2023-12-20 01:00:27 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
artica 43fbc6eca4 Auto-updated build strings. 2023-12-19 01:00:37 +01:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
artica 0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
artica 2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica 9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
artica d81805d2c2 Auto-updated build strings. 2023-12-15 01:00:29 +01:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
Rafael Ameijeiras abe950e7d7 Merge branch 'ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event' into 'develop'
Ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event

Closes pandora_enterprise#11731

See merge request artica/pandorafms!6293
2023-12-14 15:11:27 +00:00
artica dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
felix.suarez f5b4cf2359 CLI allow create events with event_custom_id 2023-12-13 10:45:48 -06:00
felix.suarez e3fc6c13f5 Change api_call to manage_api_call 2023-12-12 22:29:47 -06:00
artica 14f8deebca Auto-updated build strings. 2023-12-13 01:00:28 +01:00
artica ffdf0d81b9 Auto-updated build strings. 2023-12-12 01:00:30 +01:00
artica 5351af2f7a Auto-updated build strings. 2023-12-11 01:00:22 +01:00
artica 16f75809f1 Auto-updated build strings. 2023-12-10 01:00:20 +01:00
artica ef339a1bbe Auto-updated build strings. 2023-12-09 01:00:21 +01:00
artica d83a64da9c Auto-updated build strings. 2023-12-08 01:00:28 +01:00
artica 62901b6a70 Auto-updated build strings. 2023-12-07 01:00:21 +01:00
artica 0481af6b50 Auto-updated build strings. 2023-12-06 01:00:26 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
Daniel Rodriguez 868598b1b2 Merge branch 'ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db' into 'develop'
delete agents pandora_db pandora_enterprise#12293

See merge request artica/pandorafms!6656
2023-12-04 13:39:10 +00:00
Daniel Rodriguez 9922c29579 Merge branch 'ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db' into 'develop'
Ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db

See merge request artica/pandorafms!6726
2023-12-04 11:53:16 +00:00
artica 3eac0f9661 Auto-updated build strings. 2023-12-04 01:00:21 +01:00
Enrique Martin 988841084c Fixed log modules generation 2023-12-04 00:00:41 +01:00
Enrique Martin 7892eb5c0c Added log modules 2023-12-03 23:52:55 +01:00
artica a2ea6f33f3 Auto-updated build strings. 2023-12-03 01:00:20 +01:00
artica 69229987f8 Auto-updated build strings. 2023-12-02 01:00:24 +01:00
daniel b31f24aca4 remove conf agents pandora_enterprise#12293 2023-12-01 11:05:01 +01:00
daniel 95fb500fb5 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-12-01 10:33:21 +01:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
felix.suarez 07d6a4cdf6 Avoid add last_compact_offset when is zero 2023-11-30 09:19:50 -06:00
daniel 0d58aaf44d fix errors pandora_enterprise#12293 2023-11-30 10:25:16 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
daniel dcb04a64ee fix delete conf agents pandora_enterprise#12293 2023-11-29 14:30:45 +01:00
daniel 1bacc36bc0 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-11-29 11:56:51 +01:00
artica 8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
artica 8bb4758439 Auto-updated build strings. 2023-11-28 01:00:28 +01:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
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
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