233 Commits

Author SHA1 Message Date
daniel
dba0bbebeb ITSM pandora_enterprise#11471 2023-08-18 13:46:27 +02:00
daniel
8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel
dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Matias Didier
203446af70 Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop'
Ent 11475 cambiar copyrights backend agentes

See merge request artica/pandorafms!6172
2023-07-04 08:49:14 +00:00
Félix Suárez
c926349c67 Update copyright years 2023-07-03 09:20:25 -06:00
Daniel Cebrian
70ae1f20e4 #11648 fixed email send with encrypt password 2023-06-27 15:11:18 +02:00
Félix Suárez
e17e2ee66c Replace "Artica Soluciones Tecnol[o,ó]gicas S.L" 2023-06-23 15:08:07 -06:00
Ramon Novoa
7c85b530ad Add support for the Enterprise Netflow Server. 2023-03-22 12:49:39 +01:00
alejandro.campos@artica.es
6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
alejandro.campos@artica.es
ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Rodriguez
e510002c45 Merge branch 'ent-8494-13243-checks-custom-discovery-sap' into 'develop'
avoid warnings in error.log when non-defined strings

See merge request artica/pandorafms!4778
2022-03-31 11:48:39 +00:00
fbsanchez
d34aafec6b avoid warnings in error.log when non-defined strings 2022-03-24 13:33:18 +01:00
fbsanchez
609609c0ea lsb-release to native /etc/*ease 2022-03-22 14:30:47 +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
Ramon Novoa
86db050753 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2022-02-24 18:47:25 +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
fbsanchez
3caa8fd14f Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-07 18:32:10 +01:00
fbsanchez
cea110e209 Alert server improved 2022-02-02 13:37:45 +01:00
Daniel Barbero Martin
acf9b4e6f3 add new macros #3763 2022-01-18 16:01:12 +01:00
Ramon Novoa
ad0b8db4d0 Merge remote-tracking branch 'origin/master' into master-alt 2021-12-17 10:32:32 +01:00
Ramon Novoa
55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
fbsanchez
ac890ee165 some tools for policy-auto-application 2021-11-08 14:00:26 +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
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
fbsanchez
d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
Ramon Novoa
165dea9fe7 Merge remote-tracking branch 'origin/master' into master-alt 2021-09-15 17:21:33 +02:00
fbsanchez
ce3dce926a use safe_output only when message is going to be used logger 2021-09-06 18:14:58 +02:00
fbsanchez
e075c8339d CorrelationServer rc1 2021-09-01 17:56:14 +02:00
fbsanchez
f0791cbd4f WIP CorrelationServer 2021-08-27 15:07:14 +02:00
Ramon Novoa
f8bcd1660f Add the AlertServer to the repo.
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
Ramon Novoa
f9b090d857 Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt 2021-06-24 12:58:44 +02:00
fbsanchez
7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez
b3ac981681 Gracefully stop pandorafms threads 2021-05-14 12:43:18 +02:00
fbsanchez
d160737fb2 Avoid die while decoding erroneus json data 2021-05-07 14:15:16 +02:00
Ramon Novoa
e40014444f Merge branch 'develop' into ent-5620-nuevo-compilador-para-backend 2021-05-05 17:23:29 +02:00
José González
d0c3174d8c Improved business logic for cron 2021-04-27 12:19:20 +02:00
Ramon Novoa
8edaad4e5a Push /usr/lib/perl5 to the back of the module search path.
When /usr/lib/perl5 is added to the front of the module search path it
takes precedence over libraries distributed with binary versions of
Pandora FMS. This can be fixed by pushing it to the back instead.
2021-04-15 17:56:02 +02:00
fbsanchez
9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
Junichi Satoh
a88a563b45 Fixed garbled characters with multi-byte characters. 2021-01-28 10:49:54 +09:00
Daniel Rodriguez
b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Jose Gonzalez
13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
José González
623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
fbsanchez
eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez
04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
fbsanchez
b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
fbsanchez
d292b06e9f WIP GCP CE 2020-09-24 18:35:50 +02:00
fbsanchez
534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez
c6db39dce1 Smart services RC1 2020-07-06 12:06:12 +02:00
alejandro-campos
27770b91da fix encoding 2020-07-01 12:51:00 +02:00