tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
Alejandro Gallardo Escobar 2015-02-06 13:41:37 +01:00
parent dd13b7241c 55569ab805
commit f956d219f4
24 changed files with 162 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 6.0dev-150205
Version: 6.0dev-150206
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150205"
pandora_version="6.0dev-150206"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '6.0dev';
use constant AGENT_BUILD => '150205';
use constant AGENT_BUILD => '150206';
# Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => {

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0dev
%define release 150205
%define release 150206
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0dev
%define release 150205
%define release 150206
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{150205}
{150206}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("6.0dev(Build 150205)")
#define PANDORA_VERSION ("6.0dev(Build 150206)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(6.0dev(Build 150205))"
VALUE "ProductVersion", "(6.0dev(Build 150206))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 6.0dev-150205
Version: 6.0dev-150206
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150205"
pandora_version="6.0dev-150206"
package_pear=0
package_pandora=1

256
pandora_console/extensions/plugin_registration.php
View File

@ -69,6 +69,7 @@ function pluginreg_extension_main () {
echo "<h2 class=error>".__("Cannot load INI file")."</h2>";
}
else {
$version = preg_replace("/.*[.]/", "", $name_file);
$exec_path = $config["plugin_store"] . "/" . $ini_array["plugin_definition"]["filename"];
@ -114,6 +115,7 @@ function pluginreg_extension_main () {
'parameters' => $ini_array["plugin_definition"]["parameters"],
'plugin_type' => $ini_array["plugin_definition"]["plugin_type"]);
switch ($version) {
case 'pspz':
// Fixed the static parameters
@ -265,130 +267,138 @@ function pluginreg_extension_main () {
$create_id = db_process_sql_insert('tplugin', $values);
for ($ax = 1; $ax <= $ini_array["plugin_definition"]["total_modules_provided"]; $ax++) {
$label = "module" . $ax;
$plugin_user = "";
if (isset($ini_array[$label]["plugin_user"]))
$plugin_user = $ini_array[$label]["plugin_user"];
$plugin_pass = "";
if (isset($ini_array[$label]["plugin_pass"]))
$plugin_pass = $ini_array[$label]["plugin_pass"];
$plugin_parameter = "";
if (isset($ini_array[$label]["plugin_parameter"]))
$plugin_parameter = $ini_array[$label]["plugin_parameter"];
$unit = "";
if (isset($ini_array[$label]["unit"]))
$unit = $ini_array[$label]["unit"];
$values = array(
'name' => io_safe_input ($ini_array[$label]["name"]),
'description' => io_safe_input ($ini_array[$label]["description"]),
'id_group' => $ini_array[$label]["id_group"],
'type' => $ini_array[$label]["type"],
'max' => isset($ini_array[$label]["max"]) ? $ini_array[$label]["max"] : '',
'min' => isset($ini_array[$label]["min"]) ? $ini_array[$label]["min"] : '',
'module_interval' => isset($ini_array[$label]["module_interval"]) ? $ini_array[$label]["module_interval"] : '',
'id_module_group' => $ini_array[$label]["id_module_group"],
'id_modulo' => $ini_array[$label]["id_modulo"],
'plugin_user' => io_safe_input ($plugin_user),
'plugin_pass' => io_safe_input ($plugin_pass),
'plugin_parameter' => io_safe_input ($plugin_parameter),
'unit' => io_safe_input ($unit),
'max_timeout' => isset($ini_array[$label]["max_timeout"]) ? $ini_array[$label]["max_timeout"] : '',
'history_data' => isset($ini_array[$label]["history_data"]) ? $ini_array[$label]["history_data"] : '',
'min_warning' => isset($ini_array[$label]["min_warning"]) ? $ini_array[$label]["min_warning"] : '',
'max_warning' => isset($ini_array[$label]["max_warning"]) ? $ini_array[$label]["max_warning"] : '',
'str_warning' => isset($ini_array[$label]["str_warning"]) ? $ini_array[$label]["str_warning"] : '',
'min_critical' => isset($ini_array[$label]["min_critical"]) ? $ini_array[$label]["min_critical"] : '',
'max_critical' => isset($ini_array[$label]["max_critical"]) ? $ini_array[$label]["max_critical"] : '',
'str_critical' => isset($ini_array[$label]["str_critical"]) ? $ini_array[$label]["str_critical"] : '',
'min_ff_event' => isset($ini_array[$label]["min_ff_event"]) ? $ini_array[$label]["min_ff_event"] : '',
'tcp_port' => isset($ini_array[$label]["tcp_port"]) ? $ini_array[$label]["tcp_port"] : '',
'id_plugin' => $create_id);
$macros_component = $macros;
switch ($version) {
case 'pspz':
// Fixed the static parameters
// for
// the dinamic parameters of pandoras 5
foreach ($macros_component as $key => $macro) {
if ($macro['desc'] == 'Target IP from net') {
if (!empty($values['ip_target'])) {
$macros_component[$key]['value'] =
io_safe_input($values['ip_target']);
}
}
if ($macro['desc'] == 'Target IP') {
if (!empty($values['ip_target'])) {
$macros_component[$key]['value'] =
io_safe_input($values['ip_target']);
}
}
else if ($macro['desc'] == 'Port from net') {
if (!empty($values['tcp_port'])) {
$macros_component[$key]['value'] =
io_safe_input($values['tcp_port']);
}
}
else if ($macro['desc'] == 'Port') {
if (!empty($values['tcp_port'])) {
$macros_component[$key]['value'] =
io_safe_input($values['tcp_port']);
}
}
else if ($macro['desc'] == 'Username') {
if (!empty($values['plugin_user'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_user']);
}
}
else if ($macro['desc'] == 'Password') {
if (!empty($values['plugin_pass'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_pass']);
}
}
else if ($macro['desc'] == 'Plug-in Parameters') {
if (!empty($values['plugin_parameter'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_parameter']);
}
}
}
break;
case 'pspz2':
if ($total_macros > 0) {
for ($it_macros = 1; $it_macros <= $total_macros; $it_macros++) {
$macro = "macro_" . $it_macros . "_value";
// Set the value or use the default
if (isset($ini_array[$label][$macro])) {
$macros_component[(string)$it_macros]['value'] =
io_safe_input($ini_array[$label][$macro]);
}
}
}
break;
}
if (!empty($macros_component)) {
$values['macros'] = json_encode($macros_component);
}
db_process_sql_insert('tnetwork_component', $values);
echo "<h3 class=suc>" .
__("Module plugin registered") . " : " . $ini_array[$label]["name"] .
"</h3>";
if (empty($create_id)) {
ui_print_error_message(
__('Plug-in Remote Registered unsuccessfull'));
ui_print_info_message(
__('Please check the syntax of file "plugin_definition.ini"'));
}
else {
for ($ax = 1; $ax <= $ini_array["plugin_definition"]["total_modules_provided"]; $ax++) {
$label = "module" . $ax;
$plugin_user = "";
if (isset($ini_array[$label]["plugin_user"]))
$plugin_user = $ini_array[$label]["plugin_user"];
$plugin_pass = "";
if (isset($ini_array[$label]["plugin_pass"]))
$plugin_pass = $ini_array[$label]["plugin_pass"];
$plugin_parameter = "";
if (isset($ini_array[$label]["plugin_parameter"]))
$plugin_parameter = $ini_array[$label]["plugin_parameter"];
$unit = "";
if (isset($ini_array[$label]["unit"]))
$unit = $ini_array[$label]["unit"];
$values = array(
'name' => io_safe_input ($ini_array[$label]["name"]),
'description' => io_safe_input ($ini_array[$label]["description"]),
'id_group' => $ini_array[$label]["id_group"],
'type' => $ini_array[$label]["type"],
'max' => isset($ini_array[$label]["max"]) ? $ini_array[$label]["max"] : '',
'min' => isset($ini_array[$label]["min"]) ? $ini_array[$label]["min"] : '',
'module_interval' => isset($ini_array[$label]["module_interval"]) ? $ini_array[$label]["module_interval"] : '',
'id_module_group' => $ini_array[$label]["id_module_group"],
'id_modulo' => $ini_array[$label]["id_modulo"],
'plugin_user' => io_safe_input ($plugin_user),
'plugin_pass' => io_safe_input ($plugin_pass),
'plugin_parameter' => io_safe_input ($plugin_parameter),
'unit' => io_safe_input ($unit),
'max_timeout' => isset($ini_array[$label]["max_timeout"]) ? $ini_array[$label]["max_timeout"] : '',
'history_data' => isset($ini_array[$label]["history_data"]) ? $ini_array[$label]["history_data"] : '',
'min_warning' => isset($ini_array[$label]["min_warning"]) ? $ini_array[$label]["min_warning"] : '',
'max_warning' => isset($ini_array[$label]["max_warning"]) ? $ini_array[$label]["max_warning"] : '',
'str_warning' => isset($ini_array[$label]["str_warning"]) ? $ini_array[$label]["str_warning"] : '',
'min_critical' => isset($ini_array[$label]["min_critical"]) ? $ini_array[$label]["min_critical"] : '',
'max_critical' => isset($ini_array[$label]["max_critical"]) ? $ini_array[$label]["max_critical"] : '',
'str_critical' => isset($ini_array[$label]["str_critical"]) ? $ini_array[$label]["str_critical"] : '',
'min_ff_event' => isset($ini_array[$label]["min_ff_event"]) ? $ini_array[$label]["min_ff_event"] : '',
'tcp_port' => isset($ini_array[$label]["tcp_port"]) ? $ini_array[$label]["tcp_port"] : '',
'id_plugin' => $create_id);
$macros_component = $macros;
switch ($version) {
case 'pspz':
// Fixed the static parameters
// for
// the dinamic parameters of pandoras 5
foreach ($macros_component as $key => $macro) {
if ($macro['desc'] == 'Target IP from net') {
if (!empty($values['ip_target'])) {
$macros_component[$key]['value'] =
io_safe_input($values['ip_target']);
}
}
if ($macro['desc'] == 'Target IP') {
if (!empty($values['ip_target'])) {
$macros_component[$key]['value'] =
io_safe_input($values['ip_target']);
}
}
else if ($macro['desc'] == 'Port from net') {
if (!empty($values['tcp_port'])) {
$macros_component[$key]['value'] =
io_safe_input($values['tcp_port']);
}
}
else if ($macro['desc'] == 'Port') {
if (!empty($values['tcp_port'])) {
$macros_component[$key]['value'] =
io_safe_input($values['tcp_port']);
}
}
else if ($macro['desc'] == 'Username') {
if (!empty($values['plugin_user'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_user']);
}
}
else if ($macro['desc'] == 'Password') {
if (!empty($values['plugin_pass'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_pass']);
}
}
else if ($macro['desc'] == 'Plug-in Parameters') {
if (!empty($values['plugin_parameter'])) {
$macros_component[$key]['value'] =
io_safe_input($values['plugin_parameter']);
}
}
}
break;
case 'pspz2':
if ($total_macros > 0) {
for ($it_macros = 1; $it_macros <= $total_macros; $it_macros++) {
$macro = "macro_" . $it_macros . "_value";
// Set the value or use the default
if (isset($ini_array[$label][$macro])) {
$macros_component[(string)$it_macros]['value'] =
io_safe_input($ini_array[$label][$macro]);
}
}
}
break;
}
if (!empty($macros_component)) {
$values['macros'] = json_encode($macros_component);
}
db_process_sql_insert('tnetwork_component', $values);
echo "<h3 class=suc>" .
__("Module plugin registered") . " : " . $ini_array[$label]["name"] .
"</h3>";
}
echo "<h2 class=suc>" .
__("Plugin") . " " . $ini_array["plugin_definition"]["name"] . " " . __("Registered successfully") .
"</h2>";
}
echo "<h2 class=suc>" .
__("Plugin") . " " . $ini_array["plugin_definition"]["name"] . " " . __("Registered successfully") .
"</h2>";
unlink ($config["attachment_store"] . "/plugin_definition.ini");
}
}

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC150205';
$build_version = 'PC150206';
$pandora_version = 'v6.0dev';
// Do not overwrite default timezone set if defined.

9
pandora_console/include/functions_agents.php
View File

@ -1525,6 +1525,8 @@ function agents_get_addresses ($id_agent) {
* return -1 if the data are wrong
*/
function agents_get_status_from_counts($agent) {
// Check if in the data there are all the necessary values
if (!isset($agent['normal_count']) &&
!isset($agent['warning_count']) &&
@ -1534,11 +1536,11 @@ function agents_get_status_from_counts($agent) {
!isset($agent['total_count'])) {
return -1;
}
# Juanma (05/05/2014) Fix: This status is not init! 0 modules or all not init
if ($agent['notinit_count'] == $agent['total_count']) {
return AGENT_MODULE_STATUS_NOT_INIT;
}
}
if ($agent['critical_count'] > 0) {
return AGENT_MODULE_STATUS_CRITICAL_BAD;
}
@ -1551,6 +1553,9 @@ function agents_get_status_from_counts($agent) {
else if ($agent['normal_count'] == $agent['total_count']) {
return AGENT_MODULE_STATUS_NORMAL;
}
else if ($agent['normal_count'] + $agent['notinit_count'] == $agent['total_count']) {
return AGENT_MODULE_STATUS_NORMAL;
}
//~ else if($agent['notinit_count'] == $agent['total_count']) {
//~ return AGENT_MODULE_STATUS_NORMAL;
//~ }

2
pandora_console/install.php
View File

@ -63,7 +63,7 @@
<div style='height: 10px'>
<?php
$version = '6.0dev';
$build = '150205';
$build = '150206';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
%define release 150205
%define release 150206
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
%define release 150205
%define release 150206
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_console/pandoradb_data.sql
View File

@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('graph_res','5'),
('step_compact','1'),
('db_scheme_version','6.0dev'),
('db_scheme_build','PD150205'),
('db_scheme_build','PD150206'),
('show_unknown','0'),
('show_lastalerts','1'),
('style','pandora'),

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 6.0dev-150205
Version: 6.0dev-150206
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150205"
pandora_version="6.0dev-150206"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "6.0dev";
my $pandora_build = "150205";
my $pandora_build = "150206";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
%define release 150205
%define release 150206
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
%define release 150205
%define release 150206
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
my $version = "6.0dev PS150205";
my $version = "6.0dev PS150206";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -34,7 +34,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "6.0dev PS150205";
my $version = "6.0dev PS150206";
# save program name for logging
my $progname = basename($0);