tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-14 05:28:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,813 Commits 34 Branches 30 Tags
Commit Graph

216 Commits

Author SHA1 Message Date
Matias Didier
e4aea936e0 Merge branch 'ent-10231-limpieza-de-codigo-del-server-transaccional' into 'develop' 
Ent-10231 limpieza-de-codigo-del-server-transaccional

See merge request artica/pandorafms!6073
 2023-08-07 08:18:07 +00:00
Daniel Rodriguez
84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00: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
Félix Suárez
e17e2ee66c Replace "Artica Soluciones Tecnol[o,ó]gicas S.L" 2023-06-23 15:08:07 -06:00
Félix Suárez
8e92f612fd Restore module_conf name 2023-06-11 14:06:29 -06:00
Félix Suárez
a59f29f557 Remove transactional_agent references 2023-06-08 10:14:54 -06:00
felix.suarez
045a773937 Revert "$task rename" to "$file_name rename" 2023-06-06 09:56:16 -05:00
felix.suarez
3ed55ec88a fix: Change $file_name variable for $task 2023-06-05 12:36:53 -05:00
Félix Suárez
593d197016 Remove reference to tnetwork_matrix 2023-06-04 16:12:29 -06:00
felix.suarez
fd5ba3d0f8 Change to reduce event text from XML parse error 2023-06-02 16:06:28 -05:00
Ramon Novoa
a200362ffe Make sure producers always release agent locks. 
A MySQL error that didn't bring the server down could result in a
consumer returning without releasing its agent lock.
 2023-01-31 09:54:31 +01:00
Calvo
63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
Ramon Novoa
45a4a4084d Add support for smart queuing to the DataServer. 
The DataServer now supports smart queuing, which processes recent
XML data files very fast at the expense of buffered data files.
 2022-09-30 11:03:18 +02:00
Calvo
067b7a821f WIP:Move inventory to open 2022-09-13 12:31:09 +02:00
Jimmy Olano
e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Ramon Novoa
f198e37876 Add support for IPAM XML files. 
The Data Server can now process IPAM data coming from Satellite Servers
through XML files.
 2022-08-08 13:50:25 +02:00
Calvo
3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Calvo
0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Ramon Novoa
5e33df93ac Auto-assign Satellite Servers to agents when possible. 2022-06-09 13:29:43 +02:00
alejandro.campos@artica.es
5c029effdb minor fix 2022-04-28 11:51:48 +02:00
Ramon Novoa
74bfe39690 Merge remote-tracking branch 'origin/develop' into master-alt 2022-01-25 15:41:30 +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
Ramon Novoa
55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
fbsanchez
f7ec31cc72 Avoid MC process data in dataserver 2021-09-27 10:07:23 +02:00
Ramon Novoa
e40014444f Merge branch 'develop' into ent-5620-nuevo-compilador-para-backend 2021-05-05 17:23:29 +02:00
fbsanchez
24976c4860 Disable timezone offset while setting timestamp from server 2021-04-27 17:58: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
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Ramon Novoa
4e32d4efe0 Always unlock, since FIFO mode may lock now. 2020-09-02 18:10:06 +02:00
Daniel Rodriguez
e5d4208ac9 Merge branch 'ent-5355-9422-9700-actualizacion-de-umbrales-mediante-xml' into 'develop' 
Forced thresholds ENT

See merge request artica/pandorafms!3314
 2020-08-14 09:22:47 +02:00
Ramon Novoa
b487153800 Lock on LIFO mode if the agent does not exist to prevent duplicates. 
Ref pandora_enterprise#5908
 2020-07-10 13:21:59 +02:00
fbsanchez
3a2c2f1c38 Forced thresholds ENT 2020-06-17 13:14:22 +02:00
fbsanchez
2481bcc669 Update default value for use_xml_timestamp 2020-05-26 13:56:39 +02:00
fbsanchez
668027e794 Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml 2020-01-29 16:31:14 +01:00
fbsanchez
c8c2141f83 Added enc_dir to Encoding_Path (ExpatXS) 2020-01-29 16:31:08 +01:00
fbsanchez
77863ae150 Fix Windows strftime reference 2020-01-28 20:15:53 +01:00
fbsanchez
70d51413c9 timelocal to strftime 2020-01-02 15:46:27 +01:00
daniel
960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Jose Gonzalez
43261bd3f8 Changed parameter of use_xml_timestamp 2019-10-09 15:46:44 +02:00
fbsanchez
0abb2ae987 Revert "Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'"" 
This reverts commit 74c9e604e8a68bf55565c724d8caa27142f9b1de.
 2019-09-02 15:24:21 +02:00
Daniel Rodriguez
74c9e604e8 Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'" 
This reverts merge request !2644
 2019-08-28 14:19:59 +02:00
fbsanchez
32ad249024 XML::SAX::ExpatXS thread protection 2019-08-07 13:45:57 +02:00
fbsanchez
4e42db2981 XML::SAX::ExpatXS thread protection 2019-08-07 13:43:13 +02:00
fbsanchez
d902afc7db XML::SAX::ExpatXS thread protection 2019-08-07 13:18:44 +02:00
fbsanchez
b07be3885d XML::SAX::ExpatXS thread protection 2019-08-07 12:41:15 +02:00
Ramon Novoa
ffa713da20 Add autocreate_group_focre (see pandora_enterprise#744). 2019-07-25 13:16:15 +02:00
Ramon Novoa
13de5dbd51 Faster XML processing in LIFO mode. 
Ref pandora_enterprise#2253
 2019-07-18 13:36:24 +02:00
Daniel Barbero Martin
5ca01b0294 add ff_type linux agent 
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
 2019-04-01 10:27:24 +02:00
fermin831
4930968ec9 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/godmode/reporting/reporting_builder.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/functions_reports.php

Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
 2019-02-21 17:21:42 +01:00