Commit Graph

5295 Commits

Author SHA1 Message Date
artica 01c2fd5da4 Auto-updated build strings. 2022-03-30 01:00:52 +02:00
artica a54344348c Auto-updated build strings. 2022-03-29 01:00:47 +02:00
Ramon Novoa ecd77dffba Fix locking issues in pandora_db.
Implement a persistent lock using Pandora FMS's database. Ref.
pandora_enterprise#8565.
2022-03-28 20:56:53 +02:00
artica 775942e0b6 Auto-updated build strings. 2022-03-28 01:00:39 +02:00
artica 859f689ade Auto-updated build strings. 2022-03-27 01:00:30 +01:00
artica 5f1b81b089 Auto-updated build strings. 2022-03-26 01:00:50 +01:00
Daniel Rodriguez ea2bfcefb2 Merge branch 'ent-8654-No-se-puede-aplicar-una-politica-manualmente-a-un-solo-grupo' into 'develop'
fixed application of policies to individual groups

See merge request artica/pandorafms!4763
2022-03-25 10:45:36 +00:00
artica 0bf8c75d2f Auto-updated build strings. 2022-03-25 01:00:41 +01:00
Daniel Rodriguez 64947b75cd Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop'
change storage format of custom data field in DB

See merge request artica/pandorafms!4766
2022-03-24 16:19:39 +00:00
fbsanchez d34aafec6b avoid warnings in error.log when non-defined strings 2022-03-24 13:33:18 +01:00
artica f190a85560 Auto-updated build strings. 2022-03-24 01:00:42 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
artica 3dcdd13fe4 Auto-updated build strings. 2022-03-23 01:00:43 +01:00
fbsanchez 609609c0ea lsb-release to native /etc/*ease 2022-03-22 14:30:47 +01:00
artica 79162a787b Auto-updated build strings. 2022-03-22 01:00:46 +01:00
artica c736fbe726 Auto-updated build strings. 2022-03-21 01:00:36 +01:00
artica 95057697d8 Auto-updated build strings. 2022-03-20 01:00:36 +01:00
artica db28f5fbbe Auto-updated build strings. 2022-03-19 01:00:42 +01:00
Daniel Rodriguez a4947d5449 Merge branch 'ent-8622-alert-server-solo-el-master-dispara-alertas' into 'develop'
RR alertserver

See merge request artica/pandorafms!4761
2022-03-18 11:05:36 +00:00
artica e088c0e564 Auto-updated build strings. 2022-03-18 01:00:41 +01:00
José González db3f943e09 Fix issue with fields in alerts 2022-03-17 17:45:08 +01:00
artica 1bc96bb92d Auto-updated build strings. 2022-03-17 01:00:40 +01:00
artica f04a5be8e4 Auto-updated build strings. 2022-03-16 01:00:48 +01:00
alejandro.campos@artica.es 27ff467a74 fixed application of policies to individual groups 2022-03-15 13:44:40 +01:00
artica 1ee2387d6c Auto-updated build strings. 2022-03-15 01:00:17 +01:00
fbsanchez 97a48ab714 RR alertserver 2022-03-14 19:24:29 +01:00
artica 72fce3b9a3 Auto-updated build strings. 2022-03-14 01:00:14 +01:00
artica e7637d2f07 Auto-updated build strings. 2022-03-13 01:00:15 +01:00
artica a232747e01 Auto-updated build strings. 2022-03-12 01:00:15 +01:00
artica 36aea89db6 Auto-updated build strings. 2022-03-11 01:00:18 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
Daniel Rodriguez 1c347fa3ca Merge branch 'ent-8594-permisos-errorlog-file' into 'develop'
Set min permissions to errorlog_file

See merge request artica/pandorafms!4705
2022-03-09 15:06:10 +00:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
fbsanchez 690de69aea agentmodule status str is N/A If is not defined 2022-03-02 12:20:47 +01:00
fbsanchez 9c3a6665eb str comparation 2022-03-02 12:13:20 +01:00
fbsanchez 3aaa868155 errata fix0 2022-03-02 12:09:13 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f5bf7bbd72 Merge branch 'ent-5620-nuevo-compilador-para-backend' into 'develop'
Ent 5620 nuevo compilador para backend

See merge request artica/pandorafms!4653
2022-03-01 18:13:27 +00:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop'
some tools for policy-auto-application

See merge request artica/pandorafms!4526
2022-03-01 12:53:36 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Daniel Rodriguez d1cc6f6295 Merge branch 'ent-8631-no-se-disparan-las-alertas-correladas-con-schedule-en-formato-antiguo' into 'develop'
extra checks before translate

See merge request artica/pandorafms!4722
2022-02-25 13:16:49 +00:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
fbsanchez ce87cc6ec2 extra checks before translate 2022-02-24 19:09:09 +01:00
Ramon Novoa 86db050753 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2022-02-24 18:47:25 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop'
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
2022-02-24 09:55:40 +00:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
Conflicts:
	pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
fbsanchez 4cd8006db4 Discovery, notify critical issues in console 2022-02-22 18:48:35 +01:00
Daniel Rodriguez 4c31e4cda3 Merge branch 'ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server' into 'develop'
Alert server improved

See merge request artica/pandorafms!4673
2022-02-22 17:03:12 +00:00
fbsanchez 6817278c2f Allow both behaviours in alert time slots 2022-02-22 11:58:53 +01:00
artica 4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
artica 9ddc8768d4 Auto-updated build strings. 2022-02-21 01:00:18 +01:00
artica 2fe7227190 Auto-updated build strings. 2022-02-20 01:00:17 +01:00
artica db4540cdb5 Auto-updated build strings. 2022-02-19 01:00:22 +01:00
Daniel Rodriguez c460e20537 Merge branch 'ent-6802-super-8' into 'develop'
Super 8

See merge request artica/pandorafms!4622
2022-02-18 09:33:24 +00:00
Kike 5458cd7a44 Set min permissions to errorlog_file 2022-02-18 10:09:18 +01:00
artica 5e69f1719e Auto-updated build strings. 2022-02-18 01:00:19 +01:00
fbsanchez e885af19f9 minor code style change 2022-02-17 11:39:49 +01:00
artica d65eaed8ba Auto-updated build strings. 2022-02-17 01:00:08 +01:00
artica b27dd1c3ef Updated version and build strings. 2022-02-16 17:27:01 +01:00
fbsanchez 261fbe0ba3 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-16 10:17:24 +01:00
artica a6583e7010 Auto-updated build strings. 2022-02-16 01:00:21 +01:00
artica bcde7814af Auto-updated build strings. 2022-02-15 01:00:20 +01:00
artica 06321f438b Auto-updated build strings. 2022-02-14 01:00:20 +01:00
artica 33f256e9b5 Auto-updated build strings. 2022-02-13 01:00:15 +01:00
artica c40b4bbe9b Auto-updated build strings. 2022-02-12 01:00:21 +01:00
artica a39232f227 Auto-updated build strings. 2022-02-11 01:00:23 +01:00
Daniel Rodriguez af400e0043 Merge branch 'ent-8461-13016-bloqueo-discovery-con-tarea-oracle' into 'develop'
Added signal control in eval (discovery)

See merge request artica/pandorafms!4650
2022-02-10 14:57:20 +00:00
artica 1d86c1ea48 Auto-updated build strings. 2022-02-10 01:00:21 +01:00
artica 98fc41c385 Auto-updated build strings. 2022-02-09 01:00:22 +01:00
fbsanchez e26aca338a Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-08 22:08:37 +01:00
Daniel Rodriguez f659016c6f Merge branch 'ent-3943-Plantillas-de-alerta-con-varios-horarios' into 'develop'
WIP #3943

Closes pandora_enterprise#3943

See merge request artica/pandorafms!4595
2022-02-08 11:29:34 +00:00
artica b47003a7b4 Auto-updated build strings. 2022-02-08 01:00:17 +01:00
fbsanchez 3caa8fd14f Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-07 18:32:10 +01:00
Daniel Rodriguez 279ddb0eeb Merge branch 'ent-7978-timeout-en-ejecuciones-de-plugins' into 'develop'
Add a timeout message for Plug-in modules.

See merge request artica/pandorafms!4656
2022-02-07 17:19:51 +00:00
Daniel Barbero Martin dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
artica 11dc01c0c8 Auto-updated build strings. 2022-02-07 01:00:13 +01:00
artica c092748d0a Auto-updated build strings. 2022-02-06 01:00:16 +01:00
artica 2fc9625741 Auto-updated build strings. 2022-02-05 01:00:21 +01:00
artica 887162322c Auto-updated build strings. 2022-02-04 01:00:21 +01:00
artica 7d405d8ded Auto-updated build strings. 2022-02-03 01:00:20 +01:00
Ramon Novoa 54171e56e7 Make the timeout error message more user friendly. 2022-02-02 17:32:28 +01:00
Daniel Rodriguez 93681fd58f Merge branch 'ent-7974-timeout-en-ejecuciones-de-alertas' into 'develop'
Lower the verbosity of alert timeout messages.

See merge request artica/pandorafms!4654
2022-02-02 14:05:47 +00:00
fbsanchez cea110e209 Alert server improved 2022-02-02 13:37:45 +01:00
fbsanchez 5804d2f404 Alerts in slots 2022-02-02 11:29:25 +01:00
artica 1185111e19 Auto-updated build strings. 2022-02-02 01:00:21 +01:00
Daniel Rodriguez 75f8c02eaf Merge branch 'ent-3763-Nuevas-macros-alertas' into 'develop'
add new macros #3763

See merge request artica/pandorafms!4640
2022-02-01 09:34:15 +00:00
artica 9e12abcfc6 Auto-updated build strings. 2022-02-01 01:00:17 +01:00
artica 73b754f52d Auto-updated build strings. 2022-01-31 01:00:10 +01:00
artica 8001f6b1f2 Auto-updated build strings. 2022-01-30 01:00:15 +01:00
artica 6ffef13b9a Auto-updated build strings. 2022-01-29 01:00:20 +01:00
artica b23f101812 Auto-updated build strings. 2022-01-28 01:00:20 +01:00
artica 4da16bedf8 Auto-updated build strings. 2022-01-27 01:00:23 +01:00
Ramon Novoa 28a3687bfa Add a timeout message for Plug-in modules.
Ref. pandora_enterprise#7978.
2022-01-26 14:41:27 +01:00
Ramon Novoa dc74b7812e Lower the verbosity of alert timeout messages.
Ref. pandora_enterprise#7974.
2022-01-26 12:09:30 +01:00
artica 11e0c99e74 Auto-updated build strings. 2022-01-26 01:00:23 +01:00
fbsanchez 8133515b6c Added signal control in eval (discovery) 2022-01-25 21:59:31 +01:00
Ramon Novoa 74bfe39690 Merge remote-tracking branch 'origin/develop' into master-alt 2022-01-25 15:41:30 +01:00
vgilc 6c378a9490 Merge branch 'ent-8405-Bug-en-informe-de-acciones-de-alerta' into 'develop'
fixed bug in monitoring event creation

See merge request artica/pandorafms!4631
2022-01-25 09:56:15 +00:00
artica bdae223944 Auto-updated build strings. 2022-01-25 01:00:20 +01:00
artica cc7b87344b Auto-updated build strings. 2022-01-24 01:00:16 +01:00
artica 0ca0123a27 Auto-updated build strings. 2022-01-23 01:00:17 +01:00
artica 4781c7f680 Auto-updated build strings. 2022-01-22 01:00:22 +01:00
artica 480d475a75 Auto-updated build strings. 2022-01-21 01:00:20 +01:00
artica 42d1ccbc13 Auto-updated build strings. 2022-01-20 01:00:18 +01:00
artica a8150e3cb5 Auto-updated build strings. 2022-01-19 01:00:19 +01:00
Daniel Barbero Martin acf9b4e6f3 add new macros #3763 2022-01-18 16:01:12 +01:00
artica 49bf10f0f8 Auto-updated build strings. 2022-01-18 01:00:39 +01:00
artica 98660cd0e3 Auto-updated build strings. 2022-01-17 01:00:26 +01:00
artica 84c4b52d57 Auto-updated build strings. 2022-01-16 01:00:16 +01:00
artica e8b594a03b Auto-updated build strings. 2022-01-15 01:00:18 +01:00
alejandro.campos@artica.es f9bb085dad fixed bug in monitoring event creation 2022-01-14 09:05:50 +01:00
artica 55f8f09894 Auto-updated build strings. 2022-01-14 01:00:19 +01:00
artica 22305d7221 Auto-updated build strings. 2022-01-13 01:00:20 +01:00
Daniel Rodriguez f6f1064cdd Merge branch 'ent-8026-autocreate-group-pandora-server' into 'develop'
Add support for autocreate_group_name.

See merge request artica/pandorafms!4625
2022-01-12 15:16:51 +00:00
artica f10c1d3017 Auto-updated build strings. 2022-01-12 01:00:57 +01:00
Ramon Novoa f16bf7e2c8 Add support for autocreate_group_name.
autocreate_group_name works like autocreate_group, but let's you specify
the group name instead of its id. Ref. pandora_enterprise#8026.
2022-01-11 15:15:22 +01:00
artica 1afcf787b0 Auto-updated build strings. 2022-01-11 01:00:19 +01:00
artica cc58138f11 Auto-updated build strings. 2022-01-10 01:00:15 +01:00
artica 9b48d43374 Auto-updated build strings. 2022-01-09 01:00:16 +01:00
artica 18909156dd Auto-updated build strings. 2022-01-08 01:00:19 +01:00
artica 2b560d8806 Auto-updated build strings. 2022-01-07 01:00:18 +01:00
artica f44803eec2 Auto-updated build strings. 2022-01-06 01:00:19 +01:00
artica 68e63bd5fb Auto-updated build strings. 2022-01-05 01:00:20 +01:00
artica 13c3a6f27d Auto-updated build strings. 2022-01-04 01:00:18 +01:00
artica 31885b1ca9 Auto-updated build strings. 2022-01-03 01:00:15 +01:00
artica 8e82247c45 Auto-updated build strings. 2022-01-02 01:00:14 +01:00
artica 1f3fb9dfea Auto-updated build strings. 2022-01-01 01:00:16 +01:00
artica 8908e5c1b3 Auto-updated build strings. 2021-12-31 01:00:16 +01:00
artica d16734cced Auto-updated build strings. 2021-12-30 01:00:15 +01:00
artica d46435a0ad Auto-updated build strings. 2021-12-29 01:00:16 +01:00
artica 6cfd091d0e Auto-updated build strings. 2021-12-28 01:00:17 +01:00
Daniel Rodriguez 02dfea8e58 Merge branch 'ent-8304-correccion-en-comportamiento-al-aplicar-politicas' into 'develop'
Fix db lock stopping policy apply

See merge request artica/pandorafms!4589
2021-12-27 12:46:17 +00:00
artica 60a4d1cfc0 Auto-updated build strings. 2021-12-27 01:00:14 +01:00
artica 78657f0e7e Auto-updated build strings. 2021-12-26 01:00:15 +01:00
artica 2d0531e0a6 Auto-updated build strings. 2021-12-25 01:00:19 +01:00
artica 3da9a8ab91 Auto-updated build strings. 2021-12-24 01:00:22 +01:00
artica e7949e3480 Auto-updated build strings. 2021-12-23 01:00:17 +01:00
artica f534f8357d Auto-updated build strings. 2021-12-22 01:00:19 +01:00
artica ed4e1e4be4 Auto-updated build strings. 2021-12-21 01:00:19 +01:00
artica 0c1829a555 Auto-updated build strings. 2021-12-20 01:00:16 +01:00
artica 0d3d666a52 Auto-updated build strings. 2021-12-19 01:00:17 +01:00
artica b808f6fa0b Auto-updated build strings. 2021-12-18 01:00:21 +01:00
Ramon Novoa ad0b8db4d0 Merge remote-tracking branch 'origin/master' into master-alt 2021-12-17 10:32:32 +01:00
artica 95b85284dd Auto-updated build strings. 2021-12-17 01:00:21 +01:00
Calvo 0bad3761a7 Fix db lock stopping policy apply 2021-12-16 10:26:45 +01:00
artica 231221830b Auto-updated build strings. 2021-12-16 01:00:18 +01:00
artica 34204d4224 Auto-updated build strings. 2021-12-15 01:00:23 +01:00
artica 6d054051ea Updated version and build strings. 2021-12-14 15:32:04 +01:00
Daniel Rodriguez 873f56f551 Merge branch 'ent-8371-recorte-de-predicciones' into 'develop'
Clip predictions if the module has max. and min. values.

See merge request artica/pandorafms!4581
2021-12-14 14:08:18 +00:00
Ramon Novoa c06189af9f Clip predictions if the module has max. and min. values. 2021-12-14 11:30:03 +01:00
artica 859c632132 Auto-updated build strings. 2021-12-14 01:00:20 +01:00
Daniel Rodriguez 1c69c76789 Merge branch 'ent-3220-modulo-para-capacity-planning' into 'develop'
Ent 3220 modulo para capacity planning

See merge request artica/pandorafms!4578
2021-12-13 16:15:36 +00:00
Ramon Novoa b8565d59dc Add support for capacity planning modules.
Capacity planning modules replace traditional prediction modules. Ref.
pandora_enterprise#3220.
2021-12-13 12:28:58 +01:00
artica 88fe0b69cc Auto-updated build strings. 2021-12-13 01:00:16 +01:00
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
Ramon Novoa 4ed17b9dae Merge remote-tracking branch 'origin/ent-7456-modulos-de-tendencias-trending-modules' into ent-3220-modulo-para-capacity-planning 2021-12-09 10:55:20 +01:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
Ramon Novoa 642af39395 Add support for trend modules.
Ref. pandora_enterprise#7456.
2021-12-03 11:48:11 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Daniel Rodriguez 0e16c93c73 Merge branch 'ent-8114-12553-Falla-la-macro-moduledata-X-cuando-no-tienes-activo-el-historico-en-el-modulo' into 'develop'
Ent 8114 12553 falla la macro moduledata x cuando no tienes activo el historico en el modulo

See merge request artica/pandorafms!4486
2021-12-02 16:27:41 +00:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Rodriguez ef310cce4c Merge branch 'ent-fix-special-multibyte-characters-treatment' into 'develop'
Fixed special multibyte characters treatment.

See merge request artica/pandorafms!4524
2021-11-30 13:34:35 +00:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Ramon Novoa 5bf83bcc81 Add support for percentage module status thresholds. 2021-11-25 12:58:21 +01:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop'
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
2021-11-24 17:18:38 +00:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
artica f18a575b2a Auto-updated build strings. 2021-11-19 01:00:17 +01:00
Daniel Rodriguez 69a7af2131 Merge branch 'ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta' into 'develop'
Ent 7799 jerarquia fiels alertas snmp accion comando de alerta

See merge request artica/pandorafms!4322
2021-11-18 16:31:50 +00:00
Calvo 37dacfa499 g,k kjjMerge remote-tracking branch 'origin/develop' into ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta 2021-11-18 09:37:31 +01:00
artica a5cfe3869c Auto-updated build strings. 2021-11-18 01:00:18 +01:00
artica 7a290bfac6 Auto-updated build strings. 2021-11-17 01:00:19 +01:00
Daniel Rodriguez a940396b0d Merge branch 'ent-7379-macro-de-direcciones-en-network-y-pluginserver' into 'develop'
Rename the _address_n_ macro and add it to more servers.

Closes pandora_enterprise#7379

See merge request artica/pandorafms!4462
2021-11-16 12:07:54 +00:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
artica bf0be017b6 Updated version and build strings. 2021-11-11 19:06:08 +01:00
Ramon Novoa 55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
fbsanchez ac890ee165 some tools for policy-auto-application 2021-11-08 14:00:26 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Junichi Satoh 9c2aae2a44 Fixed special multibyte characters treatment.
They were not converted to html entities when storing to DB.
2021-11-08 10:00:43 +09:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop'
CorrelationServer

See merge request artica/pandorafms!4377
2021-10-29 10:07:25 +00:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
fbsanchez bf0064d486 Correlated alerts are not being linked to modules 2021-10-28 17:21:02 +02:00
fbsanchez 701c384c54 More accurated message when recovering event alerts 2021-10-28 13:01:18 +02:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez 2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
Daniel Rodriguez 0ec2bf30ce Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Fix SQL errors in action queries.

See merge request artica/pandorafms!4502
2021-10-27 15:45:33 +00:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Ramon Novoa cd3e20fefe Fix action information for SNMP alert events. 2021-10-26 17:40:03 +02:00
Ramon Novoa 35aa6b5258 Fix SQL errors in action queries. 2021-10-26 15:07:42 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
Ramon Novoa 356e1f9f2b Fix SQL errors in action queries. 2021-10-26 13:24:23 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop'
NCM

See merge request artica/pandorafms!4434
2021-10-26 08:21:01 +00:00
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
Daniel Maya bbbbbdd2bc #8114 remove history_data 2021-10-20 14:50:47 +02:00
Daniel Maya 829ca31e88 #8114 Fixed history_data 2021-10-20 10:52:40 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
2021-10-18 11:36:19 +00:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
Ramon Novoa 118b0c3ff0 Alias the action name when executing an alert.
When executing an alert, the name of the action retrieved by the Pandora
FMS Server was overwritten by the name of the command, since the names
of the columns are the same. Now the name of the action is aliased to
preserve it.
2021-10-14 11:02:48 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
Ramon Novoa 1344dee2c4 Add action information to alert events. 2021-10-11 10:43:41 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
Jose Gonzalez 0414b9991a Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-08 14:03:25 +02:00
Ramon Novoa 5d7cb5e4c7 Rename the _address_n_ macro and add it to more servers.
The _address_n_ macro did not work properly because of the partial match
with the _address_ macro. It has been renamed to_addressn_n_ (e.g.,
_addressn_1_, _addressn_2_, etc.) and added to the Network and Plug-in
servers. Fixes pandora_enterprise#7379.
2021-10-08 13:17:04 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
Daniel Rodriguez cc36fdc54f Merge branch 'ent-fix-webserver' into 'develop'
Fixed warnings and problem with multibyte characters on WebServer.

See merge request artica/pandorafms!4357
2021-10-05 09:51:58 +00:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
artica 0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica 7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +02:00
Daniel Rodriguez 1cdef62ceb Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop'
add agent_update_custom_fields on cli

See merge request artica/pandorafms!4281
2021-10-01 12:36:17 +00:00
artica 1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
marcos d0f08be953 update agent custom fields 2021-09-30 14:34:58 +02:00
marcos d54af52baf update agent custom fields 2021-09-30 12:50:59 +02:00
fbsanchez e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/mr/50.sql
2021-09-30 12:24:19 +02:00
artica 036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
Daniel Rodriguez ee8ae5cf76 Merge branch 'ent-8004-command-center-las-politicas-una-vez-aplicadas-no-se-marcan-en-verde-en-la-metaconsola' into 'develop'
Avoid MC process data in dataserver

See merge request artica/pandorafms!4427
2021-09-29 13:27:28 +00:00
Daniel Rodriguez f756cec3be Merge branch 'ent-7869-solucion-automatica-splitbrain-pandora-ha' into 'develop'
PandoraHA Splitbrain autorecovery

See merge request artica/pandorafms!4413
2021-09-29 09:58:29 +00:00
artica 06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
marcos 4e25442813 update agent custom fields 2021-09-28 11:20:26 +02:00
marcos a8a5289652 update agent custom fields 2021-09-28 09:31:06 +02:00
artica 201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
marcos 87eb16ef32 Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli 2021-09-27 17:08:03 +02:00
Daniel Rodriguez 83703b88fa Merge branch 'ent-5171-mejora-logs-discovery' into 'develop'
Discovery logs improvement

See merge request artica/pandorafms!4422
2021-09-27 14:37:09 +00:00
fbsanchez 4f76a44ffa Several fixes for correlation recovery 2021-09-27 15:12:20 +02:00
fbsanchez 1983403327 Some improvements 2021-09-27 14:50:34 +02:00
fbsanchez b7879f8815 CorrelationServer with iterative evaluation 2021-09-27 12:25:43 +02:00
fbsanchez f7ec31cc72 Avoid MC process data in dataserver 2021-09-27 10:07:23 +02:00
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Daniel Rodriguez 7a2c992c44 Merge branch 'ent-7952-comportamiento-extrano-procesamiento-dataserver' into 'develop'
Do not search the agent name in tagente.direccion.

See merge request artica/pandorafms!4387
2021-09-23 14:51:48 +00:00
fbsanchez 12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
2021-09-23 16:23:38 +02:00
Daniel Rodriguez f60c41ff30 Merge branch 'ent-8011-replicacion-de-eventos-genera-conexiones-infinitas' into 'develop'
Read event_replication from the database.

See merge request artica/pandorafms!4419
2021-09-23 10:32:54 +00:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Rodriguez 1aabb11c8c Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop'
Add simple email address validation.

See merge request artica/pandorafms!4417
2021-09-22 12:33:18 +00:00
fbsanchez f8ea92923a minor fixes 2021-09-22 11:44:32 +02:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
fbsanchez 5b8a391f99 Extra options pandora_ha auto-resync 2021-09-21 18:51:50 +02:00
Daniel Rodriguez 125f63a7a2 Merge branch 'ent-7695-eventos-con-entities-al-cambiar-info-de-eventos' into 'develop'
Fixed entities on text for custom events

See merge request artica/pandorafms!4235
2021-09-21 13:16:17 +00:00
fbsanchez b3114262c5 Discovery logs improvement 2021-09-21 12:15:34 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Ramon Novoa 15761e7b02 Read event_replication from the database.
Instead of reading event_replication from pandora_server.conf, read it
from the database. Ref. pandora_enterprise#8011.
2021-09-20 13:25:02 +02:00
Ramon Novoa 4a9cac6ef4 Add simple email address validation.
Add simple email address validation for internal email alerts. Prevents
connections to the SMTP server when no address is provided. Ref.
pandora_enterprise#8032.
2021-09-20 11:42:27 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
fbsanchez 2e764afac7 PandoraHA Splitbrain autorecovery 2021-09-15 21:38:10 +02:00
Ramon Novoa 165dea9fe7 Merge remote-tracking branch 'origin/master' into master-alt 2021-09-15 17:21:33 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
Ramon Novoa 74ae4efa9a Add action information to alert events. 2021-09-13 13:13:46 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
fbsanchez 6f50aed48d Some improvements 2021-09-08 19:48:20 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
fbsanchez ce3dce926a use safe_output only when message is going to be used logger 2021-09-06 18:14:58 +02:00
Ramon Novoa 7fbd5ed735 Do not search the agent name in tagente.direccion.
Ref. pandora_enterprise#7952.
2021-09-06 13:32:17 +02:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
fbsanchez d8b12233ed correlation_threads 2021-09-02 12:53:57 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
fbsanchez df95cbf960 Minor changes 2021-09-01 21:10:11 +02:00
fbsanchez e075c8339d CorrelationServer rc1 2021-09-01 17:56:14 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00