tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,122 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

248 Commits

Author SHA1 Message Date
Matias Didier 6afd246671 Merge branch 'ent-12221-16386-timestamp-de-modulo-en-xml-de-agente-satellite-no-se-tiene-en-cuenta-en-el-parametro' into 'develop' 
Fix data timestamps.

See merge request artica/pandorafms!6961
 2024-02-26 15:07:46 +00:00
Ramon Novoa 5373b17bac Fix data timestamps. 
Apply timezone offsets to data timestamps.
Ignore data timestamps if use_xml_timestamp is set to 0.
 2024-02-22 12:22:00 +01:00
Enrique Martin f7dbd8f3b2 Net scan improvements 2024-02-02 14:41:28 +01:00
felix.suarez 5cf9d70c6f Add config token for mail_subject_encoding 2024-01-11 09:58:06 -06:00
Calvo a497ae4369 Added function to pretty print json 2023-11-27 15:13:34 +01:00
Ramon Novoa 4060b27b72 Make LWP use IO::Socket::SSL instead of Net::SSL. 2023-11-02 12:51:27 +01:00
Calvo 936508174f Fix merge errors 2023-10-26 16:24:49 +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
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
Ramon Novoa 35db83647a Integrate MADE with Pandora FMS. 2023-10-11 13:31:13 +02:00
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Ramon Novoa c90cca5cb9 Add support for the new Event and Log Servers. 2023-10-04 14:07:11 +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
Calvo 0435a6998d Merge remote-tracking branch 'origin/develop' into ent-9670-mejoras-automonitorizacion 2023-09-14 13:48:30 +02:00
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
Calvo 5333dbb6e3 WIP:Automonitorization Upgrades 2023-06-29 17:06:59 +02: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