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

2080 Commits

Author SHA1 Message Date
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop' 
Added macro _agentos_

See merge request !275
 2017-04-25 16:18:00 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
artica e32d353cc2 Revert "Updated version and build strings." 
This reverts commit 8c49cfffd7.
 2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
vgilc dd5ad8324c Merge branch '686-problema-con-el-Export-server' into 'develop' 
fixed problem with alias in export server

See merge request !342
 2017-04-07 12:17:01 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
Daniel Maya 2ff3d785ba fixed problem with alias in export server 2017-04-04 16:22:48 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
nramon 5036ad9467 Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop' 
Metaconsole nodes will always sync the agent cache.

See merge request !333
 2017-03-31 14:50:12 +02:00
Ramon Novoa 03b0b3cb33 Metaconsole nodes will always sync the agent cache. 2017-03-31 11:39:25 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
Ramon Novoa 7f1030abd6 Add support for the new metaconsole licensing mode. 2017-03-30 09:47:00 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
Ramon Novoa b574a92f35 Fix a typo. 2017-03-24 11:02:05 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
Ramon Novoa e5d29d4c3b Small speed optimization. Check parent_detection from the outer loop. 2017-03-23 16:15:57 +01:00
Ramon Novoa 81fc537426 Merge the Recon module from the Satellite Server. 2017-03-23 14:33:46 +01:00
Ramon Novoa 4886c8ffb7 Disable the VLAN cache by default. 2017-03-23 14:33:46 +01:00
Ramon Novoa c957faad18 Add support for high capacity counters. 2017-03-23 14:33:46 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
daniel a1b3c448a0 fixed macro prevdata for modules type string 2017-03-22 17:52:05 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
Ramon Novoa a314495a2e Do not reset the progress when multiple subnets are scanned. 2017-03-14 11:51:01 +01:00
Ramon Novoa fcb75ec1aa Clean blanks and HTML entities from recon tasks. 2017-03-14 08:28:12 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Ramon Novoa 4a0a9bbd37 Move the Recon module to PandoraFMS. 2017-03-13 11:14:21 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
daniel b7bf236f3c fixed error in macros send mail 2017-03-10 13:51:27 +01:00
Ramon Novoa 472d484583 Fix a typo. 2017-03-10 12:04:35 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa a022592e10 Merge the Recon module from the Satellite Server. 2017-03-10 10:36:37 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
daniel e7b14143ed add new macro _homeurl_ 2017-03-09 10:57:03 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01: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
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
artica cf5ade4972 Auto-updated build strings. 2017-03-06 09:13:26 +01:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00
Ramon Novoa a14769a683 Add additional parameters to configure dynamic intervals. 2017-03-02 15:02:51 +01:00
artica 01784bd083 Auto-updated build strings. 2017-03-02 00:01:16 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
artica 02332570de Revert "Updated version and build strings." 
This reverts commit 8867a17baf.
 2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
Ramon Novoa ac3f45e5d3 Add the dynamic_updates configuration option with examples. 2017-03-01 14:59:10 +01:00
Ramon Novoa 1c88b6370b Make sure the alias is always set. 2017-03-01 11:18:45 +01:00
artica 8d092ef24d Auto-updated build strings. 2017-03-01 00:01:17 +01:00
Daniel Maya d95cd086d2 Changed name by alias in the alert message 2017-02-28 11:43:15 +01:00
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +01:00
Ramon Novoa e2022297bb Add a configuration option for the Sync Server's block size. 2017-02-27 16:15:05 +01:00
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
Ramon Novoa cdac626174 Add Sync Server SSL configuration parameters to Config.pm. 
(cherry picked from commit d569d5b121)
 2017-02-24 08:20:09 +01:00