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

183 Commits

Author SHA1 Message Date
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 74c9e604e8.
 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
Alejandro Fraguas 67ab08fc41 Merge branch 'ent-3344-7304-procesado-de-XML-con-acentos' into 'develop' 
added accent compatibility Dataserver

See merge request artica/pandorafms!2109

Former-commit-id: 7e7479c3d82aeb398fb0c76fe7df61d8522af2b3
 2019-02-04 14:05:40 +01:00
fermin831 78fd6850e7 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm

Former-commit-id: 423e2d818730f97ef1ed0a286f717243731b5363
 2019-01-29 18:15:59 +01:00
daniel 2e2774f256 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
 2019-01-22 17:42:47 +01:00
fermin831 1ecd656513 Data server can handle several events from a single agent 
Former-commit-id: 2f47df007eb27cf181b130aac79d35698de67387
 2019-01-22 12:59:54 +01:00
daniel 4236b55694 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
 2019-01-22 09:00:47 +01:00
fermin831 c9e11780bb Added matrix_data XML 
Former-commit-id: 8b927f2e3fd2c78058d4a736c371e4274c94bc1a
 2019-01-21 18:49:20 +01:00
fermin831 e5eab4ca67 Added events in DataServer processed XML 
Former-commit-id: db7be33ef7e6e5f58106dfef2cfb042637624f27
 2019-01-21 18:49:00 +01:00
fermin831 e540d96eb2 Revert "Added events in DataServer processed XML" 
This reverts commit cbe518dc53 [formerly e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6].


Former-commit-id: 759a3da8b31fef88d2d7b22daeae09062f3bd80c
 2019-01-21 18:43:47 +01:00
fermin831 64b8223f12 Revert "Added matrix_data XML" 
This reverts commit d970c6628a [formerly cd26d436e6745a456df95484120d1b96439b274d].


Former-commit-id: 7f5d3d628605a2458622174edcd56916a3a63cd9
 2019-01-21 18:43:09 +01:00
fermin831 d970c6628a Added matrix_data XML 
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
 2019-01-21 18:27:31 +01:00
fermin831 cbe518dc53 Added events in DataServer processed XML 
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
 2019-01-21 15:12:46 +01:00
daniel dc24599f18 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
 2019-01-21 09:22:42 +01:00
fbsanchez 81a6584d1c Discovery modules (IPAM: DHCP) 
Former-commit-id: 1849f6625fbd19dd2d6362d3ea20dc16ac73c29b
 2019-01-17 18:42:38 +01:00
fbsanchez 2e8e911ca7 added safe_input to custom_fields - value while storing them in db 
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
 2019-01-15 18:22:55 +01:00
fbsanchez eb1ce680d8 added accent compatibility Dataserver 
Former-commit-id: 039f7a5b776715c8c6a69bc6ab025dd9ff33fad9
 2019-01-04 10:42:24 +01:00
fbsanchez cf15f715b6 safe_input in custom_field operations Dataserver 
Former-commit-id: 7cbb8fdb97a1265201f6dd5600ad58664cc89c29
 2019-01-03 18:00:49 +01:00
fbsanchez c5501e2b0a safe_input to custom field data received (dataserver) 
Former-commit-id: 4f38e951d02d7e3645b632cd0e48b52647565966
 2019-01-03 11:18:26 +01:00
Ramon Novoa be79ae83fb Remove a semaphore that is no longer needed. Thanks fbsanchez! 
Ref pandora_enterprise#3060.
 2018-11-12 15:32:37 +01:00
nramon c6dc5f9ee2 Merge branch 'develop' into 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2018-08-08 11:27:56 +02:00
Ramon Novoa 27d1d1d745 Add support for trap data coming from XML files. 
Ref pandora_enterprise#2333.
 2018-08-08 09:08:08 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
fermin831 3c1f192ab4 [GeoIP] Added geolocalization to Recon and DataServer 2018-07-05 16:43:41 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
fermin831 cc26124289 Rebranding open server 2018-05-17 16:12:44 +02:00
fermin831 d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa b63a1c4ce8 Remove debugging messages. 2018-03-13 17:52:34 +01:00
fermin831 e03ad1a1bf [Server] Fixed undefined module_interval 2018-03-13 13:03:44 +01:00
fermin831 cedf825526 [Server] [Linux Agent] Added cron_interval to modules XML to avoid cron blocked modules go to unknown 2018-02-20 18:31:08 +01:00
vgilc 227eb2b9cb Merge branch '1465-optimizacion-en-el-procesado-de-xml' into 'develop' 
Performance improvements. Rewrote safe_input and safe_output.

See merge request artica/pandorafms!925
 2017-11-29 17:08:03 +01:00
fermin831 f1cbaec98b Added safe_output to server events 2017-10-25 12:11:56 +02:00
Ramon Novoa 90366e7e58 Performance improvements. Rewrote safe_input and safe_output. 
Ref pandora_enterprise#1465.
 2017-10-13 15:50:26 +02:00
Arturo Gonzalez 1e6f3a9d9b Borja fix this error 2017-10-10 11:44:15 +02:00