Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
This commit is contained in:
commit
7bcbe3f1ee
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 6.0RC1-150902
|
||||
Version: 6.0RC1-150904
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0RC1-150902"
|
||||
pandora_version="6.0RC1-150904"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
@ -41,7 +41,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '6.0RC1';
|
||||
use constant AGENT_BUILD => '150902';
|
||||
use constant AGENT_BUILD => '150904';
|
||||
|
||||
# Commands to retrieve total memory information in kB
|
||||
use constant TOTALMEMORY_CMDS => {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{150902}
|
||||
{150904}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "pandora_module_tcpcheck.h"
|
||||
#include "pandora_module_regexp.h"
|
||||
#include "pandora_module_plugin.h"
|
||||
#include "pandora_module_ping.h"
|
||||
#include "pandora_module_ping.h"
|
||||
#include "pandora_module_snmpget.h"
|
||||
#include "../pandora_strutils.h"
|
||||
#include <list>
|
||||
|
@ -97,14 +97,14 @@ using namespace Pandora_Strutils;
|
|||
#define TOKEN_PING ("module_ping ")
|
||||
#define TOKEN_PING_COUNT ("module_ping_count ")
|
||||
#define TOKEN_PING_TIMEOUT ("module_ping_timeout ")
|
||||
#define TOKEN_SNMPGET ("module_snmpget")
|
||||
#define TOKEN_SNMPVERSION ("module_snmp_version ")
|
||||
#define TOKEN_SNMPCOMMUNITY ("module_snmp_community ")
|
||||
#define TOKEN_SNMPAGENT ("module_snmp_agent ")
|
||||
#define TOKEN_SNMPGET ("module_snmpget")
|
||||
#define TOKEN_SNMPVERSION ("module_snmp_version ")
|
||||
#define TOKEN_SNMPCOMMUNITY ("module_snmp_community ")
|
||||
#define TOKEN_SNMPAGENT ("module_snmp_agent ")
|
||||
#define TOKEN_SNMPOID ("module_snmp_oid ")
|
||||
#define TOKEN_ADVANCEDOPTIONS ("module_advanced_options ")
|
||||
#define TOKEN_INTENSIVECONDITION ("module_intensive_condition ")
|
||||
#define TOKEN_UNIT ("module_unit ")
|
||||
#define TOKEN_UNIT ("module_unit ")
|
||||
#define TOKEN_MODULE_GROUP ("module_group ")
|
||||
#define TOKEN_CUSTOM_ID ("module_custom_id ")
|
||||
#define TOKEN_STR_WARNING ("module_str_warning ")
|
||||
|
@ -164,13 +164,13 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
|
|||
string module_crontab, module_cron_interval, module_post_process;
|
||||
string module_min_critical, module_max_critical, module_min_warning, module_max_warning;
|
||||
string module_disabled, module_min_ff_event, module_noseekeof;
|
||||
string module_ping, module_ping_count, module_ping_timeout;
|
||||
string module_ping, module_ping_count, module_ping_timeout;
|
||||
string module_snmpget, module_snmp_version, module_snmp_community, module_snmp_agent, module_snmp_oid;
|
||||
string module_advanced_options, module_cooked, module_intensive_condition;
|
||||
string module_unit, module_group, module_custom_id, module_str_warning, module_str_critical;
|
||||
string module_critical_instructions, module_warning_instructions, module_unknown_instructions, module_tags;
|
||||
string module_critical_inverse, module_warning_inverse, module_quiet, module_ff_interval;
|
||||
string macro;
|
||||
string macro;
|
||||
Pandora_Module *module;
|
||||
bool numeric;
|
||||
Module_Type type;
|
||||
|
@ -226,11 +226,11 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
|
|||
module_ping = "";
|
||||
module_ping_count = "";
|
||||
module_ping_timeout = "";
|
||||
module_snmpget = "";
|
||||
module_snmp_version = "";
|
||||
module_snmp_community = "";
|
||||
module_snmp_agent = "";
|
||||
module_snmp_oid = "";
|
||||
module_snmpget = "";
|
||||
module_snmp_version = "";
|
||||
module_snmp_community = "";
|
||||
module_snmp_agent = "";
|
||||
module_snmp_oid = "";
|
||||
module_advanced_options = "";
|
||||
module_cooked = "";
|
||||
module_intensive_condition = "";
|
||||
|
@ -428,7 +428,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
|
|||
}
|
||||
if (module_snmp_version == "") {
|
||||
module_snmp_version = parseLine (line, TOKEN_SNMPVERSION);
|
||||
}
|
||||
}
|
||||
if (module_snmp_community == "") {
|
||||
module_snmp_community = parseLine (line, TOKEN_SNMPCOMMUNITY);
|
||||
}
|
||||
|
@ -1143,6 +1143,9 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
|
|||
module = new Pandora_Module_Regexp (module_name, module_regexp, module_pattern, (unsigned char) atoi (module_noseekeof.c_str ()));
|
||||
} else if (module_plugin != "") {
|
||||
module = new Pandora_Module_Plugin (module_name, module_plugin);
|
||||
if (module_timeout != ""){
|
||||
module->setTimeout(atoi(module_timeout.c_str()));
|
||||
}
|
||||
} else if (module_ping != "") {
|
||||
if (module_ping_count == "") {
|
||||
module_ping_count = "1";
|
||||
|
@ -1154,17 +1157,17 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
|
|||
module = new Pandora_Module_Ping (module_name, module_ping, module_ping_count, module_ping_timeout, module_advanced_options);
|
||||
if (module_timeout != "") {
|
||||
module->setTimeout (atoi (module_timeout.c_str ()));
|
||||
}
|
||||
} else if (module_snmpget != "") {
|
||||
}
|
||||
} else if (module_snmpget != "") {
|
||||
if (module_snmp_version == "") {
|
||||
module_snmp_version = "1";
|
||||
}
|
||||
}
|
||||
if (module_snmp_community == "") {
|
||||
module_snmp_community = "public";
|
||||
}
|
||||
}
|
||||
if (module_snmp_agent == "") {
|
||||
module_snmp_agent = "localhost";
|
||||
}
|
||||
}
|
||||
|
||||
module = new Pandora_Module_SNMPGet (module_name, module_snmp_version, module_snmp_community, module_snmp_agent, module_snmp_oid, module_advanced_options);
|
||||
if (module_timeout != "") {
|
||||
|
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("6.0RC1(Build 150902)")
|
||||
#define PANDORA_VERSION ("6.0RC1(Build 150904)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(6.0RC1(Build 150902))"
|
||||
VALUE "ProductVersion", "(6.0RC1(Build 150904))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 6.0RC1-150902
|
||||
Version: 6.0RC1-150904
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0RC1-150902"
|
||||
pandora_version="6.0RC1-150904"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
@ -886,7 +886,11 @@ if ($update_module || $create_module) {
|
|||
$macros = json_decode(base64_decode($macros), true);
|
||||
|
||||
foreach($macros as $k => $m) {
|
||||
$macros[$k]['value'] = get_parameter($m['macro'], '');
|
||||
if ($m['hide'] == "1") {
|
||||
$macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
|
||||
} else {
|
||||
$macros[$k]['value'] = get_parameter($m['macro'], '');
|
||||
}
|
||||
}
|
||||
|
||||
$macros = io_json_mb_encode($macros);
|
||||
|
|
|
@ -90,7 +90,7 @@ if (!empty($macros)) {
|
|||
$m_hide = $m['hide'];
|
||||
|
||||
if ($m_hide) {
|
||||
$data[1] = html_print_input_password($m['macro'], $m['value'], '', 100, 255, true);
|
||||
$data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 255, true);
|
||||
}
|
||||
else {
|
||||
$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true);
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC150902';
|
||||
$build_version = 'PC150904';
|
||||
$pandora_version = 'v6.0RC1';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '6.0RC1';
|
||||
$build = '150902';
|
||||
$build = '150904';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
@ -39,7 +39,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
|
|||
('step_compact','1'),
|
||||
('db_scheme_first_version', '6.0dev'),
|
||||
('db_scheme_version','6.0RC1'),
|
||||
('db_scheme_build','PD150902'),
|
||||
('db_scheme_build','PD150904'),
|
||||
('show_unknown','0'),
|
||||
('show_lastalerts','1'),
|
||||
('style','pandora'),
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 6.0RC1-150902
|
||||
Version: 6.0RC1-150904
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0RC1-150902"
|
||||
pandora_version="6.0RC1-150904"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
@ -43,7 +43,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "6.0RC1";
|
||||
my $pandora_build = "150902";
|
||||
my $pandora_build = "150904";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.0RC1
|
||||
%define release 150902
|
||||
%define release 150904
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
@ -33,7 +33,7 @@ use PandoraFMS::Tools;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.0RC1 PS150902";
|
||||
my $version = "6.0RC1 PS150904";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
@ -35,7 +35,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.0RC1 PS150902";
|
||||
my $version = "6.0RC1 PS150904";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
Loading…
Reference in New Issue