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

160 Commits

Author SHA1 Message Date
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
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 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 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
Arturo Gonzalez 391655f6fe Added images and Borsha fix 2017-10-09 17:11:08 +02:00
Ramon Novoa 96a3dfab43 Set @Parser::Expat::Encoding_Path instead of calling load_encoding. 
Parser::Expat::load_encoding doesn't seem to be thread safe. Set
@Parser::Expat::Encoding_Path instead to avoid problems.

Ref pandora_enterprise#1340.
 2017-09-28 15:18:21 +02:00
fermin831 787fb00d16 Avoid to overwrite the os_version when is empty 2017-09-11 17:46:56 +02:00
Ramon Novoa 48d303cf8f Fix a warning when there are multiple empty addresses. 2017-07-10 12:20:23 +02:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
Ramon Novoa e3205226e1 Make sure the alias is always set. 2017-02-21 14:24:50 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
Ramon Novoa 9fef698df4 Do not add module_parent to extended_info. 2017-02-16 11:44:02 +01:00
fbsanchez 83ca7e898f Minor fix (performance) 
Moved transactional subsystem enabled update to "new module" section
 2017-02-09 10:15:50 +01:00
Ramon Novoa af276ab7ac Do not constrain UTC time offsets. 2017-02-02 12:50:24 +01:00
Ramon Novoa 93d7cc5253 Remove debugging code. 2016-12-22 11:35:21 +01:00
Ramon Novoa 01217fe3b2 Add support to link modules via XML data files. 2016-12-14 12:59:31 +01:00
Ramon Novoa c11b1c1150 Parse group_id XML attributes. 2016-12-13 15:03:30 +01:00
m-lopez-f 9e5fe175a0 Fixed problems with module group when not exicts. 
(cherry picked from commit 62028a0b47)
 2016-12-05 10:08:05 +01:00
Ramon Novoa a8b113a6fc Added group password support. 2016-11-25 12:41:48 +01:00
Ramon Novoa f81af8b437 Added support for loading .enc files for XML::Parser. 
(cherry picked from commit 11e1f5eb1f)
 2016-11-15 11:31:59 +01:00
fbsanchez 2db5823746 Feature: Transactional agent flag 
When a module Transactional subsystem status is received, the agent
turns into transactional_agent
 2016-10-27 18:33:27 +02:00
Ramon Novoa 72e22dfc3a Read ff threshold related fields from XML data files. 2016-10-26 12:15:17 +02:00
Ramon Novoa 0987b7a1f6 Updated the Data Server to process agent aliases. 2016-09-27 15:52:27 +02:00
daniel 2100a72c47 ticket integria: 3542 fixed token autocreate allow create modules in agent if exist 2016-08-22 12:17:07 +02:00
fermin831 8c30cbd756 Added AUTODISABLE mode to agents Tickets #3497 2016-06-03 11:58:13 +02:00
fermin831 f397b657f1 Added new server_keepalive column to have individual keepalive TICKETS #3273 2016-03-15 16:02:27 +01:00
fermin831 55140d06dd Fixed cron updating problem TICKETS #3329 
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
 2016-02-05 09:56:37 +01:00